svn commit: samba r4500 - in branches/SAMBA_4_0/source: libcli/auth
param
abartlet at samba.org
abartlet at samba.org
Mon Jan 3 07:08:15 GMT 2005
Author: abartlet
Date: 2005-01-03 07:08:14 +0000 (Mon, 03 Jan 2005)
New Revision: 4500
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=4500
Log:
Allow GENSEC modules to be disabled by setting a flag on their module
definition, not by hardcoded reference in loadparm.c
Andrew Bartlett
Modified:
branches/SAMBA_4_0/source/libcli/auth/gensec.c
branches/SAMBA_4_0/source/libcli/auth/gensec.h
branches/SAMBA_4_0/source/libcli/auth/gensec_gssapi.c
branches/SAMBA_4_0/source/libcli/auth/gensec_krb5.c
branches/SAMBA_4_0/source/param/loadparm.c
Changeset:
Modified: branches/SAMBA_4_0/source/libcli/auth/gensec.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/auth/gensec.c 2005-01-03 06:23:02 UTC (rev 4499)
+++ branches/SAMBA_4_0/source/libcli/auth/gensec.c 2005-01-03 07:08:14 UTC (rev 4500)
@@ -778,7 +778,7 @@
{
const struct gensec_security_ops *ops = _ops;
- if (!lp_parm_bool(-1, "gensec", ops->name, True)) {
+ if (!lp_parm_bool(-1, "gensec", ops->name, !ops->disabled_by_default)) {
DEBUG(2,("gensec subsystem %s is disabled\n", ops->name));
return NT_STATUS_OK;
}
Modified: branches/SAMBA_4_0/source/libcli/auth/gensec.h
===================================================================
--- branches/SAMBA_4_0/source/libcli/auth/gensec.h 2005-01-03 06:23:02 UTC (rev 4499)
+++ branches/SAMBA_4_0/source/libcli/auth/gensec.h 2005-01-03 07:08:14 UTC (rev 4500)
@@ -94,6 +94,7 @@
struct auth_session_info **session_info);
BOOL (*have_feature)(struct gensec_security *gensec_security,
uint32 feature);
+ BOOL disabled_by_default;
};
#define GENSEC_INTERFACE_VERSION 0
Modified: branches/SAMBA_4_0/source/libcli/auth/gensec_gssapi.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/auth/gensec_gssapi.c 2005-01-03 06:23:02 UTC (rev 4499)
+++ branches/SAMBA_4_0/source/libcli/auth/gensec_gssapi.c 2005-01-03 07:08:14 UTC (rev 4500)
@@ -334,7 +334,8 @@
.update = gensec_gssapi_update,
.wrap = gensec_gssapi_wrap,
.unwrap = gensec_gssapi_unwrap,
- .have_feature = gensec_gssapi_have_feature
+ .have_feature = gensec_gssapi_have_feature,
+ .disabled_by_default = True
};
@@ -347,7 +348,8 @@
.update = gensec_gssapi_update,
.wrap = gensec_gssapi_wrap,
.unwrap = gensec_gssapi_unwrap,
- .have_feature = gensec_gssapi_have_feature
+ .have_feature = gensec_gssapi_have_feature,
+ .disabled_by_default = True
};
Modified: branches/SAMBA_4_0/source/libcli/auth/gensec_krb5.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/auth/gensec_krb5.c 2005-01-03 06:23:02 UTC (rev 4499)
+++ branches/SAMBA_4_0/source/libcli/auth/gensec_krb5.c 2005-01-03 07:08:14 UTC (rev 4500)
@@ -712,6 +712,7 @@
.session_key = gensec_krb5_session_key,
.session_info = gensec_krb5_session_info,
.have_feature = gensec_krb5_have_feature,
+ .disabled_by_default = True
};
static const struct gensec_security_ops gensec_ms_krb5_security_ops = {
@@ -724,6 +725,7 @@
.session_key = gensec_krb5_session_key,
.session_info = gensec_krb5_session_info,
.have_feature = gensec_krb5_have_feature,
+ .disabled_by_default = True
};
Modified: branches/SAMBA_4_0/source/param/loadparm.c
===================================================================
--- branches/SAMBA_4_0/source/param/loadparm.c 2005-01-03 06:23:02 UTC (rev 4499)
+++ branches/SAMBA_4_0/source/param/loadparm.c 2005-01-03 07:08:14 UTC (rev 4500)
@@ -3078,11 +3078,6 @@
lp_do_parameter(-1, "wins server", "127.0.0.1");
}
- lp_do_parameter(-1, "gensec:gssapi_krb5", "False");
- lp_do_parameter(-1, "gensec:gssapi_spnego", "False");
- lp_do_parameter(-1, "gensec:krb5", "False");
- lp_do_parameter(-1, "gensec:ms_krb5", "False");
-
init_iconv();
return (bRetval);
More information about the samba-cvs
mailing list