The branch, master has been updated
via adfa071 s3: Remove a nesting level in winbindd_dual_pam_chauthtok
from 6bd6fdc s4:unittest: Test wbinfo --group-info and --gid-info
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit adfa071c5a10521a7fe6a55735358ce27a777dc4
Author: Volker Lendecke <[email protected]>
Date: Sat Sep 11 18:24:54 2010 +0200
s3: Remove a nesting level in winbindd_dual_pam_chauthtok
-----------------------------------------------------------------------
Summary of changes:
source3/winbindd/winbindd_pam.c | 37 +++++++++++++++++++------------------
1 files changed, 19 insertions(+), 18 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/winbindd/winbindd_pam.c b/source3/winbindd/winbindd_pam.c
index 53eda47..968ffcd 100644
--- a/source3/winbindd/winbindd_pam.c
+++ b/source3/winbindd/winbindd_pam.c
@@ -1896,25 +1896,26 @@ enum winbindd_result winbindd_dual_pam_chauthtok(struct
winbindd_domain *contact
done:
- if (NT_STATUS_IS_OK(result) && (state->request->flags &
WBFLAG_PAM_CACHED_LOGIN)) {
- if (lp_winbind_offline_logon()) {
- result = winbindd_update_creds_by_name(contact_domain,
- user, newpass);
- /* Again, this happens when we login from gdm or xdm
- * and the password expires, *BUT* cached crendentials
- * doesn'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)
+ && (state->request->flags & WBFLAG_PAM_CACHED_LOGIN)
+ && lp_winbind_offline_logon()) {
+ result = winbindd_update_creds_by_name(contact_domain, user,
+ newpass);
+ /* Again, this happens when we login from gdm or xdm
+ * and the password expires, *BUT* cached crendentials
+ * doesn'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)));
- goto process_result;
- }
+ if (!NT_STATUS_IS_OK(result)) {
+ DEBUG(10, ("Failed to store creds: %s\n",
+ nt_errstr(result)));
+ goto process_result;
}
}
--
Samba Shared Repository
