[SCM] Samba Shared Repository - branch v4-7-test updated

[Karolin Seeger]

The branch, v4-7-test has been updated
       via  145b2ee s3:winbind: Fix regression introduced with bso #12851
      from  9885da4 smb2_server: set req->do_encryption = true earlier

https://git.samba.org/?p=samba.git;a=shortlog;h=v4-7-test


- Log -----------------------------------------------------------------
commit 145b2ee5b0df35d1c1b6a316e04e49a8a5816cee
Author: Andreas Schneider <a...@samba.org>
Date:   Wed Jun 20 11:38:28 2018 +0200

    s3:winbind: Fix regression introduced with bso #12851
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=12851
    
    Pair-Programmed-With: Guenther Deschner <g...@samba.org>
    Signed-off-by: Andreas Schneider <a...@samba.org>
    Signed-off-by: Guenther Deschner <g...@samba.org>
    (cherry picked from commit c1c764925e24788905ab91aa455b415765d6f71f)
    
    Autobuild-User(v4-7-test): Karolin Seeger <ksee...@samba.org>
    Autobuild-Date(v4-7-test): Fri Oct 19 15:17:27 CEST 2018 on sn-devel-144

-----------------------------------------------------------------------

Summary of changes:
 source3/winbindd/wb_getpwsid.c | 28 ++++++++++------------------
 1 file changed, 10 insertions(+), 18 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/winbindd/wb_getpwsid.c b/source3/winbindd/wb_getpwsid.c
index 0595034..c7cbb53 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));


-- 
Samba Shared Repository