X-Git-Url: http://git.samba.org/?p=samba.git;a=blobdiff_plain;f=source3%2Fparam%2Floadparm.c;fp=source3%2Fparam%2Floadparm.c;h=4f4912c70e40d903aad63b026d1eb51b81d9bb15;hp=078e67db48f1ffa6aa7e1f1da012425127751b6e;hb=1cd233712e1a62d716a1d8b34ff3dca6a8f0f501;hpb=b2bad13ca3545ea451c7858dace56195d18c4827

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 078e67db48f..4f4912c70e4 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -75,6 +75,7 @@
 #include "libcli/auth/ntlm_check.h"
 #include "lib/crypto/gnutls_helpers.h"
 #include "lib/util/string_wrappers.h"
+#include "auth/credentials/credentials.h"
 
 #ifdef HAVE_SYS_SYSCTL_H
 #include <sys/sysctl.h>
@@ -956,6 +957,8 @@ static void init_globals(struct loadparm_context *lp_ctx, bool reinit_globals)
 
 	Globals.client_smb_encrypt = SMB_ENCRYPTION_DEFAULT;
 
+	Globals._client_use_kerberos = CRED_USE_KERBEROS_DESIRED;
+
 	/* Now put back the settings that were set with lp_set_cmdline() */
 	apply_lp_set_cmdline();
 }
@@ -4708,6 +4711,16 @@ int lp_client_ipc_signing(void)
 	return client_ipc_signing;
 }
 
+enum credentials_use_kerberos lp_client_use_kerberos(void)
+{
+	if (lp_weak_crypto() == SAMBA_WEAK_CRYPTO_DISALLOWED) {
+		return CRED_USE_KERBEROS_REQUIRED;
+	}
+
+	return lp__client_use_kerberos();
+}
+
+
 int lp_rpc_low_port(void)
 {
 	return Globals.rpc_low_port;