Changeset 140 for branches/samba-3.0/source/nsswitch/winbindd_pam.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_pam.c (modified) (4 diffs)

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

@@ -1380 +1380 @@
                     NT_STATUS_EQUAL(result, NT_STATUS_DOMAIN_CONTROLLER_NOT_FOUND)) {
                         DEBUG(10,("winbindd_dual_pam_auth_kerberos setting domain to offline\n"));
-                        domain->online = False;
+                        /* Use set_domain_offline() instead of
+                         * just set status offline, otherwise,
+                         * domain will never goes online again
+                         * --- BoYang */
+                        set_domain_offline(domain);
                 }
 
@@ -2045 +2049 @@
 
         if (NT_STATUS_IS_OK(result) && (state->request.flags & WBFLAG_PAM_CACHED_LOGIN)) {
-                
+
                 /* Update the single sign-on memory creds. */
                 result = winbindd_replace_memory_creds(state->request.data.chauthtok.user,
                                                         newpass);
+
+                /* When we login from gdm or xdm and password expires,
+                 * we change the password, but there are no memory crendentials.
+                 * So, winbindd_replace_memory_creds() returns
+                 * NT_STATUS_OBJECT_NAME_NOT_FOUND. This is not a failure.
+                 * --- BoYang
+                 * */
+                if (NT_STATUS_EQUAL(result, NT_STATUS_OBJECT_NAME_NOT_FOUND)) {
+                        result = NT_STATUS_OK;
+                }
 
                 if (!NT_STATUS_IS_OK(result)) {
@@ -2059 +2073 @@
                                                          state->mem_ctx, user,
                                                          newpass);
+                        /* Again, this happens when we login from gdm or xdm
+                         * and the password expires, *BUT* cached crendentials
+                         * don't exist. winbindd_update_creds_by_name()
+                         * returns NT_STATUS_NO_SUCH_USER.
+                         * This is not a failure.
+                         * --- BoYang
+                         * */
+                        if (NT_STATUS_EQUAL(result, NT_STATUS_NO_SUCH_USER)) {
+                                result = NT_STATUS_OK;
+                        }
                         if (!NT_STATUS_IS_OK(result)) {
                                 DEBUG(10,("Failed to store creds: %s\n", nt_errstr(result)));
@@ -2064 +2088 @@
                         }
                 }
-        }               
+        }
 
         if (!NT_STATUS_IS_OK(result) && !got_info && contact_domain) {