svn commit: samba r14058 - in branches/SAMBA_4_0/source/libnet: .

abartlet at samba.org abartlet at samba.org
Thu Mar 9 00:59:55 GMT 2006


Author: abartlet
Date: 2006-03-09 00:59:54 +0000 (Thu, 09 Mar 2006)
New Revision: 14058

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

Log:
Try to make the continuation on the list of password set mechs clearer.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/libnet/libnet_passwd.c


Changeset:
Modified: branches/SAMBA_4_0/source/libnet/libnet_passwd.c
===================================================================
--- branches/SAMBA_4_0/source/libnet/libnet_passwd.c	2006-03-08 21:46:16 UTC (rev 14057)
+++ branches/SAMBA_4_0/source/libnet/libnet_passwd.c	2006-03-09 00:59:54 UTC (rev 14058)
@@ -480,9 +480,12 @@
 	for (i=0; i < ARRAY_SIZE(levels); i++) {
 		r->generic.level = levels[i];
 		status = libnet_SetPassword(ctx, mem_ctx, r);
-		if (!NT_STATUS_EQUAL(status, NT_STATUS_INVALID_INFO_CLASS) && !NT_STATUS_EQUAL(status, NT_STATUS_NET_WRITE_FAULT)) {
-			break;
+		if (NT_STATUS_EQUAL(status, NT_STATUS_INVALID_INFO_CLASS)
+		    || NT_STATUS_EQUAL(status, NT_STATUS_NET_WRITE_FAULT)) {
+			/* Try another password set mechanism */
+			continue;
 		}
+		break;
 	}
 	
 	return status;



More information about the samba-cvs mailing list