svn commit: samba r18257 - in
branches/SAMBA_4_0/source/auth/gensec: .
abartlet at samba.org
abartlet at samba.org
Fri Sep 8 06:21:03 GMT 2006
Author: abartlet
Date: 2006-09-08 06:21:02 +0000 (Fri, 08 Sep 2006)
New Revision: 18257
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=18257
Log:
Order the GENSEC modules, with unknown modules last.
Andrew Bartlett
Modified:
branches/SAMBA_4_0/source/auth/gensec/cyrus_sasl.c
branches/SAMBA_4_0/source/auth/gensec/gensec.c
branches/SAMBA_4_0/source/auth/gensec/gensec.h
branches/SAMBA_4_0/source/auth/gensec/gensec_gssapi.c
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
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 06:04:10 UTC (rev 18256)
+++ branches/SAMBA_4_0/source/auth/gensec/cyrus_sasl.c 2006-09-08 06:21:02 UTC (rev 18257)
@@ -309,7 +309,7 @@
.unwrap_packets = gensec_sasl_unwrap_packets,
.have_feature = gensec_sasl_have_feature,
.enabled = False,
- .order = GENSEC_SASL
+ .priority = GENSEC_SASL
};
int gensec_sasl_log(void *context,
Modified: branches/SAMBA_4_0/source/auth/gensec/gensec.c
===================================================================
--- branches/SAMBA_4_0/source/auth/gensec/gensec.c 2006-09-08 06:04:10 UTC (rev 18256)
+++ branches/SAMBA_4_0/source/auth/gensec/gensec.c 2006-09-08 06:21:02 UTC (rev 18257)
@@ -1246,7 +1246,7 @@
}
static int sort_gensec(struct gensec_security_ops **gs1, struct gensec_security_ops **gs2) {
- return (*gs2)->order - (*gs1)->order;
+ return (*gs2)->priority - (*gs1)->priority;
}
/*
Modified: branches/SAMBA_4_0/source/auth/gensec/gensec.h
===================================================================
--- branches/SAMBA_4_0/source/auth/gensec/gensec.h 2006-09-08 06:04:10 UTC (rev 18256)
+++ branches/SAMBA_4_0/source/auth/gensec/gensec.h 2006-09-08 06:21:02 UTC (rev 18257)
@@ -32,14 +32,14 @@
#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
+enum gensec_priority {
+ GENSEC_SPNEGO = 90,
+ GENSEC_GSSAPI = 80,
+ GENSEC_KRB5 = 70,
+ GENSEC_SCHANNEL = 60,
+ GENSEC_NTLMSSP = 50,
+ GENSEC_SASL = 20,
+ GENSEC_OTHER = 0
};
struct gensec_security;
@@ -137,7 +137,7 @@
uint32_t feature);
BOOL enabled;
BOOL kerberos;
- enum gensec_order order;
+ enum gensec_priority priority;
};
struct gensec_security_ops_wrapper {
Modified: branches/SAMBA_4_0/source/auth/gensec/gensec_gssapi.c
===================================================================
--- branches/SAMBA_4_0/source/auth/gensec/gensec_gssapi.c 2006-09-08 06:04:10 UTC (rev 18256)
+++ branches/SAMBA_4_0/source/auth/gensec/gensec_gssapi.c 2006-09-08 06:21:02 UTC (rev 18257)
@@ -1361,7 +1361,8 @@
.unwrap = gensec_gssapi_unwrap,
.have_feature = gensec_gssapi_have_feature,
.enabled = True,
- .kerberos = True
+ .kerberos = True,
+ .priority = GENSEC_GSSAPI
};
/* As a server, this could in theory accept any GSSAPI mech */
@@ -1379,7 +1380,8 @@
.unwrap = gensec_gssapi_unwrap,
.have_feature = gensec_gssapi_have_feature,
.enabled = True,
- .kerberos = True
+ .kerberos = True,
+ .priority = GENSEC_GSSAPI
};
NTSTATUS gensec_gssapi_init(void)
Modified: branches/SAMBA_4_0/source/auth/gensec/gensec_krb5.c
===================================================================
--- branches/SAMBA_4_0/source/auth/gensec/gensec_krb5.c 2006-09-08 06:04:10 UTC (rev 18256)
+++ branches/SAMBA_4_0/source/auth/gensec/gensec_krb5.c 2006-09-08 06:21:02 UTC (rev 18257)
@@ -730,7 +730,7 @@
.have_feature = gensec_krb5_have_feature,
.enabled = False,
.kerberos = True,
- .order = GENSEC_KRB5
+ .priority = GENSEC_KRB5
};
static const struct gensec_security_ops gensec_krb5_security_ops = {
@@ -745,7 +745,7 @@
.unwrap = gensec_krb5_unwrap,
.enabled = True,
.kerberos = True,
- .order = GENSEC_KRB5
+ .priority = 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 06:04:10 UTC (rev 18256)
+++ branches/SAMBA_4_0/source/auth/gensec/schannel.c 2006-09-08 06:21:02 UTC (rev 18257)
@@ -256,7 +256,7 @@
.sig_size = schannel_sig_size,
.have_feature = schannel_have_feature,
.enabled = True,
- .order = GENSEC_SCHANNEL
+ .priority = 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 06:04:10 UTC (rev 18256)
+++ branches/SAMBA_4_0/source/auth/gensec/spnego.c 2006-09-08 06:21:02 UTC (rev 18257)
@@ -1040,7 +1040,7 @@
.session_info = gensec_spnego_session_info,
.have_feature = gensec_spnego_have_feature,
.enabled = True,
- .order = GENSEC_SPNEGO
+ .priority = GENSEC_SPNEGO
};
NTSTATUS gensec_spnego_init(void)
More information about the samba-cvs
mailing list