diff options
| author | Günther Deschner <gd@samba.org> | 2006-02-07 17:18:29 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:09:56 -0500 |
| commit | 9cdab6ddc0ab8c9be7f257f971e14e7f2958bb95 (patch) | |
| tree | 88df827b7c3e7eb31dae860d6d32419bdd5e7024 /source3/nsswitch/winbindd_pam.c | |
| parent | 0b09d4b2f650e23f79e93433de4c1795c9382795 (diff) | |
| download | samba-9cdab6ddc0ab8c9be7f257f971e14e7f2958bb95.tar.gz samba-9cdab6ddc0ab8c9be7f257f971e14e7f2958bb95.tar.bz2 samba-9cdab6ddc0ab8c9be7f257f971e14e7f2958bb95.zip | |
r13375: Match XP behaviour: Don't force 'Administrator' to change an expired
password on logon. (this might be true for all domain admins as well).
Guenther
(This used to be commit 24c6b9fecb521380008cb44e6d987a6f495027dc)
Diffstat (limited to 'source3/nsswitch/winbindd_pam.c')
| -rw-r--r-- | source3/nsswitch/winbindd_pam.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/source3/nsswitch/winbindd_pam.c b/source3/nsswitch/winbindd_pam.c index ab20102f79..fc8d0885fc 100644 --- a/source3/nsswitch/winbindd_pam.c +++ b/source3/nsswitch/winbindd_pam.c @@ -32,7 +32,6 @@ static NTSTATUS append_info3_as_txt(TALLOC_CTX *mem_ctx, struct winbindd_cli_state *state, NET_USER_INFO_3 *info3) { - DOM_SID user_sid, group_sid; fstring str_sid; state->response.data.auth.info3.logon_time = @@ -51,18 +50,8 @@ static NTSTATUS append_info3_as_txt(TALLOC_CTX *mem_ctx, state->response.data.auth.info3.logon_count = info3->logon_count; state->response.data.auth.info3.bad_pw_count = info3->bad_pw_count; - sid_copy(&user_sid, &(info3->dom_sid.sid)); - sid_append_rid(&user_sid, info3->user_rid); - - sid_to_string(str_sid, &user_sid); - fstrcpy(state->response.data.auth.info3.user_sid, str_sid); - - sid_copy(&group_sid, &(info3->dom_sid.sid)); - sid_append_rid(&group_sid, info3->group_rid); - - sid_to_string(str_sid, &group_sid); - fstrcpy(state->response.data.auth.info3.group_sid, str_sid); - + state->response.data.auth.info3.user_rid = info3->user_rid; + state->response.data.auth.info3.group_rid = info3->group_rid; sid_to_string(str_sid, &(info3->dom_sid.sid)); fstrcpy(state->response.data.auth.info3.dom_sid, str_sid); |