diff options
| author | Gerald Carter <jerry@samba.org> | 2007-05-06 21:23:40 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:21:50 -0500 |
| commit | cf4f314fb3b303f324c51b145d64083a12c1e1e1 (patch) | |
| tree | c9b4417839d87e8b7bc2aff11f373cd5e29f4ee7 /source3 | |
| parent | 2a9c7462c7e45ccfc57d5c6943c344980b71d631 (diff) | |
| download | samba-cf4f314fb3b303f324c51b145d64083a12c1e1e1.tar.gz samba-cf4f314fb3b303f324c51b145d64083a12c1e1e1.tar.bz2 samba-cf4f314fb3b303f324c51b145d64083a12c1e1e1.zip | |
r22719: Missed change for one-way trust support. Ignore password policy
settings from one trusted domain with no incoming trust path.
Guenther, I think this is ok as we only need the pw policy
to give feedback on upcoming expiration times.
(This used to be commit c79ae57388d087496777129d6936cd51aab38d5b)
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/nsswitch/winbindd_pam.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source3/nsswitch/winbindd_pam.c b/source3/nsswitch/winbindd_pam.c index 66ac61e5c9..6eb587f0ee 100644 --- a/source3/nsswitch/winbindd_pam.c +++ b/source3/nsswitch/winbindd_pam.c @@ -1534,11 +1534,15 @@ process_result: result = fillup_password_policy(domain, state); - if (!NT_STATUS_IS_OK(result)) { + if (!NT_STATUS_IS_OK(result) + && !NT_STATUS_EQUAL(result, NT_STATUS_NOT_SUPPORTED) ) + { DEBUG(10,("Failed to get password policies: %s\n", nt_errstr(result))); goto done; } + result = NT_STATUS_OK; + if (state->request.flags & WBFLAG_PAM_UNIX_NAME) { /* We've been asked to return the unix username, per 'winbind use default domain' settings and the like */ |