mirror of
https://github.com/samba-team/samba.git
synced 2024-12-25 23:21:54 +03:00
Merge paramaters for client-side-auth updates.
(This used to be commit 68d3471127
)
This commit is contained in:
parent
e822de1d85
commit
11e98c0a4a
@ -761,6 +761,8 @@ static struct parm_struct parm_table[] = {
|
||||
{"restrict anonymous", P_INTEGER, P_GLOBAL, &Globals.restrict_anonymous, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
|
||||
{"lanman auth", P_BOOL, P_GLOBAL, &Globals.bLanmanAuth, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
|
||||
{"ntlm auth", P_BOOL, P_GLOBAL, &Globals.bNTLMAuth, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
|
||||
{"client NTLMv2 auth", P_BOOL, P_GLOBAL, &Globals.bClientNTLMv2Auth, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
|
||||
{"client lanman auth", P_BOOL, P_GLOBAL, &Globals.bClientLanManAuth, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
|
||||
|
||||
{"username", P_STRING, P_LOCAL, &sDefault.szUsername, NULL, NULL, FLAG_GLOBAL | FLAG_SHARE},
|
||||
{"user", P_STRING, P_LOCAL, &sDefault.szUsername, NULL, NULL, FLAG_HIDE},
|
||||
@ -851,6 +853,8 @@ static struct parm_struct parm_table[] = {
|
||||
{"time server", P_BOOL, P_GLOBAL, &Globals.bTimeServer, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
|
||||
{"unix extensions", P_BOOL, P_GLOBAL, &Globals.bUnixExtensions, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
|
||||
{"use spnego", P_BOOL, P_GLOBAL, &Globals.bUseSpnego, NULL, NULL, FLAG_DEVELOPER},
|
||||
{"client signing", P_BOOL, P_GLOBAL, &Globals.client_signing, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
|
||||
{"client use spnego", P_BOOL, P_GLOBAL, &Globals.bClientUseSpnego, NULL, NULL, FLAG_DEVELOPER},
|
||||
|
||||
{"Tuning Options", P_SEP, P_SEPARATOR},
|
||||
|
||||
@ -1362,8 +1366,10 @@ static void init_globals(void)
|
||||
Globals.bNTStatusSupport = True; /* Use NT status by default. */
|
||||
Globals.bStatCache = True; /* use stat cache by default */
|
||||
Globals.restrict_anonymous = 0;
|
||||
Globals.bClientLanManAuth = True; /* Do use the LanMan hash if it is available */
|
||||
Globals.bLanmanAuth = True; /* Do use the LanMan hash if it is available */
|
||||
Globals.bNTLMAuth = True; /* Do use NTLMv1 if it is available (otherwise NTLMv2) */
|
||||
|
||||
Globals.map_to_guest = 0; /* By Default, "Never" */
|
||||
Globals.min_passwd_length = MINPASSWDLENGTH; /* By Default, 5. */
|
||||
Globals.oplock_break_wait_time = 0; /* By Default, 0 msecs. */
|
||||
@ -1440,6 +1446,7 @@ static void init_globals(void)
|
||||
Globals.name_cache_timeout = 660; /* In seconds */
|
||||
|
||||
Globals.bUseSpnego = True;
|
||||
Globals.bClientUseSpnego = True;
|
||||
|
||||
string_set(&Globals.smb_ports, SMB_PORTS);
|
||||
}
|
||||
@ -1662,12 +1669,15 @@ FN_GLOBAL_BOOL(lp_allow_trusted_domains, &Globals.bAllowTrustedDomains)
|
||||
FN_GLOBAL_INTEGER(lp_restrict_anonymous, &Globals.restrict_anonymous)
|
||||
FN_GLOBAL_BOOL(lp_lanman_auth, &Globals.bLanmanAuth)
|
||||
FN_GLOBAL_BOOL(lp_ntlm_auth, &Globals.bNTLMAuth)
|
||||
FN_GLOBAL_BOOL(lp_client_lanman_auth, &Globals.bClientLanManAuth)
|
||||
FN_GLOBAL_BOOL(lp_client_ntlmv2_auth, &Globals.bClientNTLMv2Auth)
|
||||
FN_GLOBAL_BOOL(lp_host_msdfs, &Globals.bHostMSDfs)
|
||||
FN_GLOBAL_BOOL(lp_kernel_oplocks, &Globals.bKernelOplocks)
|
||||
FN_GLOBAL_BOOL(lp_enhanced_browsing, &Globals.enhanced_browsing)
|
||||
FN_GLOBAL_BOOL(lp_use_mmap, &Globals.bUseMmap)
|
||||
FN_GLOBAL_BOOL(lp_unix_extensions, &Globals.bUnixExtensions)
|
||||
FN_GLOBAL_BOOL(lp_use_spnego, &Globals.bUseSpnego)
|
||||
FN_GLOBAL_BOOL(lp_client_use_spnego, &Globals.bClientUseSpnego)
|
||||
FN_GLOBAL_BOOL(lp_hostname_lookups, &Globals.bHostnameLookups)
|
||||
FN_GLOBAL_BOOL(lp_kernel_change_notify, &Globals.bKernelChangeNotify)
|
||||
FN_GLOBAL_INTEGER(lp_os_level, &Globals.os_level)
|
||||
@ -1814,6 +1824,7 @@ FN_GLOBAL_INTEGER(lp_winbind_cache_time, &Globals.winbind_cache_time)
|
||||
FN_GLOBAL_BOOL(lp_hide_local_users, &Globals.bHideLocalUsers)
|
||||
FN_GLOBAL_BOOL(lp_algorithmic_rid_base, &Globals.bAlgorithmicRidBase)
|
||||
FN_GLOBAL_INTEGER(lp_name_cache_timeout, &Globals.name_cache_timeout)
|
||||
FN_GLOBAL_BOOL(lp_client_signing, &Globals.client_signing)
|
||||
|
||||
typedef struct _param_opt_struct param_opt_struct;
|
||||
struct _param_opt_struct {
|
||||
|
Loading…
Reference in New Issue
Block a user