From 5e284771a59e261fb3529504cc1a33c9a490f576 Mon Sep 17 00:00:00 2001
From: Johan Danielsson <joda@pdc.kth.se>
Date: Sun, 1 Mar 1998 01:05:06 +0000
Subject: [PATCH] Add `krb5_unparse_name_fixed_short', that excludes the realm
 if it's the same as the default realm.

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@4478 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 lib/krb5/principal.c | 50 ++++++++++++++++++++++++++++++++++++--------
 1 file changed, 41 insertions(+), 9 deletions(-)

diff --git a/lib/krb5/principal.c b/lib/krb5/principal.c
index 05876316f..a94f7b43e 100644
--- a/lib/krb5/principal.c
+++ b/lib/krb5/principal.c
@@ -170,11 +170,12 @@ quote_string(const char *s, char *out, size_t index, size_t len)
 }
 
 
-krb5_error_code
-krb5_unparse_name_fixed(krb5_context context,
-			krb5_const_principal principal,
-			char *name,
-			size_t len)
+static krb5_error_code
+unparse_name_fixed(krb5_context context,
+		   krb5_const_principal principal,
+		   char *name,
+		   size_t len,
+		   krb5_boolean short_form)
 {
     size_t index = 0;
     int i;
@@ -182,14 +183,45 @@ krb5_unparse_name_fixed(krb5_context context,
 	if(i)
 	    add_char(name, index, len, '/');
 	index = quote_string(princ_ncomp(principal, i), name, index, len);
+    } 
+    /* add realm if different from default realm */
+    if(short_form) {
+	krb5_realm r;
+	krb5_error_code ret;
+	ret = krb5_get_default_realm(context, &r);
+	if(ret)
+	    return ret;
+	if(strcmp(princ_realm(principal), r) != 0)
+	    short_form = 0;
+	free(r);
+    }
+    if(!short_form) {
+	add_char(name, index, len, '@');
+	index = quote_string(princ_realm(principal), name, index, len);
+	if(index == len)
+	    return ENOMEM; /* XXX */
     }
-    add_char(name, index, len, '@');
-    index = quote_string(princ_realm(principal), name, index, len);
-    if(index == len)
-	return ENOMEM; /* XXX */
     return 0;
 }
 
+krb5_error_code
+krb5_unparse_name_fixed(krb5_context context,
+			krb5_const_principal principal,
+			char *name,
+			size_t len)
+{
+    return unparse_name_fixed(context, principal, name, len, FALSE);
+}
+
+krb5_error_code
+krb5_unparse_name_fixed_short(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_unparse_name(krb5_context context,
 		  krb5_const_principal principal,