From 3dd2da7148ba0fb61c0a81593d642a2231782d8b Mon Sep 17 00:00:00 2001
From: Assar Westerlund <assar@sics.se>
Date: Sun, 9 Jan 2000 09:21:32 +0000
Subject: [PATCH] (krb5_sname_to_principal): use krb5_expand_hostname_realms

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

diff --git a/lib/krb5/principal.c b/lib/krb5/principal.c
index bf6a69fb9..ee68f8593 100644
--- a/lib/krb5/principal.c
+++ b/lib/krb5/principal.c
@@ -856,8 +856,7 @@ krb5_524_conv_principal(krb5_context context,
 
 /*
  * Create a principal in `ret_princ' for the service `sname' running
- * on host `hostname'.
- */
+ * on host `hostname'.  */
 			
 krb5_error_code
 krb5_sname_to_principal (krb5_context context,
@@ -879,15 +878,17 @@ krb5_sname_to_principal (krb5_context context,
     if(sname == NULL)
 	sname = "host";
     if(type == KRB5_NT_SRV_HST) {
-	ret = krb5_expand_hostname (context, hostname, &host);
+	ret = krb5_expand_hostname_realms (context, hostname,
+					   &host, &realms);
 	if (ret)
 	    return ret;
 	strlwr(host);
 	hostname = host;
+    } else {
+	ret = krb5_get_host_realm(context, hostname, &realms);
+	if(ret)
+	    return ret;
     }
-    ret = krb5_get_host_realm(context, hostname, &realms);
-    if(ret)
-	return ret;
 
     ret = krb5_make_principal(context, ret_princ, realms[0], sname,
 			      hostname, NULL);