r4504: Setting
authorAndrew Bartlett <abartlet@samba.org>
Mon, 3 Jan 2005 09:00:37 +0000 (09:00 +0000)
committerGerald (Jerry) Carter <jerry@samba.org>
Wed, 10 Oct 2007 18:08:16 +0000 (13:08 -0500)
.enabled = True

on modules we know are good (and we want on be default) seems neater.

Andrew Bartlett
(This used to be commit 18850c66b7c8ac5e8caf08151dbb9b72cf93230f)

source4/libcli/auth/gensec.c
source4/libcli/auth/gensec.h
source4/libcli/auth/gensec_gssapi.c
source4/libcli/auth/gensec_krb5.c
source4/libcli/auth/gensec_ntlmssp.c
source4/libcli/auth/spnego.c
source4/librpc/rpc/dcerpc_schannel.c

index c052f61c8c91f7142fc772109cb86ac497c8250d..4a328d6d1c9365d414ed8ce44eb39b677209e61a 100644 (file)
@@ -778,7 +778,7 @@ NTSTATUS gensec_register(const void *_ops)
 {
        const struct gensec_security_ops *ops = _ops;
        
-       if (!lp_parm_bool(-1, "gensec", ops->name, !ops->disabled_by_default)) {
+       if (!lp_parm_bool(-1, "gensec", ops->name, ops->enabled)) {
                DEBUG(2,("gensec subsystem %s is disabled\n", ops->name));
                return NT_STATUS_OK;
        }
index 8ee6abcd447d92dd36f84de28553af5bf6c702de..434f3fdb4d97bc37dd6556711e421fa96ddb1b3d 100644 (file)
@@ -94,7 +94,7 @@ struct gensec_security_ops {
                                 struct auth_session_info **session_info); 
        BOOL (*have_feature)(struct gensec_security *gensec_security,
                                    uint32 feature); 
-       BOOL disabled_by_default;
+       BOOL enabled;
 };
        
 #define GENSEC_INTERFACE_VERSION 0
index f30d3c5c62c443d181f5e33f4027c792b74d6663..690d36e7983bd1d3b522b7a59e53cbaa5802495a 100644 (file)
@@ -335,7 +335,7 @@ static const struct gensec_security_ops gensec_gssapi_krb5_security_ops = {
        .wrap           = gensec_gssapi_wrap,
        .unwrap         = gensec_gssapi_unwrap,
        .have_feature   = gensec_gssapi_have_feature,
-       .disabled_by_default = True
+       .enabled        = False
 
 };
 
@@ -349,8 +349,7 @@ static const struct gensec_security_ops gensec_gssapi_spnego_security_ops = {
        .wrap           = gensec_gssapi_wrap,
        .unwrap         = gensec_gssapi_unwrap,
        .have_feature   = gensec_gssapi_have_feature,
-       .disabled_by_default = True
-
+       .enabled        = False
 };
 
 NTSTATUS gensec_gssapi_init(void)
index ce51cef89483b37a0428e0a391f8f1441af11fda..0ab32318aaf19dfec4198b6fb9e8b72da0c2bbb9 100644 (file)
@@ -712,7 +712,7 @@ static const struct gensec_security_ops gensec_krb5_security_ops = {
        .session_key    = gensec_krb5_session_key,
        .session_info   = gensec_krb5_session_info,
        .have_feature   = gensec_krb5_have_feature,
-       .disabled_by_default = True
+       .enabled        = False
 };
 
 static const struct gensec_security_ops gensec_ms_krb5_security_ops = {
@@ -725,7 +725,7 @@ static const struct gensec_security_ops gensec_ms_krb5_security_ops = {
        .session_key    = gensec_krb5_session_key,
        .session_info   = gensec_krb5_session_info,
        .have_feature   = gensec_krb5_have_feature,
-       .disabled_by_default = True
+       .enabled        = False
 };
 
 
index 10b71ca8b0036a08d5b60b97a017c5c8027a9ea2..53d01042599473f553e69fc479bbc132bb42045d 100644 (file)
@@ -543,7 +543,8 @@ static const struct gensec_security_ops gensec_ntlmssp_security_ops = {
        .unwrap         = gensec_ntlmssp_unwrap,
        .session_key    = gensec_ntlmssp_session_key,
        .session_info   = gensec_ntlmssp_session_info,
-       .have_feature   = gensec_ntlmssp_have_feature
+       .have_feature   = gensec_ntlmssp_have_feature,
+       .enabled        = True
 };
 
 
index 8b4be6eb751f17d38ee349a10ecbbc364ee33ba4..31dd5aa47d2c5bee1097b9ea4f75f0ac6f12dfbe 100644 (file)
@@ -777,7 +777,8 @@ static const struct gensec_security_ops gensec_spnego_security_ops = {
        .unwrap         = gensec_spnego_unwrap,
        .session_key    = gensec_spnego_session_key,
        .session_info   = gensec_spnego_session_info,
-       .have_feature   = gensec_spnego_have_feature
+       .have_feature   = gensec_spnego_have_feature,
+       .enabled        = True
 };
 
 NTSTATUS gensec_spnego_init(void)
index d58f58625e8878afb8bbe6b63e1af9b8110d9594..8632a3cf168f1c272274f4336be30adb316aa789 100644 (file)
@@ -534,7 +534,8 @@ static const struct gensec_security_ops gensec_dcerpc_schannel_security_ops = {
        .session_key    = dcerpc_schannel_session_key,
        .session_info   = dcerpc_schannel_session_info,
        .sig_size       = dcerpc_schannel_sig_size,
-       .have_feature  = dcerpc_schannel_have_feature
+       .have_feature   = dcerpc_schannel_have_feature,
+       .enabled        = True
 };
 
 NTSTATUS gensec_dcerpc_schannel_init(void)