pull up r20509 from trunk

 r20509@cathode-dark-space:  tlyu | 2008-07-09 22:04:03 -0400
 ticket: 5632

 Apply patch from Apple to handle missing krb5.conf for zeroconf
 situations.

ticket: 5632
version_fixed: 1.6.4

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-6@20518 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/util/profile/prof_init.c b/src/util/profile/prof_init.c
index e5c6f9c8c5b3535360c197d3595a922858d8ed2e..9749b543e69bed3e801cfc1ff47b1b556b3999ea 100644 (file)
--- a/src/util/profile/prof_init.c
+++ b/src/util/profile/prof_init.c
@@ -34,8 +34,11 @@ profile_init(const_profile_filespec_t *files, profile_t *ret_profile)
        memset(profile, 0, sizeof(struct _profile_t));
        profile->magic = PROF_MAGIC_PROFILE;
 
-        /* if the filenames list is not specified return an empty profile */
-        if ( files ) {
+       /*
+        * If the filenames list is not specified or empty, return an empty
+        * profile.
+        */
+       if ( files && !PROFILE_LAST_FILESPEC(*files) ) {
            for (fs = files; !PROFILE_LAST_FILESPEC(*fs); fs++) {
                retval = profile_open_file(*fs, &new_file);
                /* if this file is missing, skip to the next */