projects / apple / configd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f715d94)
configd-963.250.1.tar.gz macos-10144 v963.250.1
authorApple <opensource@apple.com>
Tue, 18 Jun 2019 01:06:23 +0000 (01:06 +0000)
committerApple <opensource@apple.com>
Tue, 18 Jun 2019 01:06:23 +0000 (01:06 +0000)
SystemConfiguration.fproj/config.defs patch | blob | blame | history
SystemConfiguration.fproj/helper/SCHelper_server.c patch | blob | blame | history
configd.tproj/_configadd.c patch | blob | blame | history
configd.tproj/_configget.c patch | blob | blame | history
configd.tproj/_configopen.c patch | blob | blame | history
configd.tproj/_configset.c patch | blob | blame | history
configd.tproj/configd_server.h patch | blob | blame | history

diff --git a/SystemConfiguration.fproj/config.defs b/SystemConfiguration.fproj/config.defs
index 7c7a33595036e5ee8a774a919b09a3c7c2b7fd4b..836f3667502939dd80fe7060beabf71d07588d4e 100644 (file)
--- a/SystemConfiguration.fproj/config.defs
+++ b/SystemConfiguration.fproj/config.defs
@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright (c) 2000, 2001, 2003-2005, 2011, 2012, 2015 Apple Inc. All rights reserved.
+ * Copyright (c) 2000, 2001, 2003-2005, 2011, 2012, 2015, 2019 Apple Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
  *
  *
  * @APPLE_LICENSE_HEADER_START@
  *
@@ -109,14 +109,14 @@ routine configlist        (       server          : mach_port_t;
 routine configadd      (       server          : mach_port_t;
                                key             : xmlData;
                                data            : xmlData;
 routine configadd      (       server          : mach_port_t;
                                key             : xmlData;
                                data            : xmlData;
-                        out    newInstance     : int;
+                        out    newInstance     : int;          // no longer used
                         out    status          : int;
            ServerAuditToken    audit_token     : audit_token_t);
 
 routine configget      (       server          : mach_port_t;
                                key             : xmlData;
                         out    data            : xmlDataOut, dealloc;
                         out    status          : int;
            ServerAuditToken    audit_token     : audit_token_t);
 
 routine configget      (       server          : mach_port_t;
                                key             : xmlData;
                         out    data            : xmlDataOut, dealloc;
-                        out    newInstance     : int;
+                        out    newInstance     : int;          // no longer used
                         out    status          : int;
            ServerAuditToken    audit_token     : audit_token_t);
 
                         out    status          : int;
            ServerAuditToken    audit_token     : audit_token_t);
 
@@ -124,7 +124,7 @@ routine configset   (       server          : mach_port_t;
                                key             : xmlData;
                                data            : xmlData;
                                instance        : int;
                                key             : xmlData;
                                data            : xmlData;
                                instance        : int;
-                        out    newInstance     : int;
+                        out    newInstance     : int;          // no longer used
                         out    status          : int;
            ServerAuditToken    audit_token     : audit_token_t);
 
                         out    status          : int;
            ServerAuditToken    audit_token     : audit_token_t);
 
@@ -138,7 +138,7 @@ routine configremove        (       server          : mach_port_t;
 routine configadd_s    (       server          : mach_port_t;
                                key             : xmlData;
                                data            : xmlData;
 routine configadd_s    (       server          : mach_port_t;
                                key             : xmlData;
                                data            : xmlData;
-                        out    newInstance     : int;
+                        out    newInstance     : int;          // no longer used
                         out    status          : int);
 
 routine confignotify   (       server          : mach_port_t;
                         out    status          : int);
 
 routine confignotify   (       server          : mach_port_t;
diff --git a/SystemConfiguration.fproj/helper/SCHelper_server.c b/SystemConfiguration.fproj/helper/SCHelper_server.c
index a6350765443c8d2a830b85462c74ab3f4a9fcbbc..10a21ed2094636e28be0c3b2fd35b14abd88e250 100644 (file)
--- a/SystemConfiguration.fproj/helper/SCHelper_server.c
+++ b/SystemConfiguration.fproj/helper/SCHelper_server.c
@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright (c) 2005-2018 Apple Inc. All rights reserved.
+ * Copyright (c) 2005-2019 Apple Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
  *
  *
  * @APPLE_LICENSE_HEADER_START@
  *
@@ -2097,6 +2097,8 @@ _helperinit(mach_port_t                   server,
        pthread_attr_t                  tattr;
        pthread_t                       tid;
 
        pthread_attr_t                  tattr;
        pthread_t                       tid;
 
+       *newSession = MACH_PORT_NULL;
+
        session = __SCHelperSessionFindWithPort(server);
        if (session != NULL) {
 #ifdef DEBUG
        session = __SCHelperSessionFindWithPort(server);
        if (session != NULL) {
 #ifdef DEBUG
diff --git a/configd.tproj/_configadd.c b/configd.tproj/_configadd.c
index 38ee21eaea915f2c3acc4a9a6741f5c663e47461..c66bede0776459d8a1e0c9c5a5750be5fcfcb269 100644 (file)
--- a/configd.tproj/_configadd.c
+++ b/configd.tproj/_configadd.c
@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright (c) 2000, 2001, 2003, 2004, 2006, 2008, 2011, 2012, 2014-2017 Apple Inc. All rights reserved.
+ * Copyright (c) 2000, 2001, 2003, 2004, 2006, 2008, 2011, 2012, 2014-2017, 2019 Apple Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
  *
  *
  * @APPLE_LICENSE_HEADER_START@
  *
@@ -98,6 +98,7 @@ _configadd(mach_port_t                        server,
        CFDataRef               data            = NULL;         /* data (un-serialized) */
        serverSessionRef        mySession;
 
        CFDataRef               data            = NULL;         /* data (un-serialized) */
        serverSessionRef        mySession;
 
+       *newInstance = 0;
        *sc_status = kSCStatusOK;
 
        /* un-serialize the key */
        *sc_status = kSCStatusOK;
 
        /* un-serialize the key */
@@ -136,9 +137,6 @@ _configadd(mach_port_t                      server,
        }
 
        *sc_status = __SCDynamicStoreAddValue(mySession->store, key, data);
        }
 
        *sc_status = __SCDynamicStoreAddValue(mySession->store, key, data);
-       if (*sc_status == kSCStatusOK) {
-               *newInstance = 0;
-       }
 
     done :
 
 
     done :
 
@@ -165,6 +163,7 @@ _configadd_s(mach_port_t            server,
        SCDynamicStorePrivateRef        storePrivate;
        Boolean                         useSessionKeys;
 
        SCDynamicStorePrivateRef        storePrivate;
        Boolean                         useSessionKeys;
 
+       *newInstance = 0;
        *sc_status = kSCStatusOK;
 
        /* un-serialize the key */
        *sc_status = kSCStatusOK;
 
        /* un-serialize the key */
@@ -204,9 +203,6 @@ _configadd_s(mach_port_t            server,
        storePrivate->useSessionKeys = TRUE;
 
        *sc_status = __SCDynamicStoreAddValue(mySession->store, key, data);
        storePrivate->useSessionKeys = TRUE;
 
        *sc_status = __SCDynamicStoreAddValue(mySession->store, key, data);
-       if (*sc_status == kSCStatusOK) {
-               *newInstance = 0;
-       }
 
        // restore "useSessionKeys"
        storePrivate->useSessionKeys = useSessionKeys;
 
        // restore "useSessionKeys"
        storePrivate->useSessionKeys = useSessionKeys;
diff --git a/configd.tproj/_configget.c b/configd.tproj/_configget.c
index 6a08c5433262c00eb0bf6ac5fc30d2b628412080..936bd46a65535066338b7493970e2638653aa39c 100644 (file)
--- a/configd.tproj/_configget.c
+++ b/configd.tproj/_configget.c
@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright (c) 2000-2006, 2008, 2011, 2013-2016 Apple Inc. All rights reserved.
+ * Copyright (c) 2000-2006, 2008, 2011, 2013-2016, 2019 Apple Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
  *
  *
  * @APPLE_LICENSE_HEADER_START@
  *
@@ -77,6 +77,7 @@ _configget(mach_port_t                        server,
 
        *dataRef = NULL;
        *dataLen = 0;
 
        *dataRef = NULL;
        *dataLen = 0;
+       *newInstance = 0;
 
        /* un-serialize the key */
        if (!_SCUnserializeString(&key, NULL, (void *)keyRef, keyLen)) {
 
        /* un-serialize the key */
        if (!_SCUnserializeString(&key, NULL, (void *)keyRef, keyLen)) {
@@ -113,11 +114,6 @@ _configget(mach_port_t                     server,
                goto done;
        }
 
                goto done;
        }
 
-       /*
-        * return the instance number associated with the returned data.
-        */
-       *newInstance = 1;
-
     done :
 
        if (key != NULL)        CFRelease(key);
     done :
 
        if (key != NULL)        CFRelease(key);
diff --git a/configd.tproj/_configopen.c b/configd.tproj/_configopen.c
index 37f7981a1e29fb69cb910438ab05c3c61a967b71..f4a2500bb7fa64435f6a878a5ec81a79dfddfbb0 100644 (file)
--- a/configd.tproj/_configopen.c
+++ b/configd.tproj/_configopen.c
@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright (c) 2000-2009, 2011, 2015-2017 Apple Inc. All rights reserved.
+ * Copyright (c) 2000-2009, 2011, 2015-2017, 2019 Apple Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
  *
  *
  * @APPLE_LICENSE_HEADER_START@
  *
@@ -109,6 +109,7 @@ _configopen(mach_port_t                     server,
        SCDynamicStorePrivateRef        storePrivate;
        CFBooleanRef                    useSessionKeys  = NULL;
 
        SCDynamicStorePrivateRef        storePrivate;
        CFBooleanRef                    useSessionKeys  = NULL;
 
+       *newServer = MACH_PORT_NULL;
        *sc_status = kSCStatusOK;
 
        /* un-serialize the name */
        *sc_status = kSCStatusOK;
 
        /* un-serialize the name */
diff --git a/configd.tproj/_configset.c b/configd.tproj/_configset.c
index 4497e44ace644e04a162b73c3589ee841a809db0..88706d049dc2bb9667937a9996ab1b12eac175ea 100644 (file)
--- a/configd.tproj/_configset.c
+++ b/configd.tproj/_configset.c
@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright (c) 2000-2004, 2006, 2008, 2011, 2012, 2014-2017 Apple Inc. All rights reserved.
+ * Copyright (c) 2000-2004, 2006, 2008, 2011, 2012, 2014-2017, 2019 Apple Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
  *
  *
  * @APPLE_LICENSE_HEADER_START@
  *
@@ -222,6 +222,7 @@ _configset(mach_port_t                      server,
        CFStringRef             key             = NULL; /* key  (un-serialized) */
        serverSessionRef        mySession;
 
        CFStringRef             key             = NULL; /* key  (un-serialized) */
        serverSessionRef        mySession;
 
+       *newInstance = 0;
        *sc_status = kSCStatusOK;
 
        /* un-serialize the key */
        *sc_status = kSCStatusOK;
 
        /* un-serialize the key */
@@ -259,7 +260,6 @@ _configset(mach_port_t                      server,
        }
 
        *sc_status = __SCDynamicStoreSetValue(mySession->store, key, data, FALSE);
        }
 
        *sc_status = __SCDynamicStoreSetValue(mySession->store, key, data, FALSE);
-       *newInstance = 0;
 
     done :
 
 
     done :
 
diff --git a/configd.tproj/configd_server.h b/configd.tproj/configd_server.h
index 1b9fbd4b1adb658ed84187c1d48534d4dd5a579b..caf743f4f6ebbdfafec919d4971185fbe59796f4 100644 (file)
--- a/configd.tproj/configd_server.h
+++ b/configd.tproj/configd_server.h
@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright (c) 2000-2006, 2008, 2011. 2015 Apple Inc. All rights reserved.
+ * Copyright (c) 2000-2006, 2008, 2011, 2015, 2019 Apple Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
  *
  *
  * @APPLE_LICENSE_HEADER_START@
  *
@@ -79,7 +79,7 @@ kern_return_t _configadd      (mach_port_t            server,
                                 mach_msg_type_number_t keyLen,
                                 xmlData_t              dataRef,
                                 mach_msg_type_number_t dataLen,
                                 mach_msg_type_number_t keyLen,
                                 xmlData_t              dataRef,
                                 mach_msg_type_number_t dataLen,
-                                int                    *newInstance,
+                                int                    *newInstance,           // no longer used
                                 int                    *sc_status,
                                 audit_token_t          audit_token);
 
                                 int                    *sc_status,
                                 audit_token_t          audit_token);
 
@@ -88,7 +88,7 @@ kern_return_t _configadd_s    (mach_port_t            server,
                                 mach_msg_type_number_t keyLen,
                                 xmlData_t              dataRef,
                                 mach_msg_type_number_t dataLen,
                                 mach_msg_type_number_t keyLen,
                                 xmlData_t              dataRef,
                                 mach_msg_type_number_t dataLen,
-                                int                    *newInstance,
+                                int                    *newInstance,           // no longer used
                                 int                    *sc_status);
 
 kern_return_t  _configget      (mach_port_t            server,
                                 int                    *sc_status);
 
 kern_return_t  _configget      (mach_port_t            server,
@@ -96,7 +96,7 @@ kern_return_t _configget      (mach_port_t            server,
                                 mach_msg_type_number_t keyLen,
                                 xmlDataOut_t           *dataRef,
                                 mach_msg_type_number_t *dataLen,
                                 mach_msg_type_number_t keyLen,
                                 xmlDataOut_t           *dataRef,
                                 mach_msg_type_number_t *dataLen,
-                                int                    *newInstance,
+                                int                    *newInstance,           // no longer used
                                 int                    *sc_status,
                                 audit_token_t          audit_token);
 
                                 int                    *sc_status,
                                 audit_token_t          audit_token);
 
@@ -105,7 +105,7 @@ kern_return_t       _configset      (mach_port_t            server,
                                 mach_msg_type_number_t keyLen,
                                 xmlData_t              dataRef,
                                 mach_msg_type_number_t dataLen,
                                 mach_msg_type_number_t keyLen,
                                 xmlData_t              dataRef,
                                 mach_msg_type_number_t dataLen,
-                                int                    *newInstance,
+                                int                    *newInstance,           // no longer used
                                 int                    *sc_status,
                                 audit_token_t          audit_token);
 
                                 int                    *sc_status,
                                 audit_token_t          audit_token);
 
@@ -186,4 +186,4 @@ kern_return_t       _notifyset      (mach_port_t            server,
 
 __END_DECLS
 
 
 __END_DECLS
 
-#endif /* !_S_CONFIGD_SERVER_H */
+#endif /* !_S_CONFIGD_SERVER_H */
mirror of configd