From 04c1b3ce80c30a3ff5e1017e94e225a77655275c Mon Sep 17 00:00:00 2001 From: Johan Danielsson Date: Mon, 11 Aug 1997 02:32:44 +0000 Subject: [PATCH] krb5_principal_compare_any_realm git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@2896 ec53bebd-3082-4978-b11e-865c3cabbd6b --- lib/krb5/principal.c | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/lib/krb5/principal.c b/lib/krb5/principal.c index 52b996e1f..7a2ae1861 100644 --- a/lib/krb5/principal.c +++ b/lib/krb5/principal.c @@ -406,13 +406,11 @@ krb5_copy_principal(krb5_context context, krb5_boolean -krb5_principal_compare(krb5_context context, - krb5_const_principal princ1, - krb5_const_principal princ2) +krb5_principal_compare_any_realm(krb5_context context, + krb5_const_principal princ1, + krb5_const_principal princ2) { int i; - if(!krb5_realm_compare(context, princ1, princ2)) - return FALSE; if(princ_num_comp(princ1) != princ_num_comp(princ2)) return FALSE; for(i = 0; i < princ_num_comp(princ1); i++){ @@ -422,6 +420,16 @@ krb5_principal_compare(krb5_context context, return TRUE; } +krb5_boolean +krb5_principal_compare(krb5_context context, + krb5_const_principal princ1, + krb5_const_principal princ2) +{ + if(!krb5_realm_compare(context, princ1, princ2)) + return FALSE; + return krb5_principal_compare_any_realm(context, princ1, princ2); +} + krb5_boolean krb5_realm_compare(krb5_context context, @@ -431,18 +439,6 @@ krb5_realm_compare(krb5_context context, return strcmp(princ_realm(princ1), princ_realm(princ2)) == 0; } -static struct v4_conv { - char *from; - char *to; - int host_convert; -} inst_conv[] = { - { "rcmd", "host", 1 }, - { "ftp", "ftp", 1 }, - { "pop", "pop", 1 }, - { NULL, NULL , 0 } -}; - - krb5_error_code krb5_425_conv_principal(krb5_context context, const char *name,