From 4c8485b11bb27a3763a8f0058547ee7ac84556fe Mon Sep 17 00:00:00 2001 From: Alexandra Ellwood Date: Wed, 20 Aug 2008 18:58:04 +0000 Subject: [PATCH] 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 --- src/ccapi/server/ccs_cache_collection.c | 5 ++ src/ccapi/server/ccs_ccache.c | 6 ++ src/ccapi/server/ccs_os_notify.h | 38 ++++++++++++ src/ccapi/server/mac/ccs_os_notify.c | 80 +++++++++++++++++++++++++ src/include/CredentialsCache.h | 10 ++++ 5 files changed, 139 insertions(+) create mode 100644 src/ccapi/server/ccs_os_notify.h create mode 100644 src/ccapi/server/mac/ccs_os_notify.c diff --git a/src/ccapi/server/ccs_cache_collection.c b/src/ccapi/server/ccs_cache_collection.c index a1531bdb3..1a312b90e 100644 --- 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 4ebf2a006..35f70903c 100644 --- 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 index 000000000..572f749b1 --- /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 index 000000000..920282316 --- /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 + +/* ------------------------------------------------------------------------ */ + +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 430157643..cd573e710 100644 --- a/src/include/CredentialsCache.h +++ b/src/include/CredentialsCache.h @@ -29,6 +29,16 @@ #if defined(macintosh) || (defined(__MACH__) && defined(__APPLE__)) #include + +/* 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) -- 2.26.2