Changeset 736 for branches/samba-3.5.x/source3/winbindd

Timestamp:

Nov 12, 2012, 5:38:52 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.5: update branche to 3.5.16

Location:

branches/samba-3.5.x/source3/winbindd

Files:

• winbindd.c (modified) (3 diffs)
• winbindd_ads.c (modified) (4 diffs)
• winbindd_dual.c (modified) (3 diffs)
• winbindd_pam.c (modified) (3 diffs)

branches/samba-3.5.x/source3/winbindd/winbindd.c

@@ -68 +68 @@
 
         if (lp_loaded()) {
-                const char *fname = lp_configfile();
+                char *fname = lp_configfile();
 
                 if (file_exist(fname) && !strcsequal(fname,get_dyn_CONFIGFILE())) {
                         set_dyn_CONFIGFILE(fname);
                 }
+                TALLOC_FREE(fname);
         }
 
@@ -1073 +1074 @@
         }
 
+        /* We call dump_core_setup one more time because the command line can
+         * set the log file or the log-basename and this will influence where
+         * cores are stored. Without this call get_dyn_LOGFILEBASE will be
+         * the default value derived from build's prefix. For EOM this value
+         * is often not related to the path where winbindd is actually run
+         * in production.
+         */
+        dump_core_setup("winbindd");
+
         if (is_daemon && interactive) {
                 d_fprintf(stderr,"\nERROR: "
@@ -1107 +1117 @@
                 exit(1);
         }
+        /* After parsing the configuration file we setup the core path one more time
+         * as the log file might have been set in the configuration and cores's
+         * path is by default basename(lp_logfile()).
+         */
+        dump_core_setup("winbindd");
 
         /* Initialise messaging system */

branches/samba-3.5.x/source3/winbindd/winbindd_ads.c

@@ -181 +181 @@
 
         rc = ads_search_retry(ads, &res, "(objectCategory=user)", attrs);
-        if (!ADS_ERR_OK(rc) || !res) {
+        if (!ADS_ERR_OK(rc)) {
                 DEBUG(1,("query_user_list ads_search: %s\n", ads_errstr(rc)));
+                status = ads_ntstatus(rc);
+        } else if (!res) {
+                DEBUG(1,("query_user_list ads_search returned NULL res\n"));
+
                 goto done;
         }
@@ -326 +330 @@
 
         rc = ads_search_retry(ads, &res, filter, attrs);
-        if (!ADS_ERR_OK(rc) || !res) {
+        if (!ADS_ERR_OK(rc)) {
+                status = ads_ntstatus(rc);
                 DEBUG(1,("enum_dom_groups ads_search: %s\n", ads_errstr(rc)));
+                goto done;
+        } else if (!res) {
+                DEBUG(1,("enum_dom_groups ads_search returned NULL res\n"));
                 goto done;
         }
@@ -533 +541 @@
         }
         rc = ads_search_retry(ads, &msg, ldap_exp, attrs);
-        free(ldap_exp);
+        SAFE_FREE(ldap_exp);
         TALLOC_FREE(sidstr);
-        if (!ADS_ERR_OK(rc) || !msg) {
+        if (!ADS_ERR_OK(rc)) {
                 DEBUG(1,("query_user(sid=%s) ads_search: %s\n",
                          sid_string_dbg(sid), ads_errstr(rc)));
-                goto done;
+                return ads_ntstatus(rc);
+        } else if (!msg) {
+                DEBUG(1,("query_user(sid=%s) ads_search returned NULL res\n",
+                         sid_string_dbg(sid)));
+                return NT_STATUS_INTERNAL_ERROR;
         }
 
@@ -633 +645 @@
         rc = ads_search_retry(ads, &res, ldap_exp, group_attrs);
 
-        if (!ADS_ERR_OK(rc) || !res) {
+        if (!ADS_ERR_OK(rc)) {
                 DEBUG(1,("lookup_usergroups ads_search member=%s: %s\n", user_dn, ads_errstr(rc)));
                 return ads_ntstatus(rc);
-        }
+        } else if (!res) {
+                DEBUG(1,("lookup_usergroups ads_search returned NULL res\n"));
+                return NT_STATUS_INTERNAL_ERROR;
+        }
+
 
         count = ads_count_replies(ads, res);

branches/samba-3.5.x/source3/winbindd/winbindd_dual.c

@@ -37 +37 @@
 extern bool override_logfile;
 extern struct winbindd_methods cache_methods;
+
+static struct winbindd_child *children = NULL;
 
 /* Read some data from a client connection */
@@ -171 +173 @@
                 close(state->child->sock);
                 state->child->sock = -1;
+                DLIST_REMOVE(children, state->child);
                 tevent_req_error(req, err);
                 return;
@@ -517 +520 @@
         SMB_ASSERT(child->rpccli != NULL);
 }
-
-struct winbindd_child *children = NULL;
 
 void winbind_child_died(pid_t pid)

branches/samba-3.5.x/source3/winbindd/winbindd_pam.c

@@ -1366 +1366 @@
                 }
 
-                logon_fn = contact_domain->can_do_samlogon_ex
+                logon_fn = (contact_domain->can_do_samlogon_ex && domain->can_do_validation6)
                         ? rpccli_netlogon_sam_network_logon_ex
                         : rpccli_netlogon_sam_network_logon;
@@ -1559 +1559 @@
 
         if ( mapped_user != state->request->data.auth.user ) {
-                fstr_sprintf( domain_user, "%s\\%s", name_domain, name_user );
+                fstr_sprintf( domain_user, "%s%c%s", name_domain,
+                        *lp_winbind_separator(),
+                        name_user );
                 safe_strcpy( state->request->data.auth.user, domain_user,
                              sizeof(state->request->data.auth.user)-1 );
@@ -1990 +1992 @@
                 }
 
-                logon_fn = contact_domain->can_do_samlogon_ex
+                logon_fn = (contact_domain->can_do_samlogon_ex && domain->can_do_validation6)
                         ? rpccli_netlogon_sam_network_logon_ex
                         : rpccli_netlogon_sam_network_logon;