The branch, master has been updated
via bc39fb0 winbindd: Fix password policy for pam authentication
from 6e9879f ctdb-tools: Avoid deferencing argv[0] if argc == 0
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit bc39fb07ced84af4d97853d00d07fb4293352686
Author: Christof Schmitt <[email protected]>
Date: Mon Mar 27 15:11:08 2017 -0700
winbindd: Fix password policy for pam authentication
Authenticating users from trusted domains would return the password
policy of the joined domain. Fix the code so that the password policy of
the joined domain is only returned for users from that domain.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12725
Signed-off-by: Christof Schmitt <[email protected]>
Reviewed-by: Andreas Schneider <[email protected]>
Autobuild-User(master): Christof Schmitt <[email protected]>
Autobuild-Date(master): Wed Mar 29 22:54:47 CEST 2017 on sn-devel-144
-----------------------------------------------------------------------
Summary of changes:
source3/winbindd/winbindd_pam.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/winbindd/winbindd_pam.c b/source3/winbindd/winbindd_pam.c
index 606e6de..8139cbe 100644
--- a/source3/winbindd/winbindd_pam.c
+++ b/source3/winbindd/winbindd_pam.c
@@ -1939,7 +1939,7 @@ process_result:
-- jerry */
result = NT_STATUS_NOT_SUPPORTED;
- if (our_domain == domain ) {
+ if (strequal(name_domain, our_domain->name)) {
result = fillup_password_policy(
our_domain, state->response);
}
@@ -1947,8 +1947,9 @@ process_result:
if (!NT_STATUS_IS_OK(result)
&& !NT_STATUS_EQUAL(result,
NT_STATUS_NOT_SUPPORTED) )
{
- DEBUG(10,("Failed to get password policies for
domain %s: %s\n",
- domain->name, nt_errstr(result)));
+ DBG_DEBUG("Failed to get password policies for "
+ "domain %s: %s\n", our_domain->name,
+ nt_errstr(result));
goto done;
}
}
--
Samba Shared Repository
