Changeset 228 for branches/samba-3.2.x/source/winbindd/winbindd_group.c

Timestamp:

May 26, 2009, 9:44:50 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.6

File:

• branches/samba-3.2.x/source/winbindd/winbindd_group.c (modified) (12 diffs)

branches/samba-3.2.x/source/winbindd/winbindd_group.c

@@ -36 +36 @@
         fstring name;
 
-        fill_domain_username(name, domain, user, True);
+        if (domain != NULL) {
+                fill_domain_username(name, domain, user, True);
+        } else {
+                fstrcpy(name, user);
+        }
         safe_strcat(name, ",", sizeof(name)-1);
         string_append(pp_members, name);
@@ -135 +139 @@
                 }
 
-                add_member(domain->name, names[i], pp_members, p_num_members);
+                add_member(NULL, names[i], pp_members, p_num_members);
         }
 
@@ -332 +336 @@
 }
 
+static void sort_unique_list(char ***list, uint32 *n_list)
+{
+        uint32_t i;
+
+        /* search for duplicates for sorting and looking for matching
+           neighbors */
+
+        qsort(*list, *n_list, sizeof(char*), QSORT_CAST namecmp);
+
+        for (i=1; i < *n_list; i++) {
+                if (strcmp((*list)[i-1], (*list)[i]) == 0) {
+                        memmove(&((*list)[i-1]), &((*list)[i]),
+                                 sizeof(char*)*((*n_list)-i));
+                        (*n_list)--;
+                }
+        }
+}
+
 static NTSTATUS add_names_to_list( TALLOC_CTX *ctx, 
                                    char ***list, uint32 *n_list, 
@@ -361 +383 @@
         for ( i=*n_list, j=0; i<n_new_list; i++, j++ ) {
                 new_list[i] = talloc_strdup( new_list, names[j] );
-        }
-
-        /* search for duplicates for sorting and looking for matching
-           neighbors */
-        
-        qsort( new_list, n_new_list, sizeof(char*), QSORT_CAST namecmp );
-        
-        for ( i=1; i<n_new_list; i++ ) {
-                if ( strcmp( new_list[i-1], new_list[i] ) == 0 ) {                      
-                        memmove( &new_list[i-1], &new_list[i], 
-                                 sizeof(char*)*(n_new_list-i) );
-                        n_new_list--;
-                }
         }
 
@@ -528 +537 @@
 
         /* Real work goes here.  Create a list of group names to
-           expand startign with the initial one.  Pass that to 
+           expand starting with the initial one.  Pass that to
            expand_groups() which returns a list of more group names
            to expand.  Do this up to the max search depth. */
@@ -577 +586 @@
         }
         TALLOC_FREE( glist );   
-         
+
+        sort_unique_list(&names, &num_names);
+
         DEBUG(10, ("looked up %d names\n", num_names));
 
@@ -697 +708 @@
         /* Get info for the domain */
 
-        if ((domain = find_domain_from_name(name_domain)) == NULL) {
+        if ((domain = find_domain_from_name_noinit(name_domain)) == NULL) {
                 DEBUG(3, ("could not get domain sid for domain %s\n",
                           name_domain));
@@ -730 +741 @@
 
 static void getgrsid_sid2gid_recv(void *private_data, bool success, gid_t gid)
-        {
+{
         struct getgrsid_state *s =
                 (struct getgrsid_state *)private_data;
@@ -780 +791 @@
 
         request_ok(s->state);   
-        }
+}
 
 static void getgrsid_lookupsid_recv( void *private_data, bool success,
@@ -805 +816 @@
                 request_error(s->state);
                 return;
-}
+        }
 
         if ( (s->group_name = talloc_asprintf( s->state->mem_ctx, 
@@ -812 +823 @@
                                                *lp_winbind_separator(),
                                                name)) == NULL )
-{
+        {
                 DEBUG(1, ("getgrsid_lookupsid_recv: talloc_asprintf() Failed!\n"));
                 request_error(s->state);
@@ -822 +833 @@
         winbindd_sid2gid_async(s->state->mem_ctx, &s->group_sid,
                                getgrsid_sid2gid_recv, s);
-        }
+}
 
 static void winbindd_getgrsid( struct winbindd_cli_state *state, const DOM_SID group_sid )
-        {
+{
         struct getgrsid_state *s;