diff options
| author | Rafal Szczesniak <mimir@samba.org> | 2007-09-20 10:23:02 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 15:07:00 -0500 |
| commit | 21dd06471ba882bf0ba475d7f45e42876792093b (patch) | |
| tree | c0a82a521a31734ffdc7a0bdce474a2dc8de616e /source4 | |
| parent | d4f0d738f1ca3c4884a831a31bdd7c6de34b0961 (diff) | |
| download | samba-21dd06471ba882bf0ba475d7f45e42876792093b.tar.gz samba-21dd06471ba882bf0ba475d7f45e42876792093b.tar.bz2 samba-21dd06471ba882bf0ba475d7f45e42876792093b.zip | |
r25256: Fix missing field set in libnet_ModifyUser routine.
Submitted by Matthias Dieter Wallnoefer <mwallnoefer@yahoo.de>
rafal
(This used to be commit 4fe47e4f976f125537b6a9fc7b13b25efe3d73a6)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/libnet/libnet_user.c | 5 | ||||
| -rw-r--r-- | source4/libnet/libnet_user.h | 6 |
2 files changed, 10 insertions, 1 deletions
diff --git a/source4/libnet/libnet_user.c b/source4/libnet/libnet_user.c index fe303620fe..28b743b42e 100644 --- a/source4/libnet/libnet_user.c +++ b/source4/libnet/libnet_user.c @@ -1,7 +1,7 @@ /* Unix SMB/CIFS implementation. - Copyright (C) Rafal Szczesniak <mimir@samba.org> 2005 + Copyright (C) Rafal Szczesniak 2005 This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -533,6 +533,9 @@ static NTSTATUS set_user_changes(TALLOC_CTX *mem_ctx, struct usermod_change *mod /* account expiry change */ SET_FIELD_NTTIME(r->in, user, mod, acct_expiry, USERMOD_FIELD_ACCT_EXPIRY); + /* account flags change */ + SET_FIELD_UINT32(r->in, user, mod, acct_flags, USERMOD_FIELD_ACCT_FLAGS); + return NT_STATUS_OK; } diff --git a/source4/libnet/libnet_user.h b/source4/libnet/libnet_user.h index 3bbe1cc65e..ece06f08fc 100644 --- a/source4/libnet/libnet_user.h +++ b/source4/libnet/libnet_user.h @@ -85,6 +85,12 @@ struct libnet_ModifyUser { } \ } +#define SET_FIELD_UINT32(new, current, mod, field, flag) \ + if (current->field != new.field) { \ + mod->field = new.field; \ + mod->fields |= flag; \ + } + struct libnet_UserInfo { struct { |