svn commit: samba r4337 - in branches/SAMBA_3_0/source/smbd: .

[abartlet at samba.org]

Author: abartlet
Date: 2004-12-23 02:16:57 +0000 (Thu, 23 Dec 2004)
New Revision: 4337

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

Log:
Produce a slightly different error message is lanman authentication is
disabled, rather than simply unavailable.

Andrew Bartlett

Modified:
   branches/SAMBA_3_0/source/smbd/chgpasswd.c


Changeset:
Modified: branches/SAMBA_3_0/source/smbd/chgpasswd.c
===================================================================
--- branches/SAMBA_3_0/source/smbd/chgpasswd.c	2004-12-22 23:50:31 UTC (rev 4336)
+++ branches/SAMBA_3_0/source/smbd/chgpasswd.c	2004-12-23 02:16:57 UTC (rev 4337)
@@ -817,9 +817,14 @@
 		pdb_free_sam(&sampass);
 		return NT_STATUS_WRONG_PASSWORD;	
 	} else if (lm_pass_set) {
-		DEBUG(1, ("LM password change supplied for user %s, but we have no LanMan password to check it with\n", 
-			  user));
-		pdb_free_sam(&sampass);
+		if (lp_lanman_auth()) {
+			DEBUG(1, ("LM password change supplied for user %s, but we have no LanMan password to check it with\n", 
+				  user));
+		} else {
+			DEBUG(1, ("LM password change supplied for user %s, but we have disabled LanMan authentication\n", 
+				  user));
+		}
+			pdb_free_sam(&sampass);
 		return NT_STATUS_WRONG_PASSWORD;
 	} else {
 		DEBUG(1, ("password change requested for user %s, but no password supplied!\n",