Changeset 745 for trunk/server/source3/winbindd/wb_getgrsid.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/winbindd/wb_getgrsid.c (modified) (5 diffs)

trunk/server/source3/winbindd/wb_getgrsid.c

@@ -20 +20 @@
 #include "includes.h"
 #include "winbindd.h"
-#include "librpc/gen_ndr/cli_wbint.h"
+#include "librpc/gen_ndr/ndr_wbint_c.h"
+#include "../libcli/security/security.h"
 
 struct wb_getgrsid_state {
@@ -56 +57 @@
                 struct winbindd_domain *our_domain = find_our_domain();
 
-                if (sid_compare_domain(group_sid, &our_domain->sid) == 0) {
+                if (dom_sid_compare_domain(group_sid, &our_domain->sid) == 0) {
                         DEBUG(7, ("winbindd_getgrsid: My domain -- rejecting "
                                   "getgrsid() for %s\n", sid_string_tos(group_sid)));
@@ -83 +84 @@
                                    &state->domname, &state->name);
         TALLOC_FREE(subreq);
-        if (!NT_STATUS_IS_OK(status)) {
-                tevent_req_nterror(req, status);
+        if (tevent_req_nterror(req, status)) {
                 return;
         }
@@ -115 +115 @@
         status = wb_sid2gid_recv(subreq, &state->gid);
         TALLOC_FREE(subreq);
-        if (!NT_STATUS_IS_OK(status)) {
-                tevent_req_nterror(req, status);
+        if (tevent_req_nterror(req, status)) {
                 return;
         }
@@ -137 +136 @@
         status = wb_group_members_recv(subreq, state, &state->members);
         TALLOC_FREE(subreq);
-        if (!NT_STATUS_IS_OK(status)) {
-                tevent_req_nterror(req, status);
+        if (tevent_req_nterror(req, status)) {
                 return;
         }