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

diff --git a/source3/winbindd/wb_getpwsid.c b/source3/winbindd/wb_getpwsid.c
index 0595034123c3cfc04bdd20a9e741dca82eb3cfde..c7cbb53125b540188c52eb1270889f5cc0336c39 100644 (file)
--- 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));