Changeset 745 for trunk/server/source3/winbindd/wb_gettoken.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_gettoken.c (modified) (4 diffs)

trunk/server/source3/winbindd/wb_gettoken.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"
+#include "passdb/machine_sid.h"
 
 struct wb_gettoken_state {
@@ -89 +91 @@
                                           &state->sids);
         TALLOC_FREE(subreq);
-        if (!NT_STATUS_IS_OK(status)) {
-                tevent_req_nterror(req, status);
+        if (tevent_req_nterror(req, status)) {
                 return;
         }
@@ -134 +135 @@
         status = wb_lookupuseraliases_recv(subreq, state, &num_rids, &rids);
         TALLOC_FREE(subreq);
-        if (!NT_STATUS_IS_OK(status)) {
-                tevent_req_nterror(req, status);
+        if (tevent_req_nterror(req, status)) {
                 return;
         }
         domain = find_domain_from_sid_noinit(get_global_sam_sid());
+        if (domain == NULL) {
+                tevent_req_nterror(req, NT_STATUS_INTERNAL_ERROR);
+                return;
+        }
         if (!wb_add_rids_to_sids(state, &state->num_sids, &state->sids,
                                  &domain->sid, num_rids, rids)) {
@@ -176 +180 @@
         status = wb_lookupuseraliases_recv(subreq, state, &num_rids, &rids);
         TALLOC_FREE(subreq);
-        if (!NT_STATUS_IS_OK(status)) {
-                tevent_req_nterror(req, status);
+        if (tevent_req_nterror(req, status)) {
                 return;
         }