Add support to send CFNotifications on ccache and cache collection changes

ticket: new

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

diff --git a/src/ccapi/server/ccs_cache_collection.c b/src/ccapi/server/ccs_cache_collection.c
index a1531bdb3a5eb28df083c5291cb407a3718b5fb9..1a312b90e96704d5b107e5f673b4862dcb611def 100644 (file)
--- a/src/ccapi/server/ccs_cache_collection.c
+++ b/src/ccapi/server/ccs_cache_collection.c
@@ -26,6 +26,7 @@
 
 #include "k5-platform.h"       /* pull in asprintf decl/defn */
 #include "ccs_common.h"
+#include "ccs_os_notify.h"
 
 struct ccs_cache_collection_d {
     cc_time_t last_changed_time;
@@ -176,6 +177,10 @@ cc_int32 ccs_cache_collection_changed (ccs_cache_collection_t io_cache_collectio
         }
     }
     
+    if (!err) {
+        err = ccs_os_notify_cache_collection_changed (io_cache_collection);
+    }
+    
     cci_stream_release (reply_data);
     
     return cci_check_error (err);

diff --git a/src/ccapi/server/ccs_ccache.c b/src/ccapi/server/ccs_ccache.c
index 4ebf2a006d3b32cbb4edefb0f895e87eb02e38f1..35f70903cf9d50afe9247f505dd9d2592c7a036c 100644 (file)
--- a/src/ccapi/server/ccs_ccache.c
+++ b/src/ccapi/server/ccs_ccache.c
@@ -25,6 +25,7 @@
  */
 
 #include "ccs_common.h"
+#include "ccs_os_notify.h"
 
 struct ccs_ccache_d {
     cci_identifier_t identifier;
@@ -359,6 +360,11 @@ cc_int32 ccs_ccache_changed (ccs_ccache_t           io_ccache,
         }
     }
     
+    if (!err) {
+        err = ccs_os_notify_ccache_changed (io_cache_collection, 
+                                            io_ccache->name);
+    }
+    
     cci_stream_release (reply_data);
     
     return cci_check_error (err);

diff --git a/src/ccapi/server/ccs_os_notify.h b/src/ccapi/server/ccs_os_notify.h
new file mode 100644 (file)
index 0000000..572f749
--- /dev/null
+++ b/src/ccapi/server/ccs_os_notify.h
@@ -0,0 +1,38 @@
+/*
+ * $Header$
+ *
+ * Copyright 2006-2008 Massachusetts Institute of Technology.
+ * All Rights Reserved.
+ *
+ * Export of this software from the United States of America may
+ * require a specific license from the United States Government.
+ * It is the responsibility of any person or organization contemplating
+ * export to obtain such a license before exporting.
+ *
+ * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
+ * distribute this software and its documentation for any purpose and
+ * without fee is hereby granted, provided that the above copyright
+ * notice appear in all copies and that both that copyright notice and
+ * this permission notice appear in supporting documentation, and that
+ * the name of M.I.T. not be used in advertising or publicity pertaining
+ * to distribution of the software without specific, written prior
+ * permission.  Furthermore if you modify this software you must label
+ * your software as modified software and not distribute it in such a
+ * fashion that it might be confused with the original M.I.T. software.
+ * M.I.T. makes no representations about the suitability of
+ * this software for any purpose.  It is provided "as is" without express
+ * or implied warranty.
+ */
+
+#ifndef CCS_OS_NOTIFY_H
+#define CCS_OS_NOTIFY_H
+
+#include "ccs_types.h"
+
+cc_int32 ccs_os_notify_cache_collection_changed (ccs_cache_collection_t io_cache_collection);
+
+cc_int32 ccs_os_notify_ccache_changed (ccs_cache_collection_t  io_cache_collection,
+                                       const char             *in_ccache_name);
+
+
+#endif /* CCS_OS_NOTIFY_H */

diff --git a/src/ccapi/server/mac/ccs_os_notify.c b/src/ccapi/server/mac/ccs_os_notify.c
new file mode 100644 (file)
index 0000000..9202823
--- /dev/null
+++ b/src/ccapi/server/mac/ccs_os_notify.c
@@ -0,0 +1,80 @@
+/*
+ * $Header$
+ *
+ * Copyright 2006-2008 Massachusetts Institute of Technology.
+ * All Rights Reserved.
+ *
+ * Export of this software from the United States of America may
+ * require a specific license from the United States Government.
+ * It is the responsibility of any person or organization contemplating
+ * export to obtain such a license before exporting.
+ *
+ * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
+ * distribute this software and its documentation for any purpose and
+ * without fee is hereby granted, provided that the above copyright
+ * notice appear in all copies and that both that copyright notice and
+ * this permission notice appear in supporting documentation, and that
+ * the name of M.I.T. not be used in advertising or publicity pertaining
+ * to distribution of the software without specific, written prior
+ * permission.  Furthermore if you modify this software you must label
+ * your software as modified software and not distribute it in such a
+ * fashion that it might be confused with the original M.I.T. software.
+ * M.I.T. makes no representations about the suitability of
+ * this software for any purpose.  It is provided "as is" without express
+ * or implied warranty.
+ */
+
+#include "ccs_common.h"
+#include "ccs_os_notify.h"
+#include <CoreFoundation/CoreFoundation.h>
+
+/* ------------------------------------------------------------------------ */
+
+cc_int32 ccs_os_notify_cache_collection_changed (ccs_cache_collection_t io_cache_collection)
+{
+    cc_int32 err = ccNoError;
+    
+    if (!io_cache_collection) { err = cci_check_error (ccErrBadParam); }
+    
+    if (!err) {
+        CFNotificationCenterRef center = CFNotificationCenterGetDistributedCenter ();
+
+        if (center) { 
+            CFNotificationCenterPostNotification (center,
+                                                  kCCAPICacheCollectionChangedNotification,
+                                                  NULL, NULL, TRUE);
+        }
+    }
+    
+    
+    
+    return cci_check_error (err);    
+}
+
+/* ------------------------------------------------------------------------ */
+
+cc_int32 ccs_os_notify_ccache_changed (ccs_cache_collection_t  io_cache_collection,
+                                       const char             *in_ccache_name)
+{
+    cc_int32 err = ccNoError;
+    
+    if (!io_cache_collection) { err = cci_check_error (ccErrBadParam); }
+    if (!in_ccache_name     ) { err = cci_check_error (ccErrBadParam); }
+    
+    if (!err) {
+        CFNotificationCenterRef center = CFNotificationCenterGetDistributedCenter ();
+        CFStringRef name = CFStringCreateWithCString (kCFAllocatorDefault,
+                                                      in_ccache_name,
+                                                      kCFStringEncodingUTF8);
+        
+        if (center && name) { 
+            CFNotificationCenterPostNotification (center,
+                                                  kCCAPICCacheChangedNotification,
+                                                  name, NULL, TRUE);
+        }
+        
+        if (name) { CFRelease (name); }
+    }
+    
+    return cci_check_error (err);    
+}

diff --git a/src/include/CredentialsCache.h b/src/include/CredentialsCache.h
index 4301576432b0e78fb70838e364faea6e5c9a1785..cd573e71065e11e842bdd5fd28199ce0b891c9fc 100644 (file)
--- a/src/include/CredentialsCache.h
+++ b/src/include/CredentialsCache.h
@@ -29,6 +29,16 @@
 
 #if defined(macintosh) || (defined(__MACH__) && defined(__APPLE__))
 #include <TargetConditionals.h>
+
+/* Notifications which are sent when the ccache collection or a ccache change.
+ * Notifications are sent to the distributed notification center.
+ * The object for kCCAPICacheCollectionChangedNotification is NULL.
+ * The object for kCCAPICCacheChangedNotification is a CFString containing the
+ * name of the ccache.
+ * 
+ * Note: Notifications are not sent if the CCacheServer crashes.  */
+#define kCCAPICacheCollectionChangedNotification CFSTR ("CCAPICacheCollectionChangedNotification")
+#define kCCAPICCacheChangedNotification          CFSTR ("CCAPICCacheChangedNotification")
 #endif
 
 #if defined(_WIN32)