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

[Karolin Seeger]

The branch, v4-10-test has been updated
       via  3230cf3e23e auth: Fix CID 1458418 Null pointer dereferences (REVERSE_INULL)
       via  11f214df1e3 auth: Fix CID 1458420 Null pointer dereferences (REVERSE_INULL)
      from  7f836b10103 ctdb-tcp: Make error handling for outbound connection consistent

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


- Log -----------------------------------------------------------------
commit 3230cf3e23ea49dd30300932c345590379840917
Author: Volker Lendecke <vl at samba.org>
Date:   Wed Feb 12 15:40:32 2020 +0100

    auth: Fix CID 1458418 Null pointer dereferences (REVERSE_INULL)
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=14247
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Stefan Metzmacher <metze at samba.org>
    (cherry picked from commit ef0350221e194a3dd3350eab02b38baeb32d8fd3)
    
    Autobuild-User(v4-10-test): Karolin Seeger <kseeger at samba.org>
    Autobuild-Date(v4-10-test): Wed Feb 19 13:01:32 UTC 2020 on sn-devel-144

commit 11f214df1e3e0e75985e6fdc00568ed41342ffe6
Author: Volker Lendecke <vl at samba.org>
Date:   Wed Feb 12 15:39:54 2020 +0100

    auth: Fix CID 1458420 Null pointer dereferences (REVERSE_INULL)
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=14247
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Stefan Metzmacher <metze at samba.org>
    (cherry picked from commit 503fc8f2ba662ecbec0788bd1710440464dc5cfd)

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

Summary of changes:
 source3/auth/auth_sam.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/auth/auth_sam.c b/source3/auth/auth_sam.c
index cdb8453b311..f9764d87e3c 100644
--- a/source3/auth/auth_sam.c
+++ b/source3/auth/auth_sam.c
@@ -77,12 +77,13 @@ static NTSTATUS auth_samstrict_auth(const struct auth_context *auth_context,
 				    const struct auth_usersupplied_info *user_info,
 				    struct auth_serversupplied_info **server_info)
 {
-	const char *effective_domain = user_info->mapped.domain_name;
+	const char *effective_domain = NULL;
 	bool is_local_name, is_my_domain;
 
 	if (!user_info || !auth_context) {
 		return NT_STATUS_LOGON_FAILURE;
 	}
+	effective_domain = user_info->mapped.domain_name;
 
 	if (user_info->mapped.account_name == NULL ||
 	    user_info->mapped.account_name[0] == '\0')
@@ -181,12 +182,13 @@ static NTSTATUS auth_sam_netlogon3_auth(const struct auth_context *auth_context,
 					const struct auth_usersupplied_info *user_info,
 					struct auth_serversupplied_info **server_info)
 {
-	const char *effective_domain = user_info->mapped.domain_name;
+	const char *effective_domain = NULL;
 	bool is_my_domain;
 
 	if (!user_info || !auth_context) {
 		return NT_STATUS_LOGON_FAILURE;
 	}
+	effective_domain = user_info->mapped.domain_name;
 
 	if (user_info->mapped.account_name == NULL ||
 	    user_info->mapped.account_name[0] == '\0')


-- 
Samba Shared Repository