Changeset 124 for branches/samba-3.0/source/nsswitch/winbindd_async.c

Timestamp:

Mar 12, 2008, 9:08:18 AM (17 years ago)

Author:

Paul Smedley

Message:

Update source to 3.0.28a

File:

• branches/samba-3.0/source/nsswitch/winbindd_async.c (modified) (9 diffs)

branches/samba-3.0/source/nsswitch/winbindd_async.c

@@ -783 +783 @@
 ********************************************************************/
 
+struct lookupname_state {
+        char *dom_name;
+        char *name;
+        void *caller_private_data;
+};
+
 static void lookupname_recv2(TALLOC_CTX *mem_ctx, BOOL success,
                             struct winbindd_response *response,
@@ -791 +797 @@
                 (void (*)(void *, BOOL, const DOM_SID *, enum lsa_SidType))c;
         DOM_SID sid;
+        struct lookupname_state *s = talloc_get_type_abort(private_data, struct lookupname_state);
 
         if (!success) {
                 DEBUG(5, ("Could not trigger lookup_name\n"));
-                cont(private_data, False, NULL, SID_NAME_UNKNOWN);
+                cont(s->caller_private_data, False, NULL, SID_NAME_UNKNOWN);
                 return;
         }
@@ -800 +807 @@
         if (response->result != WINBINDD_OK) {
                 DEBUG(5, ("lookup_name returned an error\n"));
-                cont(private_data, False, NULL, SID_NAME_UNKNOWN);
+                cont(s->caller_private_data, False, NULL, SID_NAME_UNKNOWN);
                 return;
         }
@@ -807 +814 @@
                 DEBUG(0, ("Could not convert string %s to sid\n",
                           response->data.sid.sid));
-                cont(private_data, False, NULL, SID_NAME_UNKNOWN);
-                return;
-        }
-
-        cont(private_data, True, &sid,
+                cont(s->caller_private_data, False, NULL, SID_NAME_UNKNOWN);
+                return;
+        }
+
+        cont(s->caller_private_data, True, &sid,
              (enum lsa_SidType)response->data.sid.type);
 }
@@ -827 +834 @@
                 (void (*)(void *, BOOL, const DOM_SID *, enum lsa_SidType))c;
         DOM_SID sid;
+        struct lookupname_state *s = talloc_get_type_abort(private_data, struct lookupname_state);
 
         if (!success) {
                 DEBUG(5, ("lookupname_recv: lookup_name() failed!\n"));
-                cont(private_data, False, NULL, SID_NAME_UNKNOWN);
+                cont(s->caller_private_data, False, NULL, SID_NAME_UNKNOWN);
                 return;
         }
@@ -837 +845 @@
                 /* Try again using the forest root */
                 struct winbindd_domain *root_domain = find_root_domain();
-                struct winbindd_cli_state *state = (struct winbindd_cli_state*)private_data;            
-                struct winbindd_request request;                
-                char *name_domain, *name_account;
-                
+                struct winbindd_request request;
+
                 if ( !root_domain ) {
                         DEBUG(5,("lookupname_recv: unable to determine forest root\n"));
-                        cont(private_data, False, NULL, SID_NAME_UNKNOWN);
+                        cont(s->caller_private_data, False, NULL, SID_NAME_UNKNOWN);
                         return;
                 }
 
-                name_domain  = state->request.data.name.dom_name;
-                name_account = state->request.data.name.name;   
-
                 ZERO_STRUCT(request);
                 request.cmd = WINBINDD_LOOKUPNAME;
-                fstrcpy(request.data.name.dom_name, name_domain);
-                fstrcpy(request.data.name.name, name_account);
+                fstrcpy(request.data.name.dom_name, s->dom_name);
+                fstrcpy(request.data.name.name, s->name);
 
                 do_async_domain(mem_ctx, root_domain, &request, lookupname_recv2,
-                                (void *)cont, private_data);
+                                (void *)cont, s);
 
                 return;
@@ -864 +867 @@
                 DEBUG(0, ("Could not convert string %s to sid\n",
                           response->data.sid.sid));
-                cont(private_data, False, NULL, SID_NAME_UNKNOWN);
-                return;
-        }
-
-        cont(private_data, True, &sid,
+                cont(s->caller_private_data, False, NULL, SID_NAME_UNKNOWN);
+                return;
+        }
+
+        cont(s->caller_private_data, True, &sid,
              (enum lsa_SidType)response->data.sid.type);
 }
@@ -887 +890 @@
         struct winbindd_request request;
         struct winbindd_domain *domain;
+        struct lookupname_state *s;
 
         if ( (domain = find_lookup_domain_from_name(dom_name)) == NULL ) {
@@ -899 +903 @@
         fstrcpy(request.data.name.name, name);
 
+        if ( (s = TALLOC_ZERO_P(mem_ctx, struct lookupname_state)) == NULL ) {
+                DEBUG(0, ("winbindd_lookupname_async: talloc failed\n"));
+                cont(private_data, False, NULL, SID_NAME_UNKNOWN);
+                return;
+        }
+
+        s->dom_name = talloc_strdup( s, dom_name );
+        s->name     = talloc_strdup( s, name );
+        if (!s->dom_name || !s->name) {
+                cont(private_data, False, NULL, SID_NAME_UNKNOWN);
+                return;
+        }
+
+        s->caller_private_data = private_data;
+
         do_async_domain(mem_ctx, domain, &request, lookupname_recv,
-                        (void *)cont, private_data);
+                        (void *)cont, s);
 }