| 1 |
jpp |
1.1 |
From dc05cb5cd01b3264109ddee8d1bc095cd585e09e Mon Sep 17 00:00:00 2001 |
| 2 |
|
|
From: Andreas Schneider <asn@samba.org> |
| 3 |
|
|
Date: Mon, 20 Mar 2017 16:08:20 +0100 |
| 4 |
|
|
Subject: [PATCH] s3:libsmb: Only print error message if kerberos use is forced |
| 5 |
|
|
|
| 6 |
|
|
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12704 |
| 7 |
|
|
|
| 8 |
|
|
Signed-off-by: Andreas Schneider <asn@samba.org> |
| 9 |
|
|
Reviewed-by: Ralph Boehme <slow@samba.org> |
| 10 |
|
|
--- |
| 11 |
|
|
source3/libsmb/cliconnect.c | 12 +++++++++--- |
| 12 |
|
|
1 file changed, 9 insertions(+), 3 deletions(-) |
| 13 |
|
|
|
| 14 |
|
|
diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c |
| 15 |
|
|
index 029c3d4760e..93f873079db 100644 |
| 16 |
|
|
--- a/source3/libsmb/cliconnect.c |
| 17 |
|
|
+++ b/source3/libsmb/cliconnect.c |
| 18 |
|
|
@@ -349,9 +349,15 @@ NTSTATUS cli_session_creds_prepare_krb5(struct cli_state *cli, |
| 19 |
|
|
0 /* no time correction for now */, |
| 20 |
|
|
NULL); |
| 21 |
|
|
if (ret != 0) { |
| 22 |
|
|
- DEBUG(0, ("Kinit for %s to access %s failed: %s\n", |
| 23 |
|
|
- user_principal, target_hostname, |
| 24 |
|
|
- error_message(ret))); |
| 25 |
|
|
+ int dbglvl = DBGLVL_WARNING; |
| 26 |
|
|
+ |
| 27 |
|
|
+ if (krb5_state == CRED_MUST_USE_KERBEROS) { |
| 28 |
|
|
+ dbglvl = DBGLVL_ERR; |
| 29 |
|
|
+ } |
| 30 |
|
|
+ |
| 31 |
|
|
+ DEBUG(dbglvl, ("Kinit for %s to access %s failed: %s\n", |
| 32 |
|
|
+ user_principal, target_hostname, |
| 33 |
|
|
+ error_message(ret))); |
| 34 |
|
|
if (krb5_state == CRED_MUST_USE_KERBEROS) { |
| 35 |
|
|
TALLOC_FREE(frame); |
| 36 |
|
|
return krb5_to_nt_status(ret); |
| 37 |
|
|
-- |
| 38 |
|
|
2.12.0 |
| 39 |
|
|
|
Parent Directory
| 
Revision Log
| 
Revision Graph
