r16100: Patch from Michael Wood <mwood@icts.uct.ac.za>: s/then/than/ for correct...

[kai/samba.git] / source / heimdal / lib / krb5 / get_for_creds.c

diff --git a/source/heimdal/lib/krb5/get_for_creds.c b/source/heimdal/lib/krb5/get_for_creds.c
index dafe668b5d8d86068ded270f580b8296b9240fba..f042cdb5735316291aaaf485254d02d379a6575e 100644 (file)
--- a/source/heimdal/lib/krb5/get_for_creds.c
+++ b/source/heimdal/lib/krb5/get_for_creds.c
@@ -33,7 +33,7 @@
 
 #include <krb5_locl.h>
 
-RCSID("$Id: get_for_creds.c,v 1.48 2006/03/07 19:38:09 lha Exp $");
+RCSID("$Id: get_for_creds.c,v 1.49 2006/04/10 09:28:15 lha Exp $");
 
 static krb5_error_code
 add_addrs(krb5_context context,
@@ -180,10 +180,7 @@ krb5_get_forwarded_creds (krb5_context         context,
     addrs.len = 0;
     addrs.val = NULL;
 
-    if (in_creds->client && in_creds->client->realm)
-       realm = in_creds->client->realm;
-    else
-       realm = in_creds->server->realm;
+    realm = in_creds->client->realm;
 
     krb5_appdefault_boolean(context, NULL, realm, "no-addresses-ever", 
                            TRUE, &noaddr_ever);
@@ -379,7 +376,7 @@ krb5_get_forwarded_creds (krb5_context          context,
        cred.enc_part.cipher.length = buf_size;
     } else {
        /* 
-        * Here older versions then 0.7.2 of Heimdal used the local or
+        * Here older versions than 0.7.2 of Heimdal used the local or
         * remote subkey. That is wrong, the session key should be
         * used. Heimdal 0.7.2 and newer have code to try both in the
         * receiving end.