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

krb5_425_conv_* misc functions are deprecated

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@24841 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2009-02-27 03:28:09 +00:00
parent ce2ab466e6
commit e1e65f1fbd
1 changed files with 2 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
lib/krb5/principal.c
View File

@@ -1067,6 +1067,8 @@ krb5_425_conv_principal_ext2(krb5_context context,
snprintf(host, sizeof(host), "%s.%s", instance, p); snprintf(host, sizeof(host), "%s.%s", instance, p);
local_host: local_host:
ret = krb5_make_principal(context, &pr, realm, name, host, NULL); ret = krb5_make_principal(context, &pr, realm, name, host, NULL);
if (ret)
return ret;
if(func == NULL || (*func)(context, funcctx, pr)){ if(func == NULL || (*func)(context, funcctx, pr)){
*princ = pr; *princ = pr;
return 0; return 0;
@@ -1111,45 +1113,6 @@ convert_func(krb5_context conxtext, void *funcctx, krb5_principal principal)
return (*func)(conxtext, principal); return (*func)(conxtext, principal);
} }
krb5_error_code KRB5_LIB_FUNCTION
krb5_425_conv_principal_ext(krb5_context context,
const char *name,
const char *instance,
const char *realm,
krb5_boolean (*func)(krb5_context, krb5_principal),
krb5_boolean resolve,
krb5_principal *principal)
{
return krb5_425_conv_principal_ext2(context,
name,
instance,
realm,
func ? convert_func : NULL,
func,
resolve,
principal);
}
krb5_error_code KRB5_LIB_FUNCTION
krb5_425_conv_principal(krb5_context context,
const char *name,
const char *instance,
const char *realm,
krb5_principal *princ)
{
krb5_boolean resolve = krb5_config_get_bool(context,
NULL,
"libdefaults",
"v4_instance_resolve",
NULL);
return krb5_425_conv_principal_ext(context, name, instance, realm,
NULL, resolve, princ);
}
static int static int
check_list(const krb5_config_binding *l, const char *name, const char **out) check_list(const krb5_config_binding *l, const char *name, const char **out)
{ {