diff options
author | Rafal Szczesniak <mimir@samba.org> | 2006-09-19 19:10:14 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:19:01 -0500 |
commit | 3394bb23fd9c7c7b9d388be414143d0fffdb2593 (patch) | |
tree | 33a57f27c7e2da0544c391bf15683eee40ca8f2b | |
parent | 2f98c1916d958de090d80d2b710a49f3ad5404ce (diff) | |
download | samba-3394bb23fd9c7c7b9d388be414143d0fffdb2593.tar.gz samba-3394bb23fd9c7c7b9d388be414143d0fffdb2593.tar.bz2 samba-3394bb23fd9c7c7b9d388be414143d0fffdb2593.zip |
r18682: a bit of a change in setfield function.
one more change to do...
rafal
(This used to be commit 43b550c83b9e595ba140a89df5683574513a3a4c)
-rw-r--r-- | source4/libnet/userman.c | 254 |
1 files changed, 127 insertions, 127 deletions
diff --git a/source4/libnet/userman.c b/source4/libnet/userman.c index c565dde00a..afc093aa83 100644 --- a/source4/libnet/userman.c +++ b/source4/libnet/userman.c @@ -555,142 +555,142 @@ static NTSTATUS usermod_lookup(struct composite_context *c, static uint32_t usermod_setfields(struct usermod_state *s, uint16_t *level, union samr_UserInfo *i) { - if (s->change.fields) { - if (s->change.fields & USERMOD_FIELD_ACCOUNT_NAME) { - *level = 7; - i->info7.account_name.string = s->change.account_name; - - s->change.fields ^= USERMOD_FIELD_ACCOUNT_NAME; - - } else if (s->change.fields & USERMOD_FIELD_FULL_NAME) { - *level = 8; - i->info8.full_name.string = s->change.full_name; - - s->change.fields ^= USERMOD_FIELD_FULL_NAME; + if (s->change.fields == 0) return s->change.fields; - } else if (s->change.fields & USERMOD_FIELD_DESCRIPTION) { - *level = 13; - i->info13.description.string = s->change.description; + if (s->change.fields & USERMOD_FIELD_ACCOUNT_NAME) { + *level = 7; + i->info7.account_name.string = s->change.account_name; + + s->change.fields ^= USERMOD_FIELD_ACCOUNT_NAME; + + } else if (s->change.fields & USERMOD_FIELD_FULL_NAME) { + *level = 8; + i->info8.full_name.string = s->change.full_name; + + s->change.fields ^= USERMOD_FIELD_FULL_NAME; + + } else if (s->change.fields & USERMOD_FIELD_DESCRIPTION) { + *level = 13; + i->info13.description.string = s->change.description; + + s->change.fields ^= USERMOD_FIELD_DESCRIPTION; + + } else if (s->change.fields & USERMOD_FIELD_COMMENT) { + *level = 2; + + if (s->stage == USERMOD_QUERY) { + /* the user info is obtained, so now set the required field */ + i->info2.comment.string = s->change.comment; + s->change.fields ^= USERMOD_FIELD_COMMENT; - s->change.fields ^= USERMOD_FIELD_DESCRIPTION; - - } else if (s->change.fields & USERMOD_FIELD_COMMENT) { - *level = 2; - - if (s->stage == USERMOD_QUERY) { - /* the user info is obtained, so now set the required field */ - i->info2.comment.string = s->change.comment; - s->change.fields ^= USERMOD_FIELD_COMMENT; - - } else { - /* we need to query the user info before setting one field in it */ - s->stage = USERMOD_QUERY; - return s->change.fields; - } - - } else if (s->change.fields & USERMOD_FIELD_ALLOW_PASS_CHG) { - *level = 3; + } else { + /* we need to query the user info before setting one field in it */ + s->stage = USERMOD_QUERY; + return s->change.fields; + } + + } else if (s->change.fields & USERMOD_FIELD_ALLOW_PASS_CHG) { + *level = 3; + + if (s->stage == USERMOD_QUERY) { + i->info3.allow_password_change = timeval_to_nttime(s->change.allow_password_change); + s->change.fields ^= USERMOD_FIELD_ALLOW_PASS_CHG; - if (s->stage == USERMOD_QUERY) { - i->info3.allow_password_change = timeval_to_nttime(s->change.allow_password_change); - s->change.fields ^= USERMOD_FIELD_ALLOW_PASS_CHG; - - } else { - s->stage = USERMOD_QUERY; - return s->change.fields; - } - - } else if (s->change.fields & USERMOD_FIELD_FORCE_PASS_CHG) { - *level = 3; - - if (s->stage == USERMOD_QUERY) { - i->info3.force_password_change = timeval_to_nttime(s->change.force_password_change); - s->change.fields ^= USERMOD_FIELD_FORCE_PASS_CHG; + } else { + s->stage = USERMOD_QUERY; + return s->change.fields; + } - } else { - s->stage = USERMOD_QUERY; - return s->change.fields; - } + } else if (s->change.fields & USERMOD_FIELD_FORCE_PASS_CHG) { + *level = 3; - } else if (s->change.fields & USERMOD_FIELD_LAST_LOGON) { - *level = 3; + if (s->stage == USERMOD_QUERY) { + i->info3.force_password_change = timeval_to_nttime(s->change.force_password_change); + s->change.fields ^= USERMOD_FIELD_FORCE_PASS_CHG; - if (s->stage == USERMOD_QUERY) { - i->info3.last_logon = timeval_to_nttime(s->change.last_logon); - s->change.fields ^= USERMOD_FIELD_LAST_LOGON; - } else { - s->stage = USERMOD_QUERY; - return s->change.fields; - } + } else { + s->stage = USERMOD_QUERY; + return s->change.fields; + } - } else if (s->change.fields & USERMOD_FIELD_LAST_LOGOFF) { - *level = 3; - - if (s->stage == USERMOD_QUERY) { - i->info3.last_logoff = timeval_to_nttime(s->change.last_logoff); - s->change.fields ^= USERMOD_FIELD_LAST_LOGOFF; - } else { - s->stage = USERMOD_QUERY; - return s->change.fields; - } - - } else if (s->change.fields & USERMOD_FIELD_LAST_PASS_CHG) { - *level = 3; - - if (s->stage == USERMOD_QUERY) { - i->info3.last_password_change = timeval_to_nttime(s->change.last_password_change); - s->change.fields ^= USERMOD_FIELD_LAST_PASS_CHG; - } else { - s->stage = USERMOD_QUERY; - return s->change.fields; - } - - } else if (s->change.fields & USERMOD_FIELD_LOGON_SCRIPT) { - *level = 11; - i->info11.logon_script.string = s->change.logon_script; - - s->change.fields ^= USERMOD_FIELD_LOGON_SCRIPT; - - } else if (s->change.fields & USERMOD_FIELD_PROFILE_PATH) { - *level = 12; - i->info12.profile_path.string = s->change.profile_path; - - s->change.fields ^= USERMOD_FIELD_PROFILE_PATH; + } else if (s->change.fields & USERMOD_FIELD_LAST_LOGON) { + *level = 3; + + if (s->stage == USERMOD_QUERY) { + i->info3.last_logon = timeval_to_nttime(s->change.last_logon); + s->change.fields ^= USERMOD_FIELD_LAST_LOGON; + } else { + s->stage = USERMOD_QUERY; + return s->change.fields; + } + + } else if (s->change.fields & USERMOD_FIELD_LAST_LOGOFF) { + *level = 3; + + if (s->stage == USERMOD_QUERY) { + i->info3.last_logoff = timeval_to_nttime(s->change.last_logoff); + s->change.fields ^= USERMOD_FIELD_LAST_LOGOFF; + } else { + s->stage = USERMOD_QUERY; + return s->change.fields; + } - } else if (s->change.fields & USERMOD_FIELD_HOME_DIRECTORY) { - *level = 3; - - if (s->stage == USERMOD_QUERY) { - i->info3.home_directory.string = s->change.home_directory; - s->change.fields ^= USERMOD_FIELD_HOME_DIRECTORY; - } else { - s->stage = USERMOD_QUERY; - return s->change.fields; - } - - } else if (s->change.fields & USERMOD_FIELD_HOME_DRIVE) { - *level = 3; - - if (s->stage == USERMOD_QUERY) { - i->info3.home_drive.string = s->change.home_drive; - s->change.fields ^= USERMOD_FIELD_HOME_DRIVE; - } else { - s->stage = USERMOD_QUERY; - return s->change.fields; - } - - } else if (s->change.fields & USERMOD_FIELD_ACCT_EXPIRY) { - *level = 17; - i->info17.acct_expiry = timeval_to_nttime(s->change.acct_expiry); - - s->change.fields ^= USERMOD_FIELD_ACCT_EXPIRY; - - } else if (s->change.fields & USERMOD_FIELD_ACCT_FLAGS) { - *level = 16; - i->info16.acct_flags = s->change.acct_flags; - - s->change.fields ^= USERMOD_FIELD_ACCT_FLAGS; + } else if (s->change.fields & USERMOD_FIELD_LAST_PASS_CHG) { + *level = 3; + + if (s->stage == USERMOD_QUERY) { + i->info3.last_password_change = timeval_to_nttime(s->change.last_password_change); + s->change.fields ^= USERMOD_FIELD_LAST_PASS_CHG; + } else { + s->stage = USERMOD_QUERY; + return s->change.fields; + } + + } else if (s->change.fields & USERMOD_FIELD_LOGON_SCRIPT) { + *level = 11; + i->info11.logon_script.string = s->change.logon_script; + + s->change.fields ^= USERMOD_FIELD_LOGON_SCRIPT; + + } else if (s->change.fields & USERMOD_FIELD_PROFILE_PATH) { + *level = 12; + i->info12.profile_path.string = s->change.profile_path; + + s->change.fields ^= USERMOD_FIELD_PROFILE_PATH; + + } else if (s->change.fields & USERMOD_FIELD_HOME_DIRECTORY) { + *level = 3; + + if (s->stage == USERMOD_QUERY) { + i->info3.home_directory.string = s->change.home_directory; + s->change.fields ^= USERMOD_FIELD_HOME_DIRECTORY; + } else { + s->stage = USERMOD_QUERY; + return s->change.fields; + } + + } else if (s->change.fields & USERMOD_FIELD_HOME_DRIVE) { + *level = 3; + + if (s->stage == USERMOD_QUERY) { + i->info3.home_drive.string = s->change.home_drive; + s->change.fields ^= USERMOD_FIELD_HOME_DRIVE; + } else { + s->stage = USERMOD_QUERY; + return s->change.fields; } + + } else if (s->change.fields & USERMOD_FIELD_ACCT_EXPIRY) { + *level = 17; + i->info17.acct_expiry = timeval_to_nttime(s->change.acct_expiry); + + s->change.fields ^= USERMOD_FIELD_ACCT_EXPIRY; + + } else if (s->change.fields & USERMOD_FIELD_ACCT_FLAGS) { + *level = 16; + i->info16.acct_flags = s->change.acct_flags; + + s->change.fields ^= USERMOD_FIELD_ACCT_FLAGS; } /* We're going to be here back again soon unless all fields have been set */ |