svn commit: samba r18250 - in branches/SAMBA_4_0/source/auth:
gensec ntlmssp
abartlet at samba.org
abartlet at samba.org
Fri Sep 8 04:37:58 GMT 2006
Author: abartlet
Date: 2006-09-08 04:37:56 +0000 (Fri, 08 Sep 2006)
New Revision: 18250
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=18250
Log:
Add an ordering of GENSEC modules, so we do preferred modules first.
Andrew Bartlett
Modified:
branches/SAMBA_4_0/source/auth/gensec/cyrus_sasl.c
branches/SAMBA_4_0/source/auth/gensec/gensec.h
branches/SAMBA_4_0/source/auth/gensec/gensec_krb5.c
branches/SAMBA_4_0/source/auth/gensec/schannel.c
branches/SAMBA_4_0/source/auth/gensec/spnego.c
branches/SAMBA_4_0/source/auth/ntlmssp/ntlmssp.c
Changeset:
Modified: branches/SAMBA_4_0/source/auth/gensec/cyrus_sasl.c
===================================================================
--- branches/SAMBA_4_0/source/auth/gensec/cyrus_sasl.c 2006-09-08 04:36:41 UTC (rev 18249)
+++ branches/SAMBA_4_0/source/auth/gensec/cyrus_sasl.c 2006-09-08 04:37:56 UTC (rev 18250)
@@ -308,7 +308,8 @@
.wrap_packets = gensec_sasl_wrap_packets,
.unwrap_packets = gensec_sasl_unwrap_packets,
.have_feature = gensec_sasl_have_feature,
- .enabled = False,
+ .enabled = True,
+ .order = GENSEC_SASL
};
int gensec_sasl_log(void *context,
Modified: branches/SAMBA_4_0/source/auth/gensec/gensec.h
===================================================================
--- branches/SAMBA_4_0/source/auth/gensec/gensec.h 2006-09-08 04:36:41 UTC (rev 18249)
+++ branches/SAMBA_4_0/source/auth/gensec/gensec.h 2006-09-08 04:37:56 UTC (rev 18250)
@@ -32,6 +32,16 @@
#define GENSEC_OID_KERBEROS5_OLD "1 2 840 48018 1 2 2"
#define GENSEC_OID_KERBEROS5_USER2USER "1 2 840 113554 1 2 2 3"
+enum gensec_order {
+ GENSEC_SPNEGO,
+ GENSEC_GSSAPI,
+ GENSEC_KRB5,
+ GENSEC_SCHANNEL,
+ GENSEC_NTLMSSP,
+ GENSEC_SASL,
+ GENSEC_OTHER
+};
+
struct gensec_security;
struct gensec_target {
const char *principal;
@@ -127,6 +137,7 @@
uint32_t feature);
BOOL enabled;
BOOL kerberos;
+ enum gensec_order order;
};
struct gensec_security_ops_wrapper {
Modified: branches/SAMBA_4_0/source/auth/gensec/gensec_krb5.c
===================================================================
--- branches/SAMBA_4_0/source/auth/gensec/gensec_krb5.c 2006-09-08 04:36:41 UTC (rev 18249)
+++ branches/SAMBA_4_0/source/auth/gensec/gensec_krb5.c 2006-09-08 04:37:56 UTC (rev 18250)
@@ -729,7 +729,8 @@
.session_info = gensec_krb5_session_info,
.have_feature = gensec_krb5_have_feature,
.enabled = False,
- .kerberos = True
+ .kerberos = True,
+ .order = GENSEC_KRB5
};
static const struct gensec_security_ops gensec_krb5_security_ops = {
@@ -743,7 +744,8 @@
.wrap = gensec_krb5_wrap,
.unwrap = gensec_krb5_unwrap,
.enabled = True,
- .kerberos = True
+ .kerberos = True,
+ .order = GENSEC_KRB5
};
NTSTATUS gensec_krb5_init(void)
Modified: branches/SAMBA_4_0/source/auth/gensec/schannel.c
===================================================================
--- branches/SAMBA_4_0/source/auth/gensec/schannel.c 2006-09-08 04:36:41 UTC (rev 18249)
+++ branches/SAMBA_4_0/source/auth/gensec/schannel.c 2006-09-08 04:37:56 UTC (rev 18250)
@@ -255,7 +255,8 @@
.session_info = schannel_session_info,
.sig_size = schannel_sig_size,
.have_feature = schannel_have_feature,
- .enabled = True
+ .enabled = True,
+ .order = GENSEC_SCHANNEL
};
NTSTATUS gensec_schannel_init(void)
Modified: branches/SAMBA_4_0/source/auth/gensec/spnego.c
===================================================================
--- branches/SAMBA_4_0/source/auth/gensec/spnego.c 2006-09-08 04:36:41 UTC (rev 18249)
+++ branches/SAMBA_4_0/source/auth/gensec/spnego.c 2006-09-08 04:37:56 UTC (rev 18250)
@@ -1040,6 +1040,7 @@
.session_info = gensec_spnego_session_info,
.have_feature = gensec_spnego_have_feature,
.enabled = True,
+ .order = GENSEC_SPNEGO
};
NTSTATUS gensec_spnego_init(void)
Modified: branches/SAMBA_4_0/source/auth/ntlmssp/ntlmssp.c
===================================================================
--- branches/SAMBA_4_0/source/auth/ntlmssp/ntlmssp.c 2006-09-08 04:36:41 UTC (rev 18249)
+++ branches/SAMBA_4_0/source/auth/ntlmssp/ntlmssp.c 2006-09-08 04:37:56 UTC (rev 18250)
@@ -417,7 +417,8 @@
.session_key = gensec_ntlmssp_session_key,
.session_info = gensec_ntlmssp_session_info,
.have_feature = gensec_ntlmssp_have_feature,
- .enabled = True
+ .enabled = True,
+ .order = GENSEC_NTLMSSP
};
More information about the samba-cvs
mailing list