[SCM] Samba Shared Repository - branch v3-2-test updated -release-3-2-0pre2-475-g2e24f7c

[Jim Brown]

This looks like a typo in the checkin ('a' at beginning of line).

+			if (our_domain == domain ) {
+a				result = fillup_password_policy(our_domain,
state);
+			}

-----Original Message-----
From: samba-cvs-bounces+jim.brown=miami.edu at lists.samba.org
[mailto:samba-cvs-bounces+jim.brown=miami.edu at lists.samba.org] On Behalf Of
Gerald Carter
Sent: Thursday, March 27, 2008 4:59 PM
To: samba-cvs at samba.org
Subject: [SCM] Samba Shared Repository - branch v3-2-test updated
-release-3-2-0pre2-475-g2e24f7c

The branch, v3-2-test has been updated
       via  2e24f7c0243c67a00102c11258cfa6f61caf499f (commit)
       via  4de4949e3bfcfb2169c329f19cb76936d9043d50 (commit)
      from  0d617f639a3c9c52e4327aed4bd02d9e8e7312a2 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


diff --git a/source/winbindd/winbindd_pam.c b/source/winbindd/winbindd_pam.c
index 63127cb..3b13a92 100644
--- a/source/winbindd/winbindd_pam.c
+++ b/source/winbindd/winbindd_pam.c
@@ -1638,12 +1638,24 @@ process_result:
 
 
 		if (state->request.flags & WBFLAG_PAM_GET_PWD_POLICY) {
-			result = fillup_password_policy(domain, state);
-
+			struct winbindd_domain *our_domain =
find_our_domain();
+			
+			/* This is not entiurely correct I believe, but it
is 
+			   consistent.  Only apply the password policy
settings
+			   too warn users for our own domain.  Cannot obtain
these 
+			   from trusted DCs all the  time so don't do it at
all. 
+			   -- jerry */
+
+			result = NT_STATUS_NOT_SUPPORTED;

+			if (our_domain == domain ) {
+a				result = fillup_password_policy(our_domain,
state);
+			}
+			
 			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)));
+				DEBUG(10,("Failed to get password policies
for domain %s: %s\n", 
+					  domain->name, nt_errstr(result)));
 				goto done;
 			}
 		}


-- 
Samba Shared Repository