oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Rename various routines and constants from canonize to canonicalize.

Browse Source 
From Andrew Bartlett


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@18903 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2006-11-04 03:12:46 +00:00
parent 8ddaadec0e
commit 0cd59b2fa5
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/gssapi/krb5/set_sec_context_option.c
View File

@@ -89,14 +89,14 @@ _gsskrb5_set_sec_context_option
ctx->more_flags |= COMPAT_OLD_DES3_SELECTED;
HEIMDAL_MUTEX_unlock(&ctx->ctx_id_mutex);
return GSS_S_COMPLETE;
} else if (gss_oid_equal(desired_object, GSS_KRB5_SET_DNS_CANONIZE_X)) {
} else if (gss_oid_equal(desired_object, GSS_KRB5_SET_DNS_CANONICALIZE_X)) {
int flag;
maj_stat = get_bool(minor_status, value, &flag);
if (maj_stat != GSS_S_COMPLETE)
return maj_stat;
krb5_set_dns_canonize_hostname(_gsskrb5_context, flag);
krb5_set_dns_canonicalize_hostname(_gsskrb5_context, flag);
return GSS_S_COMPLETE;
} else if (gss_oid_equal(desired_object, GSS_KRB5_REGISTER_ACCEPTOR_IDENTITY_X)) {

4
lib/gssapi/mech/gss_krb5.c
View File

@@ -204,7 +204,7 @@ gsskrb5_register_acceptor_identity(const char *identity)
}
OM_uint32
gsskrb5_set_dns_canonlize(int flag)
gsskrb5_set_dns_canonicalize(int flag)
{
struct _gss_mech_switch *m;
gss_buffer_desc buffer;
@@ -220,7 +220,7 @@ gsskrb5_set_dns_canonlize(int flag)
if (m->gm_mech.gm_set_sec_context_option == NULL)
continue;
m->gm_mech.gm_set_sec_context_option(&junk, NULL,
GSS_KRB5_REGISTER_ACCEPTOR_IDENTITY_X, &buffer);
GSS_KRB5_SET_DNS_CANONICALIZE_X, &buffer);
}
return (GSS_S_COMPLETE);

6
lib/gssapi/test_context.c
View File

@@ -130,8 +130,8 @@ loop(gss_OID mechoid,
static struct getargs args[] = {
{"name-type",0, arg_string, &type_string, "type of name", NULL },
{"mech-type",0, arg_string, &mech_string, "type of mech", NULL },
{"dns-canon",0, arg_negative_flag, &dns_canon_flag,
"use dns to canonlize", NULL },
{"dns-canonicalize",0,arg_negative_flag, &dns_canon_flag,
"use dns to canonicalize", NULL },
{"version", 0, arg_flag, &version_flag, "print version", NULL },
{"verbose", 'v', arg_flag, &verbose_flag, "verbose", NULL },
{"help", 0, arg_flag, &help_flag, NULL, NULL }
@@ -176,7 +176,7 @@ main(int argc, char **argv)
usage(1);
if (dns_canon_flag != -1)
gsskrb5_set_dns_canonlize(dns_canon_flag);
gsskrb5_set_dns_canonicalize(dns_canon_flag);
if (type_string == NULL)
nameoid = GSS_C_NT_HOSTBASED_SERVICE;

10
lib/krb5/context.c
View File

@@ -181,7 +181,7 @@ init_context_from_config_file(krb5_context context)
INIT_FIELD(context, bool, srv_lookup, TRUE, "srv_lookup");
INIT_FIELD(context, bool, srv_lookup, context->srv_lookup, "dns_lookup_kdc");
INIT_FIELD(context, int, large_msg_size, 6000, "large_message_size");
INIT_FIELD(context, bool, dns_canonize_hostname, TRUE, "dns_canonize_hostname");
INIT_FIELD(context, bool, dns_canonicalize_hostname, TRUE, "dns_canonicalize_hostname");
context->default_cc_name = NULL;
return 0;
}
@@ -685,15 +685,15 @@ krb5_is_thread_safe(void)
}
void KRB5_LIB_FUNCTION
krb5_set_dns_canonize_hostname (krb5_context context, krb5_boolean flag)
krb5_set_dns_canonicalize_hostname (krb5_context context, krb5_boolean flag)
{
context->dns_canonize_hostname = flag;
context->dns_canonicalize_hostname = flag;
}
krb5_boolean KRB5_LIB_FUNCTION
krb5_get_dns_canonize_hostname (krb5_context context)
krb5_get_dns_canonicalize_hostname (krb5_context context)
{
return context->dns_canonize_hostname;
return context->dns_canonicalize_hostname;
}
krb5_error_code KRB5_LIB_FUNCTION