Changeset 140 for branches/samba-3.0/source/nsswitch/winbindd_cm.c

Timestamp:

07/11/08 01:13:42 (5 months ago)

Author:

psmedley

Message:

Update branch to 3.0.31 release

Files:

• branches/samba-3.0/source/nsswitch/winbindd_cm.c (modified) (5 diffs)

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

@@ -608 +608 @@
         }
 
-        /* this is at least correct when domain is our domain,
-         * which is the only case, when this is currently used: */
+        /* For now assume our machine account only exists in our domain */
+
         if (machine_krb5_principal != NULL)
         {
                 if (asprintf(machine_krb5_principal, "%s$@%s",
-                             account_name, domain->alt_name) == -1)
+                             account_name, lp_realm()) == -1)
                 {
                         return NT_STATUS_NO_MEMORY;
@@ -730 +730 @@
                         (*cli)->use_kerberos = True;
                         DEBUG(5, ("connecting to %s from %s with kerberos principal "
-                                  "[%s]\n", controller, global_myname(),
-                                  machine_krb5_principal));
+                                  "[%s] and realm [%s]\n", controller, global_myname(),
+                                  machine_krb5_principal, domain->alt_name));
 
                         ads_status = cli_session_setup_spnego(*cli,
                                                               machine_krb5_principal, 
                                                               machine_password, 
-                                                              domain->name);
+                                                              lp_workgroup(),
+                                                              domain->alt_name);
 
                         if (!ADS_ERR_OK(ads_status)) {
@@ -756 +757 @@
                 DEBUG(5, ("connecting to %s from %s with username "
                           "[%s]\\[%s]\n",  controller, global_myname(),
-                          domain->name, machine_account));
+                          lp_workgroup(), machine_account));
 
                 ads_status = cli_session_setup_spnego(*cli,
                                                       machine_account, 
                                                       machine_password, 
-                                                      domain->name);
+                                                      lp_workgroup(),
+                                                      NULL);
                 if (!ADS_ERR_OK(ads_status)) {
                         DEBUG(4, ("authenticated session setup failed with %s\n",
@@ -1249 +1251 @@
         int i, fd_index;
 
+        *fd = -1;
+
  again:
         if (!get_dcs(mem_ctx, domain, &dcs, &num_dcs) || (num_dcs == 0))
@@ -1309 +1313 @@
         winbind_add_failed_connection_entry(domain, dcs[fd_index].name,
                                     NT_STATUS_UNSUCCESSFUL);
+
+        /* Throw away all arrays as we're doing this again. */
+        TALLOC_FREE(dcs);
+        num_dcs = 0;
+
+        TALLOC_FREE(dcnames);
+        num_dcnames = 0;
+
+        TALLOC_FREE(addrs);
+        num_addrs = 0;
+
+        *fd = -1;
+
         goto again;
 }