diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2006-03-09 00:59:54 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:52:38 -0500 |
| commit | 91b1815fa9fcc11437b74c4d5e8a0e4e97b40906 (patch) | |
| tree | 06e16d156c88d9828438b18d0db7645c2591e8e0 /source4 | |
| parent | 2fe65142c2cc5a05fc5a24e8622d397e27b1ad5a (diff) | |
| download | samba-91b1815fa9fcc11437b74c4d5e8a0e4e97b40906.tar.gz samba-91b1815fa9fcc11437b74c4d5e8a0e4e97b40906.tar.bz2 samba-91b1815fa9fcc11437b74c4d5e8a0e4e97b40906.zip | |
r14058: Try to make the continuation on the list of password set mechs clearer.
Andrew Bartlett
(This used to be commit 0aa7160a66ee6951311fd7076faa2d27e25d620d)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/libnet/libnet_passwd.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/source4/libnet/libnet_passwd.c b/source4/libnet/libnet_passwd.c index 3ccba754ea..e7a474811f 100644 --- a/source4/libnet/libnet_passwd.c +++ b/source4/libnet/libnet_passwd.c @@ -480,9 +480,12 @@ static NTSTATUS libnet_SetPassword_samr_handle(struct libnet_context *ctx, TALLO 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; |