Changeset 618 for vendor/current/source3/winbindd

Timestamp:

Aug 5, 2011, 7:52:23 AM (14 years ago)

Author:

Herwig Bauernfeind

Message:

Samba 3.5: Update vendor to version 3.5.11

Location:

vendor/current/source3/winbindd

Files:

• winbindd_dual_srv.c (modified) (2 diffs)
• winbindd_lookuprids.c (modified) (5 diffs)

vendor/current/source3/winbindd/winbindd_dual_srv.c

@@ -374 +374 @@
 
         status = domain->methods->rids_to_names(
-                domain, talloc_tos(), &domain->sid, r->in.rids->rids,
+                domain, talloc_tos(), r->in.domain_sid, r->in.rids->rids,
                 r->in.rids->num_rids, &domain_name, &names, &types);
         if (!NT_STATUS_IS_OK(status)) {
@@ -389 +389 @@
 
         for (i=0; i<r->in.rids->num_rids; i++) {
-                sid_compose(&result[i].sid, &domain->sid, r->in.rids->rids[i]);
+                sid_compose(&result[i].sid, r->in.domain_sid,
+                            r->in.rids->rids[i]);
                 result[i].type = types[i];
                 result[i].name = talloc_move(result, &names[i]);

vendor/current/source3/winbindd/winbindd_lookuprids.c

@@ -24 +24 @@
 struct winbindd_lookuprids_state {
         struct tevent_context *ev;
+        struct dom_sid domain_sid;
         const char *domain_name;
         struct wbint_RidArray rids;
@@ -42 +43 @@
         struct winbindd_lookuprids_state *state;
         struct winbindd_domain *domain;
-        struct dom_sid sid;
 
         req = tevent_req_create(mem_ctx, &state,
@@ -56 +56 @@
         DEBUG(3, ("lookuprids (%s)\n", request->data.sid));
 
-        if (!string_to_sid(&sid, request->data.sid)) {
+        if (!string_to_sid(&state->domain_sid, request->data.sid)) {
                 DEBUG(5, ("%s not a SID\n", request->data.sid));
                 tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER);
@@ -62 +62 @@
         }
 
-        domain = find_lookup_domain_from_sid(&sid);
+        domain = find_lookup_domain_from_sid(&state->domain_sid);
         if (domain == NULL) {
                 DEBUG(5, ("Domain for sid %s not found\n",
-                          sid_string_dbg(&sid)));
+                          sid_string_dbg(&state->domain_sid)));
                 tevent_req_nterror(req, NT_STATUS_NO_SUCH_DOMAIN);
                 return tevent_req_post(req, ev);
@@ -84 +84 @@
 
         subreq = rpccli_wbint_LookupRids_send(
-                state, ev, domain->child.rpccli, &state->rids,
-                &state->domain_name, &state->names);
+                state, ev, domain->child.rpccli, &state->domain_sid,
+                &state->rids, &state->domain_name, &state->names);
         if (tevent_req_nomem(subreq, req)) {
                 return tevent_req_post(req, ev);