svn commit: samba r22719 - in branches: SAMBA_3_0/source/nsswitch SAMBA_3_0_26/source/nsswitch

[jerry at samba.org]

Author: jerry
Date: 2007-05-06 21:23:40 +0000 (Sun, 06 May 2007)
New Revision: 22719

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22719

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


Modified:
   branches/SAMBA_3_0/source/nsswitch/winbindd_pam.c
   branches/SAMBA_3_0_26/source/nsswitch/winbindd_pam.c


Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_pam.c
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/winbindd_pam.c	2007-05-06 21:19:22 UTC (rev 22718)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_pam.c	2007-05-06 21:23:40 UTC (rev 22719)
@@ -1534,11 +1534,15 @@
 
 		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 */

Modified: branches/SAMBA_3_0_26/source/nsswitch/winbindd_pam.c
===================================================================
--- branches/SAMBA_3_0_26/source/nsswitch/winbindd_pam.c	2007-05-06 21:19:22 UTC (rev 22718)
+++ branches/SAMBA_3_0_26/source/nsswitch/winbindd_pam.c	2007-05-06 21:23:40 UTC (rev 22719)
@@ -1534,11 +1534,15 @@
 
 		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 */