configd-802.20.7.tar.gz

[apple/configd.git] / scutil.tproj / nc.c

diff --git a/scutil.tproj/nc.c b/scutil.tproj/nc.c
index 668895a4f99748515af5048c16486201ed4fe7bf..be0952f7172bf2f2f4239b976e71a46db0c47a08 100644 (file)
--- a/scutil.tproj/nc.c
+++ b/scutil.tproj/nc.c
@@ -1,15 +1,15 @@
 /*
- * Copyright (c) 2010-2014 Apple Inc. All rights reserved.
+ * Copyright (c) 2010-2015 Apple Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
- * 
+ *
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
  * compliance with the License. Please obtain a copy of the License at
  * http://www.opensource.apple.com/apsl/ and read it before using this
  * file.
- * 
+ *
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
@@ -17,7 +17,7 @@
  * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
  * Please see the License for the specific language governing rights and
  * limitations under the License.
- * 
+ *
  * @APPLE_LICENSE_HEADER_END@
  */
 
@@ -919,12 +919,7 @@ nc_set_application_url(CFStringRef subtype, CFStringRef directory)
        do_prefs_init();                /* initialization */
        do_prefs_open(1, &path);        /* open prefs */
 
-       if (!SCPreferencesSetValue(prefs, CFSTR("ApplicationURL"), directory_url_data)) {
-               SCPrint(TRUE, stderr,
-                       CFSTR("SCPreferencesSetValue ApplicationURL failed, %s\n"),
-                       SCErrorString(SCError()));
-               goto done;
-       }
+       SCPreferencesSetValue(prefs, CFSTR("ApplicationURL"), directory_url_data);
 
        _prefs_save();
 
@@ -1006,17 +1001,15 @@ nc_show(int argc, char **argv)
                exit(exit_code);
        }
 
-       serviceID = SCNetworkServiceGetServiceID(service);
-
-       nc_get_service_type_and_subtype(service, &iftype, &ifsubtype);
-
-       if (!CFEqual(iftype, kSCEntNetPPP) &&
-           !CFEqual(iftype, kSCEntNetIPSec) &&
-           !CFEqual(iftype, kSCEntNetVPN)) {
+       if (!_SCNetworkServiceIsVPN(service)) {
                SCPrint(TRUE, stderr, CFSTR("Not a connection oriented service: %@\n"), serviceID);
                goto done;
        }
 
+       serviceID = SCNetworkServiceGetServiceID(service);
+
+       nc_get_service_type_and_subtype(service, &iftype, &ifsubtype);
+
        type_entity_key = SCDynamicStoreKeyCreateNetworkServiceEntity(NULL, kSCDynamicStoreDomainSetup, serviceID, iftype);
 
        nc_print_VPN_service(service);