svn commit: lorikeet r442 - in trunk/heimdal/lib/krb5: .

[abartlet at samba.org]

Author: abartlet
Date: 2005-08-27 10:42:05 +0000 (Sat, 27 Aug 2005)
New Revision: 442

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=lorikeet&rev=442

Log:
Clean up tests, rename functions per lha's preference.

Andrew Bartlett

Modified:
   trunk/heimdal/lib/krb5/principal.c
   trunk/heimdal/lib/krb5/test_princ.c


Changeset:
Modified: trunk/heimdal/lib/krb5/principal.c
===================================================================
--- trunk/heimdal/lib/krb5/principal.c	2005-08-27 10:31:56 UTC (rev 441)
+++ trunk/heimdal/lib/krb5/principal.c	2005-08-27 10:42:05 UTC (rev 442)
@@ -287,6 +287,15 @@
 }
 
 krb5_error_code KRB5_LIB_FUNCTION
+krb5_unparse_name_norealm_fixed(krb5_context context,
+				krb5_const_principal principal,
+				char *name,
+				size_t len)
+{
+    return unparse_name_fixed(context, principal, name, len, TRUE);
+}
+
+krb5_error_code KRB5_LIB_FUNCTION
 krb5_unparse_name_fixed_short(krb5_context context,
 			      krb5_const_principal principal,
 			      char *name,
@@ -368,7 +377,7 @@
 }
 
 krb5_error_code KRB5_LIB_FUNCTION
-krb5_unparse_name_always_short(krb5_context context,
+krb5_unparse_name_norealm(krb5_context context,
 			       krb5_const_principal principal,
 			       char **name)
 {

Modified: trunk/heimdal/lib/krb5/test_princ.c
===================================================================
--- trunk/heimdal/lib/krb5/test_princ.c	2005-08-27 10:31:56 UTC (rev 441)
+++ trunk/heimdal/lib/krb5/test_princ.c	2005-08-27 10:42:05 UTC (rev 442)
@@ -50,9 +50,6 @@
     char *princ_reformed = NULL;
     char *realm;
 
-    krb5_ccache id, id2;
-    const char *nc, *tc;
-    char *n, *t, *c;
     krb5_principal p, p2;
 
     ret = krb5_parse_name(context, princ, &p);
@@ -69,7 +66,7 @@
 
     free(princ_unparsed);
 
-    ret = krb5_unparse_name_always_short(context, p, &princ_unparsed);
+    ret = krb5_unparse_name_norealm(context, p, &princ_unparsed);
     if (ret)
 	krb5_err(context, 1, ret, "krb5_parse_name");