pullup from trunk

ticket: 2751
version_fixed: 1.4

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

diff --git a/src/util/profile/ChangeLog b/src/util/profile/ChangeLog
index f475a84769af3b8dc23a46df3433796d28eb356a..b736e5d0817842b15924d6074ad2823bbca90b5f 100644 (file)
--- a/src/util/profile/ChangeLog
+++ b/src/util/profile/ChangeLog
@@ -1,3 +1,9 @@
+2004-11-04  Alexandra Ellwood  <lxs@mit.edu>
+
+       * prof_init.c, profile.hin: added profile_is_modified
+       and profile_is_writable so that callers can check to see
+       if profile_release() will fail before calling it.
+
 2004-11-04  Alexandra Ellwood  <lxs@mit.edu>
 
        * prof_set.c: profile calls which set values should not fail 

diff --git a/src/util/profile/prof_init.c b/src/util/profile/prof_init.c
index 02d61ee1f54b50f597da9f820f2decd62b972720..0be2a0e53f300e6669f280b4ab06507557940af2 100644 (file)
--- a/src/util/profile/prof_init.c
+++ b/src/util/profile/prof_init.c
@@ -120,6 +120,36 @@ profile_init_path(const_profile_filespec_list_t filepath,
        return retval;
 }
 
+errcode_t KRB5_CALLCONV
+profile_is_writable(profile_t profile, int *writable)
+{
+       if (!profile || profile->magic != PROF_MAGIC_PROFILE)
+               return PROF_MAGIC_PROFILE;
+       
+       if (!writable) 
+               return EINVAL;
+       
+       if (profile->first_file)
+               *writable = (profile->first_file->data->flags & PROFILE_FILE_RW);
+       
+       return 0;
+}
+
+errcode_t KRB5_CALLCONV
+profile_is_modified(profile_t profile, int *modified)
+{
+       if (!profile || profile->magic != PROF_MAGIC_PROFILE)
+               return PROF_MAGIC_PROFILE;
+       
+       if (!modified) 
+               return EINVAL;
+       
+       if (profile->first_file)
+               *modified = (profile->first_file->data->flags & PROFILE_FILE_DIRTY);
+       
+       return 0;
+}
+
 errcode_t KRB5_CALLCONV
 profile_flush(profile_t profile)
 {

diff --git a/src/util/profile/profile.hin b/src/util/profile/profile.hin
index ec822ca8b91fc47a98ad5dd33dcb0e104a1894f5..10abe725ad6069be6add957add7e481a65919545 100644 (file)
--- a/src/util/profile/profile.hin
+++ b/src/util/profile/profile.hin
@@ -54,6 +54,11 @@ long KRB5_CALLCONV profile_flush_to_buffer
 void KRB5_CALLCONV profile_free_buffer
        (profile_t profile, char *buf);
 
+long KRB5_CALLCONV profile_is_writable
+       (profile_t profile, int *writable);
+long KRB5_CALLCONV profile_is_modified
+       (profile_t profile, int *modified);
+
 void KRB5_CALLCONV profile_abandon
        (profile_t profile);