summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2005-01-03 09:00:37 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:08:16 -0500
commit5e94b016f06355289eabcd163678127988421a52 (patch)
treeb0b4c00955718a10c6afcc44daf67a4ba29ba635 /source4
parent8164d2442868a2e8353ee2ae3d61f78aa9ccb226 (diff)
downloadsamba-5e94b016f06355289eabcd163678127988421a52.tar.gz
samba-5e94b016f06355289eabcd163678127988421a52.tar.bz2
samba-5e94b016f06355289eabcd163678127988421a52.zip
r4504: Setting
.enabled = True on modules we know are good (and we want on be default) seems neater. Andrew Bartlett (This used to be commit 18850c66b7c8ac5e8caf08151dbb9b72cf93230f)
Diffstat (limited to 'source4')
-rw-r--r--source4/libcli/auth/gensec.c2
-rw-r--r--source4/libcli/auth/gensec.h2
-rw-r--r--source4/libcli/auth/gensec_gssapi.c5
-rw-r--r--source4/libcli/auth/gensec_krb5.c4
-rw-r--r--source4/libcli/auth/gensec_ntlmssp.c3
-rw-r--r--source4/libcli/auth/spnego.c3
-rw-r--r--source4/librpc/rpc/dcerpc_schannel.c3
7 files changed, 12 insertions, 10 deletions
diff --git a/source4/libcli/auth/gensec.c b/source4/libcli/auth/gensec.c
index c052f61c8c..4a328d6d1c 100644
--- a/source4/libcli/auth/gensec.c
+++ b/source4/libcli/auth/gensec.c
@@ -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;
}
diff --git a/source4/libcli/auth/gensec.h b/source4/libcli/auth/gensec.h
index 8ee6abcd44..434f3fdb4d 100644
--- a/source4/libcli/auth/gensec.h
+++ b/source4/libcli/auth/gensec.h
@@ -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
diff --git a/source4/libcli/auth/gensec_gssapi.c b/source4/libcli/auth/gensec_gssapi.c
index f30d3c5c62..690d36e798 100644
--- a/source4/libcli/auth/gensec_gssapi.c
+++ b/source4/libcli/auth/gensec_gssapi.c
@@ -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)
diff --git a/source4/libcli/auth/gensec_krb5.c b/source4/libcli/auth/gensec_krb5.c
index ce51cef894..0ab32318aa 100644
--- a/source4/libcli/auth/gensec_krb5.c
+++ b/source4/libcli/auth/gensec_krb5.c
@@ -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
};
diff --git a/source4/libcli/auth/gensec_ntlmssp.c b/source4/libcli/auth/gensec_ntlmssp.c
index 10b71ca8b0..53d0104259 100644
--- a/source4/libcli/auth/gensec_ntlmssp.c
+++ b/source4/libcli/auth/gensec_ntlmssp.c
@@ -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
};
diff --git a/source4/libcli/auth/spnego.c b/source4/libcli/auth/spnego.c
index 8b4be6eb75..31dd5aa47d 100644
--- a/source4/libcli/auth/spnego.c
+++ b/source4/libcli/auth/spnego.c
@@ -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)
diff --git a/source4/librpc/rpc/dcerpc_schannel.c b/source4/librpc/rpc/dcerpc_schannel.c
index d58f58625e..8632a3cf16 100644
--- a/source4/librpc/rpc/dcerpc_schannel.c
+++ b/source4/librpc/rpc/dcerpc_schannel.c
@@ -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)