diff options
| author | Alexandra Ellwood <lxs@mit.edu> | 2003-07-11 21:25:48 +0000 |
|---|---|---|
| committer | Alexandra Ellwood <lxs@mit.edu> | 2003-07-11 21:25:48 +0000 |
| commit | 908d4c7e0523e983c8f30ef2ff0bd1a66e5e7512 (patch) | |
| tree | 5bbffc7543a329bd8b80802b9a15ee9baa087756 /src | |
| parent | d4b6be450b5febdbdeda2f5e54e250c7b16a7bc2 (diff) | |
| download | krb5-908d4c7e0523e983c8f30ef2ff0bd1a66e5e7512.tar.gz krb5-908d4c7e0523e983c8f30ef2ff0bd1a66e5e7512.tar.xz krb5-908d4c7e0523e983c8f30ef2ff0bd1a66e5e7512.zip | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/krb4/ChangeLog | 6 | ||||
| -rw-r--r-- | 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 97c0a54744..5996d991a2 100644 --- 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 0ff47b15e8..fc9bdc8f34 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); |