diff options
author | Stefan Metzmacher <metze@samba.org> | 2004-12-05 16:29:27 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:06:22 -0500 |
commit | f99c93ec57691a393b4ae5ba57176b98f33efc17 (patch) | |
tree | ae13cf51ef8046682b457db7587bb5804022918c /source4/libcli/auth/spnego.c | |
parent | 1424dccb92f2ed4002ed703e4e8c9aa453d04e01 (diff) | |
download | samba-f99c93ec57691a393b4ae5ba57176b98f33efc17.tar.gz samba-f99c93ec57691a393b4ae5ba57176b98f33efc17.tar.bz2 samba-f99c93ec57691a393b4ae5ba57176b98f33efc17.zip |
r4070: move some defines from asn_1.h to the places they belong to
metze
(This used to be commit ab2c2f27e1c61516e885f02bf26350f97209057a)
Diffstat (limited to 'source4/libcli/auth/spnego.c')
-rw-r--r-- | source4/libcli/auth/spnego.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/source4/libcli/auth/spnego.c b/source4/libcli/auth/spnego.c index 3af1bc1e81..a13afbb186 100644 --- a/source4/libcli/auth/spnego.c +++ b/source4/libcli/auth/spnego.c @@ -24,7 +24,6 @@ #include "includes.h" #include "auth/auth.h" -#include "asn_1.h" #undef DBGC_CLASS #define DBGC_CLASS DBGC_AUTH @@ -218,7 +217,7 @@ static NTSTATUS gensec_spnego_server_try_fallback(struct gensec_security *gensec if (!all_ops[i]->oid) { continue; } - if (strcasecmp(OID_SPNEGO,all_ops[i]->oid) == 0) { + if (strcasecmp(GENSEC_OID_SPNEGO,all_ops[i]->oid) == 0) { continue; } @@ -311,7 +310,7 @@ static NTSTATUS gensec_spnego_client_negTokenInit(struct gensec_security *gensec const char **mechTypes = NULL; DATA_BLOB unwrapped_out = data_blob(NULL,0); - mechTypes = gensec_security_oids(out_mem_ctx, OID_SPNEGO); + mechTypes = gensec_security_oids(out_mem_ctx, GENSEC_OID_SPNEGO); if (!mechTypes) { DEBUG(1, ("no GENSEC OID backends available\n")); @@ -467,7 +466,7 @@ static NTSTATUS gensec_spnego_update(struct gensec_security *gensec_security, TA return nt_status; } else { - const char **mechlist = gensec_security_oids(out_mem_ctx, OID_SPNEGO); + const char **mechlist = gensec_security_oids(out_mem_ctx, GENSEC_OID_SPNEGO); const char *mechListMIC; mechListMIC = talloc_asprintf(out_mem_ctx,"%s$@%s", @@ -712,7 +711,7 @@ static const struct gensec_security_ops gensec_spnego_security_ops = { .name = "spnego", .sasl_name = "GSS-SPNEGO", .auth_type = DCERPC_AUTH_TYPE_SPNEGO, - .oid = OID_SPNEGO, + .oid = GENSEC_OID_SPNEGO, .client_start = gensec_spnego_client_start, .server_start = gensec_spnego_server_start, .update = gensec_spnego_update, |