Changeset 105 for branches/samba-3.0/source/nsswitch

Timestamp:

Nov 26, 2007, 9:24:27 AM (18 years ago)

Author:

Paul Smedley

Message:

Update source to 3.0.27a

Location:

branches/samba-3.0/source/nsswitch

Files:

• idmap.c (modified) (11 diffs)
• winbindd.c (modified) (1 diff)
• winbindd_async.c (modified) (1 diff)
• winbindd_nss.h (modified) (1 diff)

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

@@ -253 +253 @@
 }
 
-/**********************************************************************
- Initialise idmap cache and a remote backend (if configured).
-**********************************************************************/
-
-static const char *idmap_default_domain[] = { "default domain", NULL };
-
 /****************************************************************************
  ****************************************************************************/
@@ -293 +287 @@
         char *compat_params = NULL;
         const char **dom_list = NULL;
+        const char *default_domain = NULL;
         char *alloc_backend = NULL;
         BOOL default_already_defined = False;
@@ -321 +316 @@
                 } else {
                         compat = 1;
-
-                        compat_backend = talloc_strdup(idmap_ctx, *compat_list);
-                        if (compat_backend == NULL) {
-                                ret = NT_STATUS_NO_MEMORY;
-                                goto done;
-                        }
 
                         /* strip any leading idmap_ prefix of */
@@ -341 +330 @@
                         }
 
+                        if (compat_backend == NULL) {
+                                ret = NT_STATUS_NO_MEMORY;
+                                goto done;
+                        }
+
                         /* separate the backend and module arguements */
                         if ((p = strchr(compat_backend, ':')) != NULL) {
@@ -357 +351 @@
 
         if ( ! dom_list) {
-                dom_list = idmap_default_domain;
+                /* generate a list with our main domain */
+                char ** dl;
+
+                dl = talloc_array(idmap_ctx, char *, 2);
+                if (dl == NULL) {
+                        ret = NT_STATUS_NO_MEMORY;
+                        goto done;
+                }
+                dl[0] = talloc_strdup(dl, lp_workgroup());
+                if (dl[0] == NULL) {
+                        ret = NT_STATUS_NO_MEMORY;
+                        goto done;
+                }
+
+                /* terminate */
+                dl[1] = NULL;
+
+                dom_list = dl;
+                default_domain = dl[0];
         }
 
@@ -365 +377 @@
         DEBUG(1, ("Initializing idmap domains\n"));
 
-        for (i = 0; dom_list[i]; i++) {
+        for (i=0, num_domains=0; dom_list[i]; i++) {
                 const char *parm_backend;
                 char *config_option;
@@ -373 +385 @@
                      || strequal(dom_list[i], get_global_sam_name()))
                 {
-                        DEBUG(0,("idmap_init: Ignoring invalid domain %s\n",
+                        DEBUG(0,("idmap_init: Ignoring domain %s\n",
                                  dom_list[i]));
                         continue;
                 }
 
-                if (strequal(dom_list[i], lp_workgroup())) {
+                if ((dom_list[i] != default_domain) &&
+                    strequal(dom_list[i], lp_workgroup())) {
                         pri_dom_is_in_list = True;
                 }
@@ -399 +412 @@
 
                 if (dom->default_domain ||
-                    strequal(dom_list[i], idmap_default_domain[0])) {
+                    (default_domain && strequal(dom_list[i], default_domain))) {
 
                         /* make sure this is set even when we match
-                         * idmap_default_domain[0] */
+                         * default_domain */
                         dom->default_domain = True;
 
@@ -423 +436 @@
                         parm_backend = talloc_strdup(idmap_ctx, compat_backend);
                 } else {
-                        char *backend = lp_parm_const_string(-1, config_option,
-                                                             "backend", "tdb");
-                        parm_backend = talloc_strdup(idmap_ctx, backend);
+                        parm_backend = talloc_strdup(idmap_ctx,
+                                                     lp_parm_const_string(
+                                                        -1, config_option,
+                                                        "backend", "tdb"));
                 }
                 IDMAP_CHECK_ALLOC(parm_backend);
@@ -479 +493 @@
                         goto done;
                 }
-                idmap_domains[i] = dom;
+                idmap_domains[num_domains] = dom;
 
                 /* save default domain position for future uses */
                 if (dom->default_domain) {
-                        def_dom_num = i;
-                }
+                        def_dom_num = num_domains;
+                }
+
+                /* Bump counter to next available slot */
+
+                num_domains++;
 
                 DEBUG(10, ("Domain %s - Backend %s - %sdefault - %sreadonly\n",
@@ -493 +511 @@
                 talloc_free(config_option);
         }
-
-        /* save the number of domains we have */
-        num_domains = i;
 
         /* automatically add idmap_nss backend if needed */

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

@@ -541 +541 @@
 
         if (*(uint32 *)(&state->request) != sizeof(state->request)) {
-                DEBUG(0,("request_len_recv: Invalid request size received: %d\n",
-                         *(uint32 *)(&state->request)));
+                DEBUG(0,("request_len_recv: Invalid request size received: %d (expected %d)\n",
+                         *(uint32 *)(&state->request), sizeof(state->request)));
                 state->finished = True;
                 return;

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

@@ -1414 +1414 @@
         }
 
+        if (response->result != WINBINDD_OK) {
+                DEBUG(5, ("query_user returned an error\n"));
+                cont(private_data, False, NULL, NULL, NULL, NULL, -1, -1);
+                return;
+        }
+
         cont(private_data, True, response->data.user_info.acct_name,
              response->data.user_info.full_name,

branches/samba-3.0/source/nsswitch/winbindd_nss.h

@@ -320 +320 @@
                    an 8 byte boundary.   --jerry */
 
-                char padding[1560];
+                char padding[1800];
         } data;
         union {