From: Gerald Carter <jerry@samba.org>
Date: Sun, 6 May 2007 21:23:40 +0000 (+0000)
Subject: r22719: Missed change for one-way trust support.  Ignore password policy
X-Git-Tag: samba-misc-tags/initial-v3-0-unstable~526
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c79ae57388d087496777129d6936cd51aab38d5b;p=thirdparty%2Fsamba.git

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.
---

diff --git a/source/nsswitch/winbindd_pam.c b/source/nsswitch/winbindd_pam.c
index 66ac61e5c9d..6eb587f0ee4 100644
--- a/source/nsswitch/winbindd_pam.c
+++ b/source/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 */