configd-293.8.tar.gz

[apple/configd.git] / configd.tproj / _notifyviaport.c

diff --git a/configd.tproj/_notifyviaport.c b/configd.tproj/_notifyviaport.c
index 4b7df81d3a0b23143296d902fb72c566a5affb9b..84561085389237190b6012a6f9abdac307e1023b 100644 (file)
--- a/configd.tproj/_notifyviaport.c
+++ b/configd.tproj/_notifyviaport.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000-2003 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000, 2001, 2003, 2004, 2006, 2009 Apple Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
@@ -38,13 +38,13 @@ __private_extern__
 int
 __SCDynamicStoreNotifyMachPort(SCDynamicStoreRef       store,
                               mach_msg_id_t            identifier,
-                              mach_port_t              *port)
+                              mach_port_t              port)
 {
        SCDynamicStorePrivateRef        storePrivate = (SCDynamicStorePrivateRef)store;
        CFStringRef                     sessionKey;
        CFDictionaryRef                 info;
 
-       if (!store || (storePrivate->server == MACH_PORT_NULL)) {
+       if ((store == NULL) || (storePrivate->server == MACH_PORT_NULL)) {
                return kSCStatusNoStoreSession;         /* you must have an open session to play */
        }
 
@@ -53,7 +53,7 @@ __SCDynamicStoreNotifyMachPort(SCDynamicStoreRef      store,
                return kSCStatusNotifierActive;
        }
 
-       if (*port == MACH_PORT_NULL) {
+       if (port == MACH_PORT_NULL) {
                /* sorry, you must specify a valid mach port */
                return kSCStatusInvalidArgument;
        }
@@ -87,27 +87,34 @@ _notifyviaport(mach_port_t  server,
               int              *sc_status
 )
 {
-       serverSessionRef                mySession = getSession(server);
-       SCDynamicStorePrivateRef        storePrivate = (SCDynamicStorePrivateRef)mySession->store;
-
-       if (!mySession) {
-               *sc_status = kSCStatusNoStoreSession;   /* you must have an open session to play */
+       serverSessionRef                mySession       = getSession(server);
+       SCDynamicStorePrivateRef        storePrivate;
+
+       if (mySession == NULL) {
+               /* sorry, you must have an open session to play */
+               *sc_status = kSCStatusNoStoreSession;
+               if (port != MACH_PORT_NULL) {
+                       (void) mach_port_deallocate(mach_task_self(), port);
+               }
                return KERN_SUCCESS;
        }
-
-       if (storePrivate->notifyPort != MACH_PORT_NULL) {
-               // destroying [old] callback mach port
-               (void) mach_port_destroy(mach_task_self(), storePrivate->notifyPort);
+       storePrivate = (SCDynamicStorePrivateRef)mySession->store;
+
+       *sc_status = __SCDynamicStoreNotifyMachPort(mySession->store, identifier, port);
+       if (*sc_status != kSCStatusOK) {
+               // if we can't enable the notification, release the provided callback port
+               if (port != MACH_PORT_NULL) {
+                       __MACH_PORT_DEBUG(TRUE, "*** _notifyviaport __SCDynamicStoreNotifyMachPort failed: releasing port", port);
+                       (void) mach_port_deallocate(mach_task_self(), port);
+               }
+               return KERN_SUCCESS;
        }
 
-       *sc_status = __SCDynamicStoreNotifyMachPort(mySession->store, identifier, &port);
-
-       if (*sc_status == kSCStatusOK) {
-               /* save notification port, requested identifier, and set notifier active */
-               storePrivate->notifyStatus         = Using_NotifierInformViaMachPort;
-               storePrivate->notifyPort           = port;
-               storePrivate->notifyPortIdentifier = identifier;
-       }
+       /* save notification port, requested identifier, and set notifier active */
+       __MACH_PORT_DEBUG(TRUE, "*** _notifyviaport", port);
+       storePrivate->notifyStatus         = Using_NotifierInformViaMachPort;
+       storePrivate->notifyPort           = port;
+       storePrivate->notifyPortIdentifier = identifier;
 
        return KERN_SUCCESS;
 }