RealmsConfig-glue.c: Don't fail when krb5.conf is valid and krb.conf isn't. Also...

ticket: 1657

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@15683 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/lib/krb4/ChangeLog b/src/lib/krb4/ChangeLog
index 97c0a54744bb877cd5854f4477a76f274939eade..5996d991a2601d5fb0c1a69397c78f3515f12447 100644 (file)
--- a/src/lib/krb4/ChangeLog
+++ b/src/lib/krb4/ChangeLog
@@ -1,3 +1,9 @@
+2003-07-11  Alexandra Ellwood  <lxs@mit.edu>
+
+        * RealmsConfig-glue.c: Don't fail when krb5.conf is valid
+        and krb.conf isn't.  Also, don't assert v4 realm is in profile
+        unless that realm is a valid v4 realm.
+
 2003-07-10  Alexandra Ellwood  <lxs@mit.edu>
 
         * RealmsConfig-glue.c: krb_get_lrealm fix so that if there is no

diff --git a/src/lib/krb4/RealmsConfig-glue.c b/src/lib/krb4/RealmsConfig-glue.c
index 0ff47b15e8b6e9d6ee75f718c8d344b313e86a52..fc9bdc8f34b43a129e9e798c60c8536cc9570f80 100644 (file)
--- a/src/lib/krb4/RealmsConfig-glue.c
+++ b/src/lib/krb4/RealmsConfig-glue.c
@@ -226,6 +226,8 @@ krb_get_lrealm(
         if (!profileErr) {
             if (strlen (profileDefaultRealm) < REALM_SZ) {
                 profileHasDefaultRealm = 1;  /* a reasonable default realm */
+            } else {
+                profileErr = KFAILURE;
             }
         }
 
@@ -260,8 +262,6 @@ krb_get_lrealm(
                 if (strlen(scratch) < REALM_SZ) {
                     strncpy(krbConfLocalRealm, scratch, REALM_SZ);
                     krbConfHasLocalRealm = 1;
-                } else {
-                    result = KFAILURE; /* Invalid config file! */
                 }
             }
             fclose(cnffile);