From 908d4c7e0523e983c8f30ef2ff0bd1a66e5e7512 Mon Sep 17 00:00:00 2001 From: Alexandra Ellwood Date: Fri, 11 Jul 2003 21:25:48 +0000 Subject: [PATCH] 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 ticket: 1657 git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@15683 dc483132-0cff-0310-8789-dd5450dbe970 --- src/lib/krb4/ChangeLog | 6 ++++++ src/lib/krb4/RealmsConfig-glue.c | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/lib/krb4/ChangeLog b/src/lib/krb4/ChangeLog index 97c0a5474..5996d991a 100644 --- a/src/lib/krb4/ChangeLog +++ b/src/lib/krb4/ChangeLog @@ -1,3 +1,9 @@ +2003-07-11 Alexandra Ellwood + + * 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 * 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 0ff47b15e..fc9bdc8f3 100644 --- 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); -- 2.26.2