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

trunk/server/source3/winbindd/wb_sid2uid.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 "idmap_cache.h"
+#include "../libcli/security/security.h"
 
 struct wb_sid2uid_state {
@@ -92 +94 @@
         status = wb_lookupsid_recv(subreq, talloc_tos(), &type, &domname,
                                    &name);
-        if (!NT_STATUS_IS_OK(status)) {
-                tevent_req_nterror(req, status);
+        if (tevent_req_nterror(req, status)) {
                 return;
         }
@@ -123 +124 @@
         child = idmap_child();
 
-        subreq = rpccli_wbint_Sid2Uid_send(state, state->ev, child->rpccli,
+        subreq = dcerpc_wbint_Sid2Uid_send(state, state->ev, child->binding_handle,
                                            state->dom_name, &state->sid,
                                            &state->uid64);
@@ -140 +141 @@
         NTSTATUS status, result;
 
-        status = rpccli_wbint_Sid2Uid_recv(subreq, state, &result);
+        status = dcerpc_wbint_Sid2Uid_recv(subreq, state, &result);
         TALLOC_FREE(subreq);
-        if (!NT_STATUS_IS_OK(status)) {
+        if (any_nt_status_not_ok(status, result, &status)) {
                 tevent_req_nterror(req, status);
-                return;
-        }
-        if (!NT_STATUS_IS_OK(result)) {
-                tevent_req_nterror(req, result);
                 return;
         }