[SCM] Samba Shared Repository - branch master updated

[Andreas Schneider]

The branch, master has been updated
       via  c0e196b s3:libsmb: Only print error message if kerberos use is forced
      from  05b5af4 autobuild: Stop waf uninstall from removing test_tmpdir

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


- Log -----------------------------------------------------------------
commit c0e196b2238914f88015c0f8a9073beee473120b
Author: Andreas Schneider <asn at samba.org>
Date:   Mon Mar 20 16:08:20 2017 +0100

    s3:libsmb: Only print error message if kerberos use is forced
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=12704
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>
    
    Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
    Autobuild-Date(master): Tue Mar 21 14:25:54 CET 2017 on sn-devel-144

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

Summary of changes:
 source3/libsmb/cliconnect.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c
index 029c3d4..93f8730 100644
--- a/source3/libsmb/cliconnect.c
+++ b/source3/libsmb/cliconnect.c
@@ -349,9 +349,15 @@ NTSTATUS cli_session_creds_prepare_krb5(struct cli_state *cli,
 				0 /* no time correction for now */,
 				NULL);
 	if (ret != 0) {
-		DEBUG(0, ("Kinit for %s to access %s failed: %s\n",
-			  user_principal, target_hostname,
-			  error_message(ret)));
+		int dbglvl = DBGLVL_WARNING;
+
+		if (krb5_state == CRED_MUST_USE_KERBEROS) {
+			dbglvl = DBGLVL_ERR;
+		}
+
+		DEBUG(dbglvl, ("Kinit for %s to access %s failed: %s\n",
+			       user_principal, target_hostname,
+			       error_message(ret)));
 		if (krb5_state == CRED_MUST_USE_KERBEROS) {
 			TALLOC_FREE(frame);
 			return krb5_to_nt_status(ret);


-- 
Samba Shared Repository