[SCM] Samba Shared Repository - branch master updated

[Andreas Schneider]

The branch, master has been updated
       via  e838d8a winbind: Fix CID 1435598 Error handling issues (CHECKED_RETURN)
      from  8bd67c5 auth: keytab invalidation fix

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit e838d8a5c2c0f1c91abb21bca908dbb0b2e2fba4
Author: Volker Lendecke <vl at samba.org>
Date:   Tue May 15 13:40:36 2018 +0200

    winbind: Fix CID 1435598 Error handling issues (CHECKED_RETURN)
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>
    
    Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
    Autobuild-Date(master): Tue May 15 21:12:33 CEST 2018 on sn-devel-144

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

Summary of changes:
 source3/winbindd/winbindd_pam.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/winbindd/winbindd_pam.c b/source3/winbindd/winbindd_pam.c
index ff40ab5..a7e1681 100644
--- a/source3/winbindd/winbindd_pam.c
+++ b/source3/winbindd/winbindd_pam.c
@@ -989,6 +989,7 @@ static NTSTATUS winbindd_dual_pam_auth_cached(struct winbindd_domain *domain,
 	struct netr_SamInfo3 *my_info3;
 	time_t kickoff_time, must_change_time;
 	bool password_good = false;
+	bool ok;
 #ifdef HAVE_KRB5
 	struct winbindd_tdc_domain *tdc_domain = NULL;
 #endif
@@ -1001,11 +1002,14 @@ static NTSTATUS winbindd_dual_pam_auth_cached(struct winbindd_domain *domain,
 
 	/* Parse domain and username */
 
-	parse_domain_user(state->request->data.auth.user,
-			  name_namespace,
-			  name_domain,
-			  name_user);
-
+	ok = parse_domain_user(state->request->data.auth.user,
+			       name_namespace,
+			       name_domain,
+			       name_user);
+	if (!ok) {
+		DBG_DEBUG("parse_domain_user failed\n");
+		return NT_STATUS_NO_SUCH_USER;
+	}
 
 	if (!lookup_cached_name(name_namespace,
 				name_domain,


-- 
Samba Shared Repository