diff options
| author | Andreas Schneider <asn@samba.org> | 2018-06-20 11:38:28 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2018-10-19 15:17:27 +0200 |
| commit | 145b2ee5b0df35d1c1b6a316e04e49a8a5816cee (patch) | |
| tree | 67fedf4cdbcba449402f5738b704fc50f8870e4b | |
| parent | 9885da4b6645465a3b9020f5d430892c949a8254 (diff) | |
| download | samba-145b2ee5b0df35d1c1b6a316e04e49a8a5816cee.tar.gz | |
s3:winbind: Fix regression introduced with bso #12851
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12851
Pair-Programmed-With: Guenther Deschner <gd@samba.org>
Signed-off-by: Andreas Schneider <asn@samba.org>
Signed-off-by: Guenther Deschner <gd@samba.org>
(cherry picked from commit c1c764925e24788905ab91aa455b415765d6f71f)
Autobuild-User(v4-7-test): Karolin Seeger <kseeger@samba.org>
Autobuild-Date(v4-7-test): Fri Oct 19 15:17:27 CEST 2018 on sn-devel-144
| -rw-r--r-- | source3/winbindd/wb_getpwsid.c | 28 |
1 files changed, 10 insertions, 18 deletions
diff --git a/source3/winbindd/wb_getpwsid.c b/source3/winbindd/wb_getpwsid.c index 0595034123c..c7cbb53125b 100644 --- a/source3/winbindd/wb_getpwsid.c +++ b/source3/winbindd/wb_getpwsid.c @@ -95,25 +95,17 @@ static void wb_getpwsid_queryuser_done(struct tevent_req *subreq) info->domain_name, acct_name, &mapped_name); - if (NT_STATUS_IS_OK(status)) { - output_username = fill_domain_username_talloc(state, - info->domain_name, - mapped_name, true); - if (output_username == NULL) { - tevent_req_nterror(req, NT_STATUS_NO_MEMORY); - return; - } + if (NT_STATUS_IS_OK(status) || + NT_STATUS_EQUAL(status, NT_STATUS_FILE_RENAMED)) { fstrcpy(acct_name, mapped_name); - } else if (NT_STATUS_EQUAL(status, NT_STATUS_FILE_RENAMED)) { - fstrcpy(acct_name, mapped_name); - } else { - output_username = fill_domain_username_talloc(state, - info->domain_name, - acct_name, true); - if (output_username == NULL) { - tevent_req_nterror(req, NT_STATUS_NO_MEMORY); - return; - } + } + output_username = fill_domain_username_talloc(state, + info->domain_name, + acct_name, + true); + if (output_username == NULL) { + tevent_req_nterror(req, NT_STATUS_NO_MEMORY); + return; } strlcpy(pw->pw_name, output_username, sizeof(pw->pw_name)); |