Changeset 745 for trunk/server/source3/winbindd/wb_lookupname.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_lookupname.c (modified) (5 diffs)

trunk/server/source3/winbindd/wb_lookupname.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_lookupname_state {
@@ -69 +70 @@
         }
 
-        subreq = rpccli_wbint_LookupName_send(
-                state, ev, domain->child.rpccli, state->dom_name, state->name,
+        subreq = dcerpc_wbint_LookupName_send(
+                state, ev, dom_child_handle(domain),
+                state->dom_name, state->name,
                 flags, &state->type, &state->sid);
         if (tevent_req_nomem(subreq, req)) {
@@ -88 +90 @@
         NTSTATUS status, result;
 
-        status = rpccli_wbint_LookupName_recv(subreq, state, &result);
+        status = dcerpc_wbint_LookupName_recv(subreq, state, &result);
         TALLOC_FREE(subreq);
-        if (!NT_STATUS_IS_OK(status)) {
-                tevent_req_nterror(req, status);
+        if (tevent_req_nterror(req, status)) {
                 return;
         }
@@ -110 +111 @@
         }
 
-        subreq = rpccli_wbint_LookupName_send(
-                state, state->ev, root_domain->child.rpccli, state->dom_name,
+        subreq = dcerpc_wbint_LookupName_send(
+                state, state->ev, dom_child_handle(root_domain),
+                state->dom_name,
                 state->name, state->flags, &state->type, &state->sid);
         if (tevent_req_nomem(subreq, req)) {
@@ -127 +129 @@
         NTSTATUS status, result;
 
-        status = rpccli_wbint_LookupName_recv(subreq, state, &result);
+        status = dcerpc_wbint_LookupName_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;
         }