Eliminate use of private macOS security headers/APIs (Issue #5516)

Eliminate use of deprecated cssmErrorString function.

Switch to using SecCertificateCreateWithData.

Clean out unused private header availability checks.

15 files changed, 30 insertions, 505 deletions

diff --git a/Makedefs.in b/Makedefs.in
index 1c3bc16cf..f085bc3f0 100644
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -99,7 +99,6 @@ LIBGSSAPI	=	@LIBGSSAPI@
 LIBHEADERS	=	@LIBHEADERS@
 LIBHEADERSPRIV	=	@LIBHEADERSPRIV@
 LIBMALLOC	=	@LIBMALLOC@
-LIBMXML		=	@LIBMXML@
 LIBPAPER	=	@LIBPAPER@
 LIBUSB		=	@LIBUSB@
 LIBWRAP		=	@LIBWRAP@
diff --git a/backend/ipp.c b/backend/ipp.c
index d23569830..e91f7684c 100644
--- a/backend/ipp.c
+++ b/backend/ipp.c
@@ -1,7 +1,7 @@
 /*
  * IPP backend for CUPS.
  *
- * Copyright © 2007-2018 by Apple Inc.
+ * Copyright © 2007-2019 by Apple Inc.
  * Copyright © 1997-2007 by Easy Software Products, all rights reserved.
  *
  * Licensed under Apache License v2.0.  See the file "LICENSE" for more
@@ -23,12 +23,8 @@
 #  define kPMPrintUIToolAgent	"com.apple.printuitool.agent"
 #  define kPMStartJob		100
 #  define kPMWaitForJob		101
-#  ifdef HAVE_XPC_PRIVATE_H
-#    include <xpc/private.h>
-#  else
 extern void	xpc_connection_set_target_uid(xpc_connection_t connection,
 		                              uid_t uid);
-#  endif /* HAVE_XPC_PRIVATE_H */
 #endif /* HAVE_GSSAPI && HAVE_XPC */
 
 
diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4
index 27dc33436..6a457b508 100644
--- a/config-scripts/cups-common.m4
+++ b/config-scripts/cups-common.m4
@@ -140,16 +140,6 @@ AC_CHECK_HEADER(iconv.h,
 		SAVELIBS="$SAVELIBS $LIBS")
 	LIBS="$SAVELIBS")
 
-dnl Checks for Mini-XML (www.minixml.org)...
-LIBMXML=""
-AC_CHECK_HEADER(mxml.h,
-	SAVELIBS="$LIBS"
-	AC_SEARCH_LIBS(mmxlNewElement,mxml,
-		AC_DEFINE(HAVE_MXML_H)
-		LIBMXML="-lmxml")
-	LIBS="$SAVELIBS")
-AC_SUBST(LIBMXML)
-
 dnl Checks for statfs and its many headers...
 AC_CHECK_HEADER(sys/mount.h,AC_DEFINE(HAVE_SYS_MOUNT_H))
 AC_CHECK_HEADER(sys/statfs.h,AC_DEFINE(HAVE_SYS_STATFS_H))
@@ -354,15 +344,12 @@ case $host_os_name in
 		dnl Check for framework headers...
 		AC_CHECK_HEADER(ApplicationServices/ApplicationServices.h,AC_DEFINE(HAVE_APPLICATIONSERVICES_H))
 		AC_CHECK_HEADER(CoreFoundation/CoreFoundation.h,AC_DEFINE(HAVE_COREFOUNDATION_H))
-		AC_CHECK_HEADER(CoreFoundation/CFPriv.h,AC_DEFINE(HAVE_CFPRIV_H))
-		AC_CHECK_HEADER(CoreFoundation/CFBundlePriv.h,AC_DEFINE(HAVE_CFBUNDLEPRIV_H))
 
 		dnl Check for dynamic store function...
 		AC_CHECK_FUNCS(SCDynamicStoreCopyComputerName)
 
 		dnl Check for the new membership functions in MacOSX 10.4...
 		AC_CHECK_HEADER(membership.h,AC_DEFINE(HAVE_MEMBERSHIP_H))
-		AC_CHECK_HEADER(membershipPriv.h,AC_DEFINE(HAVE_MEMBERSHIPPRIV_H))
 		AC_CHECK_FUNCS(mbr_uid_to_uuid)
 
 		dnl Need <dlfcn.h> header...
@@ -396,7 +383,6 @@ case $host_os_name in
 			else
 				CUPS_DEFAULT_PRINTOPERATOR_AUTH="@AUTHKEY(system.print.operator) @admin @lpadmin"
 			fi])
-		AC_CHECK_HEADER(Security/SecBasePriv.h,AC_DEFINE(HAVE_SECBASEPRIV_H))
 
 		dnl Check for sandbox/Seatbelt support
 		if test $host_os_version -ge 100; then
@@ -417,8 +403,6 @@ case $host_os_name in
 		AC_CHECK_HEADER(xpc/xpc.h,
 			AC_DEFINE(HAVE_XPC)
 			INSTALLXPC="install-xpc")
-		AC_CHECK_HEADER(xpc/private.h,
-			AC_DEFINE(HAVE_XPC_PRIVATE_H))
                 ;;
 esac
 
diff --git a/config-scripts/cups-ssl.m4 b/config-scripts/cups-ssl.m4
index 8446e3d15..c1648b1c1 100644
--- a/config-scripts/cups-ssl.m4
+++ b/config-scripts/cups-ssl.m4
@@ -1,7 +1,7 @@
 dnl
 dnl TLS stuff for CUPS.
 dnl
-dnl Copyright 2007-2017 by Apple Inc.
+dnl Copyright 2007-2019 by Apple Inc.
 dnl Copyright 1997-2007 by Easy Software Products, all rights reserved.
 dnl
 dnl Licensed under Apache License v2.0.  See the file "LICENSE" for more information.
@@ -27,23 +27,12 @@ if test x$enable_ssl != xno; then
 		CUPS_SERVERKEYCHAIN="/Library/Keychains/System.keychain"
 
 		dnl Check for the various security headers...
-		AC_CHECK_HEADER(Security/SecureTransportPriv.h,
-		    AC_DEFINE(HAVE_SECURETRANSPORTPRIV_H))
 		AC_CHECK_HEADER(Security/SecCertificate.h,
 		    AC_DEFINE(HAVE_SECCERTIFICATE_H))
 		AC_CHECK_HEADER(Security/SecItem.h,
 		    AC_DEFINE(HAVE_SECITEM_H))
-		AC_CHECK_HEADER(Security/SecItemPriv.h,
-		    AC_DEFINE(HAVE_SECITEMPRIV_H),,
-		    [#include <Security/SecItem.h>])
 		AC_CHECK_HEADER(Security/SecPolicy.h,
-		    AC_DEFINE(HAVE_SECPOLICY_H))
-		AC_CHECK_HEADER(Security/SecPolicyPriv.h,
-		    AC_DEFINE(HAVE_SECPOLICYPRIV_H))
-		AC_CHECK_HEADER(Security/SecBasePriv.h,
-		    AC_DEFINE(HAVE_SECBASEPRIV_H))
-		AC_CHECK_HEADER(Security/SecIdentitySearchPriv.h,
-		    AC_DEFINE(HAVE_SECIDENTITYSEARCHPRIV_H))])
+		    AC_DEFINE(HAVE_SECPOLICY_H))])
 	fi
     fi
 
diff --git a/config.h.in b/config.h.in
index 4323e5ea7..b91482ac7 100644
--- a/config.h.in
+++ b/config.h.in
@@ -1,10 +1,11 @@
 /*
  * Configuration file for CUPS.
  *
- * Copyright 2007-2017 by Apple Inc.
+ * Copyright 2007-2019 by Apple Inc.
  * Copyright 1997-2007 by Easy Software Products.
  *
- * Licensed under Apache License v2.0.  See the file "LICENSE" for more information.
+ * Licensed under Apache License v2.0.  See the file "LICENSE" for more
+ * information.
  */
 
 #ifndef _CUPS_CONFIG_H_
@@ -318,14 +319,9 @@
  */
 
 #undef HAVE_AUTHORIZATION_H
-#undef HAVE_SECBASEPRIV_H
 #undef HAVE_SECCERTIFICATE_H
-#undef HAVE_SECIDENTITYSEARCHPRIV_H
 #undef HAVE_SECITEM_H
-#undef HAVE_SECITEMPRIV_H
 #undef HAVE_SECPOLICY_H
-#undef HAVE_SECPOLICYPRIV_H
-#undef HAVE_SECURETRANSPORTPRIV_H
 
 
 /*
@@ -477,12 +473,10 @@
 
 
 /*
- * Do we have CoreFoundation public and private headers?
+ * Do we have CoreFoundation public headers?
  */
 
 #undef HAVE_COREFOUNDATION_H
-#undef HAVE_CFPRIV_H
-#undef HAVE_CFBUNDLEPRIV_H
 
 
 /*
@@ -511,7 +505,6 @@
  */
 
 #undef HAVE_MEMBERSHIP_H
-#undef HAVE_MEMBERSHIPPRIV_H
 #undef HAVE_MBR_UID_TO_UUID
 
 
@@ -664,14 +657,6 @@
  */
 
 #undef HAVE_XPC
-#undef HAVE_XPC_PRIVATE_H
-
-
-/*
- * Do we have Mini-XML?
- */
-
-#undef HAVE_MXML_H
 
 
 /*
diff --git a/configure b/configure
index 7fb26fd18..ced6641e9 100755
--- a/configure
+++ b/configure
@@ -735,7 +735,6 @@ INSTALL_GZIP
 LIBWRAP
 USBQUIRKS
 LIBUSB
-LIBMXML
 EGREP
 GREP
 LIBPAPER
@@ -5241,74 +5240,6 @@ fi
 
 
 
-LIBMXML=""
-ac_fn_c_check_header_mongrel "$LINENO" "mxml.h" "ac_cv_header_mxml_h" "$ac_includes_default"
-if test "x$ac_cv_header_mxml_h" = xyes; then :
-  SAVELIBS="$LIBS"
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing mmxlNewElement" >&5
-$as_echo_n "checking for library containing mmxlNewElement... " >&6; }
-if ${ac_cv_search_mmxlNewElement+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_func_search_save_LIBS=$LIBS
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char mmxlNewElement ();
-int
-main ()
-{
-return mmxlNewElement ();
-  ;
-  return 0;
-}
-_ACEOF
-for ac_lib in '' mxml; do
-  if test -z "$ac_lib"; then
-    ac_res="none required"
-  else
-    ac_res=-l$ac_lib
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-  fi
-  if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_search_mmxlNewElement=$ac_res
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext
-  if ${ac_cv_search_mmxlNewElement+:} false; then :
-  break
-fi
-done
-if ${ac_cv_search_mmxlNewElement+:} false; then :
-
-else
-  ac_cv_search_mmxlNewElement=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_mmxlNewElement" >&5
-$as_echo "$ac_cv_search_mmxlNewElement" >&6; }
-ac_res=$ac_cv_search_mmxlNewElement
-if test "$ac_res" != no; then :
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-  $as_echo "#define HAVE_MXML_H 1" >>confdefs.h
-
-		LIBMXML="-lmxml"
-fi
-
-	LIBS="$SAVELIBS"
-fi
-
-
-
-
 ac_fn_c_check_header_mongrel "$LINENO" "sys/mount.h" "ac_cv_header_sys_mount_h" "$ac_includes_default"
 if test "x$ac_cv_header_sys_mount_h" = xyes; then :
   $as_echo "#define HAVE_SYS_MOUNT_H 1" >>confdefs.h
@@ -5917,20 +5848,6 @@ if test "x$ac_cv_header_CoreFoundation_CoreFoundation_h" = xyes; then :
 fi
 
 
-		ac_fn_c_check_header_mongrel "$LINENO" "CoreFoundation/CFPriv.h" "ac_cv_header_CoreFoundation_CFPriv_h" "$ac_includes_default"
-if test "x$ac_cv_header_CoreFoundation_CFPriv_h" = xyes; then :
-  $as_echo "#define HAVE_CFPRIV_H 1" >>confdefs.h
-
-fi
-
-
-		ac_fn_c_check_header_mongrel "$LINENO" "CoreFoundation/CFBundlePriv.h" "ac_cv_header_CoreFoundation_CFBundlePriv_h" "$ac_includes_default"
-if test "x$ac_cv_header_CoreFoundation_CFBundlePriv_h" = xyes; then :
-  $as_echo "#define HAVE_CFBUNDLEPRIV_H 1" >>confdefs.h
-
-fi
-
-
 
 				for ac_func in SCDynamicStoreCopyComputerName
 do :
@@ -5951,13 +5868,6 @@ if test "x$ac_cv_header_membership_h" = xyes; then :
 fi
 
 
-		ac_fn_c_check_header_mongrel "$LINENO" "membershipPriv.h" "ac_cv_header_membershipPriv_h" "$ac_includes_default"
-if test "x$ac_cv_header_membershipPriv_h" = xyes; then :
-  $as_echo "#define HAVE_MEMBERSHIPPRIV_H 1" >>confdefs.h
-
-fi
-
-
 		for ac_func in mbr_uid_to_uuid
 do :
   ac_fn_c_check_func "$LINENO" "mbr_uid_to_uuid" "ac_cv_func_mbr_uid_to_uuid"
@@ -6036,13 +5946,6 @@ if test "x$ac_cv_header_Security_Authorization_h" = xyes; then :
 fi
 
 
-		ac_fn_c_check_header_mongrel "$LINENO" "Security/SecBasePriv.h" "ac_cv_header_Security_SecBasePriv_h" "$ac_includes_default"
-if test "x$ac_cv_header_Security_SecBasePriv_h" = xyes; then :
-  $as_echo "#define HAVE_SECBASEPRIV_H 1" >>confdefs.h
-
-fi
-
-
 
 				if test $host_os_version -ge 100; then
 			ac_fn_c_check_header_mongrel "$LINENO" "sandbox.h" "ac_cv_header_sandbox_h" "$ac_includes_default"
@@ -6075,13 +5978,6 @@ if test "x$ac_cv_header_xpc_xpc_h" = xyes; then :
 fi
 
 
-		ac_fn_c_check_header_mongrel "$LINENO" "xpc/private.h" "ac_cv_header_xpc_private_h" "$ac_includes_default"
-if test "x$ac_cv_header_xpc_private_h" = xyes; then :
-  $as_echo "#define HAVE_XPC_PRIVATE_H 1" >>confdefs.h
-
-fi
-
-
                 ;;
 esac
 
@@ -8305,14 +8201,7 @@ if test "x$ac_cv_header_Security_SecureTransport_h" = xyes; then :
 
 		CUPS_SERVERKEYCHAIN="/Library/Keychains/System.keychain"
 
-				ac_fn_c_check_header_mongrel "$LINENO" "Security/SecureTransportPriv.h" "ac_cv_header_Security_SecureTransportPriv_h" "$ac_includes_default"
-if test "x$ac_cv_header_Security_SecureTransportPriv_h" = xyes; then :
-  $as_echo "#define HAVE_SECURETRANSPORTPRIV_H 1" >>confdefs.h
-
-fi
-
-
-		ac_fn_c_check_header_mongrel "$LINENO" "Security/SecCertificate.h" "ac_cv_header_Security_SecCertificate_h" "$ac_includes_default"
+				ac_fn_c_check_header_mongrel "$LINENO" "Security/SecCertificate.h" "ac_cv_header_Security_SecCertificate_h" "$ac_includes_default"
 if test "x$ac_cv_header_Security_SecCertificate_h" = xyes; then :
   $as_echo "#define HAVE_SECCERTIFICATE_H 1" >>confdefs.h
 
@@ -8326,14 +8215,6 @@ if test "x$ac_cv_header_Security_SecItem_h" = xyes; then :
 fi
 
 
-		ac_fn_c_check_header_compile "$LINENO" "Security/SecItemPriv.h" "ac_cv_header_Security_SecItemPriv_h" "#include <Security/SecItem.h>
-"
-if test "x$ac_cv_header_Security_SecItemPriv_h" = xyes; then :
-  $as_echo "#define HAVE_SECITEMPRIV_H 1" >>confdefs.h
-
-fi
-
-
 		ac_fn_c_check_header_mongrel "$LINENO" "Security/SecPolicy.h" "ac_cv_header_Security_SecPolicy_h" "$ac_includes_default"
 if test "x$ac_cv_header_Security_SecPolicy_h" = xyes; then :
   $as_echo "#define HAVE_SECPOLICY_H 1" >>confdefs.h
@@ -8341,27 +8222,6 @@ if test "x$ac_cv_header_Security_SecPolicy_h" = xyes; then :
 fi
 
 
-		ac_fn_c_check_header_mongrel "$LINENO" "Security/SecPolicyPriv.h" "ac_cv_header_Security_SecPolicyPriv_h" "$ac_includes_default"
-if test "x$ac_cv_header_Security_SecPolicyPriv_h" = xyes; then :
-  $as_echo "#define HAVE_SECPOLICYPRIV_H 1" >>confdefs.h
-
-fi
-
-
-		ac_fn_c_check_header_mongrel "$LINENO" "Security/SecBasePriv.h" "ac_cv_header_Security_SecBasePriv_h" "$ac_includes_default"
-if test "x$ac_cv_header_Security_SecBasePriv_h" = xyes; then :
-  $as_echo "#define HAVE_SECBASEPRIV_H 1" >>confdefs.h
-
-fi
-
-
-		ac_fn_c_check_header_mongrel "$LINENO" "Security/SecIdentitySearchPriv.h" "ac_cv_header_Security_SecIdentitySearchPriv_h" "$ac_includes_default"
-if test "x$ac_cv_header_Security_SecIdentitySearchPriv_h" = xyes; then :
-  $as_echo "#define HAVE_SECIDENTITYSEARCHPRIV_H 1" >>confdefs.h
-
-fi
-
-
 fi
 
 
diff --git a/cups/auth.c b/cups/auth.c
index b97a6b61c..0f7fd523a 100644
--- a/cups/auth.c
+++ b/cups/auth.c
@@ -1,7 +1,7 @@
 /*
  * Authentication functions for CUPS.
  *
- * Copyright 2007-2018 by Apple Inc.
+ * Copyright 2007-2019 by Apple Inc.
  * Copyright 1997-2007 by Easy Software Products.
  *
  * This file contains Kerberos support code, copyright 2006 by
@@ -26,11 +26,6 @@
 
 #if HAVE_AUTHORIZATION_H
 #  include <Security/Authorization.h>
-#  ifdef HAVE_SECBASEPRIV_H
-#    include <Security/SecBasePriv.h>
-#  else
-extern const char *cssmErrorString(int error);
-#  endif /* HAVE_SECBASEPRIV_H */
 #endif /* HAVE_AUTHORIZATION_H */
 
 #if defined(SO_PEERCRED) && defined(AF_LOCAL)
@@ -951,8 +946,8 @@ cups_local_auth(http_t *http)		/* I - HTTP connection to server */
     status = AuthorizationCreate(NULL, kAuthorizationEmptyEnvironment, kAuthorizationFlagDefaults, &http->auth_ref);
     if (status != errAuthorizationSuccess)
     {
-      DEBUG_printf(("8cups_local_auth: AuthorizationCreate() returned %d (%s)",
-		    (int)status, cssmErrorString(status)));
+      DEBUG_printf(("8cups_local_auth: AuthorizationCreate() returned %d",
+		    (int)status));
       return (-1);
     }
 
@@ -993,8 +988,7 @@ cups_local_auth(http_t *http)		/* I - HTTP connection to server */
     else if (status == errAuthorizationCanceled)
       return (-1);
 
-    DEBUG_printf(("9cups_local_auth: AuthorizationCopyRights() returned %d (%s)",
-		  (int)status, cssmErrorString(status)));
+    DEBUG_printf(("9cups_local_auth: AuthorizationCopyRights() returned %d", (int)status));
 
   /*
    * Fall through to try certificates...
diff --git a/cups/http-private.h b/cups/http-private.h
index 1e9022bd1..212fea7c4 100644
--- a/cups/http-private.h
+++ b/cups/http-private.h
@@ -154,18 +154,6 @@ typedef gnutls_certificate_credentials_t *http_tls_credentials_t;
  * for its IO and protocol management...
  */
 
-#    if !defined(HAVE_SECIDENTITYSEARCHPRIV_H) && defined(HAVE_SECIDENTITYSEARCHCREATEWITHPOLICY) /* Declare prototype for function in that header... */
-extern OSStatus SecIdentitySearchCreateWithPolicy(SecPolicyRef policy,
-				CFStringRef idString, CSSM_KEYUSE keyUsage,
-				CFTypeRef keychainOrArray,
-				Boolean returnOnlyValidIdentities,
-				SecIdentitySearchRef* searchRef);
-#    endif /* !HAVE_SECIDENTITYSEARCHPRIV_H && HAVE_SECIDENTITYSEARCHCREATEWITHPOLICY */
-#    if !defined(HAVE_SECPOLICYPRIV_H) && defined(HAVE_SECPOLICYSETVALUE) /* Declare prototype for function in that header... */
-extern OSStatus SecPolicySetValue(SecPolicyRef policyRef,
-                                  const CSSM_DATA *value);
-#    endif /* !HAVE_SECPOLICYPRIV_H && HAVE_SECPOLICYSETVALUE */
-
 typedef SSLContextRef	http_tls_t;
 typedef CFArrayRef	http_tls_credentials_t;
 
diff --git a/cups/tls-darwin.c b/cups/tls-darwin.c
index dd19daa51..73447da7f 100644
--- a/cups/tls-darwin.c
+++ b/cups/tls-darwin.c
@@ -18,20 +18,11 @@
 extern char **environ;
 
 
-#ifdef HAVE_SECURETRANSPORTPRIV_H
-#  include <Security/SecureTransportPriv.h>
-#endif /* HAVE_SECURETRANSPORTPRIV_H */
-#ifdef HAVE_SECBASEPRIV_H
-#  include <Security/SecBasePriv.h>
-#endif /* HAVE_SECBASEPRIV_H */
-#ifdef HAVE_SECCERTIFICATEPRIV_H
-#  include <Security/SecCertificatePriv.h>
-#else
-#  ifndef _SECURITY_VERSION_GREATER_THAN_57610_
+#ifndef _SECURITY_VERSION_GREATER_THAN_57610_
 typedef CF_OPTIONS(uint32_t, SecKeyUsage) {
     kSecKeyUsageAll              = 0x7FFFFFFF
 };
-#  endif /* !_SECURITY_VERSION_GREATER_THAN_57610_ */
+#endif /* !_SECURITY_VERSION_GREATER_THAN_57610_ */
 extern const void * kSecCSRChallengePassword;
 extern const void * kSecSubjectAltName;
 extern const void * kSecCertificateKeyUsage;
@@ -44,23 +35,10 @@ extern const void * kSecOidStateProvinceName;
 extern const void * kSecOidLocalityName;
 extern const void * kSecOidOrganization;
 extern const void * kSecOidOrganizationalUnit;
-extern SecCertificateRef SecCertificateCreateWithBytes(CFAllocatorRef allocator, const UInt8 *bytes, CFIndex length);
 extern bool SecCertificateIsValid(SecCertificateRef certificate, CFAbsoluteTime verifyTime);
 extern CFAbsoluteTime SecCertificateNotValidAfter(SecCertificateRef certificate);
 extern SecCertificateRef SecGenerateSelfSignedCertificate(CFArrayRef subject, CFDictionaryRef parameters, SecKeyRef publicKey, SecKeyRef privateKey);
 extern SecIdentityRef SecIdentityCreate(CFAllocatorRef allocator, SecCertificateRef certificate, SecKeyRef privateKey);
-#endif /* HAVE_SECCERTIFICATEPRIV_H */
-#ifdef HAVE_SECITEMPRIV_H
-#  include <Security/SecItemPriv.h>
-#endif /* HAVE_SECITEMPRIV_H */
-#ifdef HAVE_SECIDENTITYSEARCHPRIV_H
-#  include <Security/SecIdentitySearchPriv.h>
-#endif /* HAVE_SECIDENTITYSEARCHPRIV_H */
-#ifdef HAVE_SECPOLICYPRIV_H
-#  include <Security/SecPolicyPriv.h>
-#endif /* HAVE_SECPOLICYPRIV_H */
-
-//extern SecCertificateRef SecGenerateSelfSignedCertificate(CFArrayRef subject, CFDictionaryRef parameters, SecKeyRef _Nullable publicKey, SecKeyRef privateKey);
 
 
 /*
@@ -2024,10 +2002,18 @@ static SecCertificateRef			/* O - Certificate */
 http_cdsa_create_credential(
     http_credential_t *credential)		/* I - Credential */
 {
+  SecCertificateRef	cert;			/* Certificate */
+  CFDataRef		data;			/* Data object */
+
+
   if (!credential)
     return (NULL);
 
-  return (SecCertificateCreateWithBytes(kCFAllocatorDefault, credential->data, (CFIndex)credential->datalen));
+  data = CFDataCreate(kCFAllocatorDefault, credential->data, (CFIndex)credential->datalen);
+  cert = SecCertificateCreateWithData(kCFAllocatorDefault, data);
+  CFRelease(data);
+
+  return (cert);
 }
 
 
diff --git a/scheduler/auth.c b/scheduler/auth.c
index 0774ae3cf..e4c9157f5 100644
--- a/scheduler/auth.c
+++ b/scheduler/auth.c
@@ -1,7 +1,7 @@
 /*
  * Authorization routines for the CUPS scheduler.
  *
- * Copyright © 2007-2018 by Apple Inc.
+ * Copyright © 2007-2019 by Apple Inc.
  * Copyright © 1997-2007 by Easy Software Products, all rights reserved.
  *
  * This file contains Kerberos support code, copyright 2006 by
@@ -35,11 +35,6 @@
 #endif /* HAVE_MEMBERSHIP_H */
 #ifdef HAVE_AUTHORIZATION_H
 #  include <Security/AuthorizationTags.h>
-#  ifdef HAVE_SECBASEPRIV_H
-#    include <Security/SecBasePriv.h>
-#  else
-extern const char *cssmErrorString(int error);
-#  endif /* HAVE_SECBASEPRIV_H */
 #endif /* HAVE_AUTHORIZATION_H */
 #ifdef HAVE_SYS_PARAM_H
 #  include <sys/param.h>
@@ -344,7 +339,7 @@ cupsdAuthorize(cupsd_client_t *con)	/* I - Client connection */
 
     if ((status = AuthorizationCreateFromExternalForm((AuthorizationExternalForm *)authdata, &con->authref)) != 0)
     {
-      cupsdLogClient(con, CUPSD_LOG_ERROR, "AuthorizationCreateFromExternalForm returned %d (%s)", (int)status, cssmErrorString(status));
+      cupsdLogClient(con, CUPSD_LOG_ERROR, "AuthorizationCreateFromExternalForm returned %d", (int)status);
       return;
     }
 
@@ -1925,9 +1920,7 @@ check_authref(cupsd_client_t *con,	/* I - Connection */
 					kAuthorizationEmptyEnvironment,
 					authflags, NULL)) != 0)
   {
-    cupsdLogMessage(CUPSD_LOG_ERROR,
-		    "AuthorizationCopyRights(\"%s\") returned %d (%s)",
-		    authright.name, (int)status, cssmErrorString(status));
+    cupsdLogMessage(CUPSD_LOG_ERROR, "AuthorizationCopyRights(\"%s\") returned %d", authright.name, (int)status);
     return (0);
   }
 
diff --git a/scheduler/ipp.c b/scheduler/ipp.c
index 2e3d33a51..d519b85c0 100644
--- a/scheduler/ipp.c
+++ b/scheduler/ipp.c
@@ -19,19 +19,12 @@
 #include <cups/ppd-private.h>
 
 #ifdef __APPLE__
-/*#  include <ApplicationServices/ApplicationServices.h>
-extern CFUUIDRef ColorSyncCreateUUIDFromUInt32(unsigned id);
-#  include <CoreFoundation/CoreFoundation.h>*/
 #  ifdef HAVE_MEMBERSHIP_H
 #    include <membership.h>
 #  endif /* HAVE_MEMBERSHIP_H */
-#  ifdef HAVE_MEMBERSHIPPRIV_H
-#    include <membershipPriv.h>
-#  else
 extern int mbr_user_name_to_uuid(const char* name, uuid_t uu);
 extern int mbr_group_name_to_uuid(const char* name, uuid_t uu);
 extern int mbr_check_membership_by_id(uuid_t user, gid_t group, int* ismember);
-#  endif /* HAVE_MEMBERSHIPPRIV_H */
 #endif /* __APPLE__ */
 
 
diff --git a/systemv/lpadmin.c b/systemv/lpadmin.c
index 709949a62..53580ff4e 100644
--- a/systemv/lpadmin.c
+++ b/systemv/lpadmin.c
@@ -1125,6 +1125,7 @@ enable_printer(http_t *http,		/* I - Server connection */
 
   request = ippNewRequest(IPP_OP_ENABLE_PRINTER);
 
+  httpAssembleURIf(HTTP_URI_CODING_ALL, uri, sizeof(uri), "ipp", NULL, "localhost", ippPort(), "/printers/%s", printer);
   ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL, uri);
   ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "requesting-user-name", NULL, cupsUser());
 
diff --git a/vcnet/config.h b/vcnet/config.h
index a93131e1a..d5d1b5c6b 100644
--- a/vcnet/config.h
+++ b/vcnet/config.h
@@ -1,7 +1,7 @@
 /*
  * Configuration file for CUPS on Windows.
  *
- * Copyright 2007-2018 by Apple Inc.
+ * Copyright 2007-2019 by Apple Inc.
  * Copyright 1997-2007 by Easy Software Products.
  *
  * Licensed under Apache License v2.0.  See the file "LICENSE" for more information.
@@ -394,21 +394,9 @@ typedef unsigned long useconds_t;
  */
 
 /* #undef HAVE_AUTHORIZATION_H */
-/* #undef HAVE_SECBASEPRIV_H */
 /* #undef HAVE_SECCERTIFICATE_H */
-/* #undef HAVE_SECIDENTITYSEARCHPRIV_H */
 /* #undef HAVE_SECITEM_H */
-/* #undef HAVE_SECITEMPRIV_H */
 /* #undef HAVE_SECPOLICY_H */
-/* #undef HAVE_SECPOLICYPRIV_H */
-/* #undef HAVE_SECURETRANSPORTPRIV_H */
-
-
-/*
- * Do we have the cssmErrorString function?
- */
-
-/* #undef HAVE_CSSMERRORSTRING */
 
 
 /*
@@ -574,12 +562,10 @@ typedef unsigned long useconds_t;
 
 
 /*
- * Do we have CoreFoundation public and private headers?
+ * Do we have CoreFoundation public headers?
  */
 
 /* #undef HAVE_COREFOUNDATION_H */
-/* #undef HAVE_CFPRIV_H */
-/* #undef HAVE_CFBUNDLEPRIV_H */
 
 
 /*
@@ -608,7 +594,6 @@ typedef unsigned long useconds_t;
  */
 
 /* #undef HAVE_MEMBERSHIP_H */
-/* #undef HAVE_MEMBERSHIPPRIV_H */
 /* #undef HAVE_MBR_UID_TO_UUID */
 
 
@@ -761,14 +746,6 @@ typedef unsigned long useconds_t;
  */
 
 /* #undef HAVE_XPC */
-/* #undef HAVE_XPC_PRIVATE_H */
-
-
-/*
- * Do we have Mini-XML?
- */
-
-/* #undef HAVE_MXML_H */
 
 
 /*
diff --git a/xcode/CUPS.xcodeproj/project.pbxproj b/xcode/CUPS.xcodeproj/project.pbxproj
index d449169e2..6bce8085c 100644
--- a/xcode/CUPS.xcodeproj/project.pbxproj
+++ b/xcode/CUPS.xcodeproj/project.pbxproj
@@ -82,7 +82,6 @@
 				271286471CC12F9000E517C7 /* PBXTargetDependency */,
 				2712857E1CC1295A00E517C7 /* PBXTargetDependency */,
 				271285801CC1295A00E517C7 /* PBXTargetDependency */,
-				271285821CC1295A00E517C7 /* PBXTargetDependency */,
 				271285841CC1295A00E517C7 /* PBXTargetDependency */,
 				271285861CC1295A00E517C7 /* PBXTargetDependency */,
 				271285881CC1295A00E517C7 /* PBXTargetDependency */,
@@ -98,7 +97,6 @@
 				72F75A711336FACD004BB496 /* PBXTargetDependency */,
 				274FF5E513332D4300317ECB /* PBXTargetDependency */,
 				274FF622133331D300317ECB /* PBXTargetDependency */,
-				276684131337FA8D000D33D0 /* PBXTargetDependency */,
 				2766836B1337AA25000D33D0 /* PBXTargetDependency */,
 				274FF5E713332D4300317ECB /* PBXTargetDependency */,
 				274FF6E21333B33F00317ECB /* PBXTargetDependency */,
@@ -209,8 +207,6 @@
 		271284ED1CC1262C00E517C7 /* cancel.c in Sources */ = {isa = PBXBuildFile; fileRef = 2732E089137A3F5200FAFEF6 /* cancel.c */; };
 		271284F41CC1264B00E517C7 /* libcups.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 72220EAE1333047D00FCA411 /* libcups.dylib */; };
 		271284FA1CC1265800E517C7 /* cupsaccept.c in Sources */ = {isa = PBXBuildFile; fileRef = 2732E08A137A3F5200FAFEF6 /* cupsaccept.c */; };
-		271285011CC1265D00E517C7 /* libcups.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 72220EAE1333047D00FCA411 /* libcups.dylib */; };
-		271285071CC1267400E517C7 /* cupstestdsc.c in Sources */ = {isa = PBXBuildFile; fileRef = 2732E08B137A3F5200FAFEF6 /* cupstestdsc.c */; };
 		2712850E1CC1267A00E517C7 /* libcups.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 72220EAE1333047D00FCA411 /* libcups.dylib */; };
 		271285141CC1269400E517C7 /* lp.c in Sources */ = {isa = PBXBuildFile; fileRef = 2732E08C137A3F5200FAFEF6 /* lp.c */; };
 		2712851B1CC1269700E517C7 /* libcups.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 72220EAE1333047D00FCA411 /* libcups.dylib */; };
@@ -423,8 +419,6 @@
 		276683E51337B2BE000D33D0 /* libcupsimage.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 72F75A611336F9A3004BB496 /* libcupsimage.dylib */; };
 		276683FA1337F7A9000D33D0 /* ipptool.c in Sources */ = {isa = PBXBuildFile; fileRef = 276683F91337F7A9000D33D0 /* ipptool.c */; };
 		276683FD1337F7B8000D33D0 /* libcups.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 72220EAE1333047D00FCA411 /* libcups.dylib */; };
-		2766840F1337FA38000D33D0 /* libcups.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 72220EAE1333047D00FCA411 /* libcups.dylib */; };
-		276684111337FA7C000D33D0 /* cupsaddsmb.c in Sources */ = {isa = PBXBuildFile; fileRef = 276684101337FA7C000D33D0 /* cupsaddsmb.c */; };
 		2767FC5219266A36000F61D3 /* testdest.c in Sources */ = {isa = PBXBuildFile; fileRef = 2767FC5119266A36000F61D3 /* testdest.c */; };
 		2767FC57192674C4000F61D3 /* libcups_static.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 72A4332F155844CF002E172D /* libcups_static.a */; };
 		2767FC58192674E0000F61D3 /* libcups_static.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 72A4332F155844CF002E172D /* libcups_static.a */; };
@@ -1175,13 +1169,6 @@
 			remoteGlobalIDString = 72220EAD1333047D00FCA411;
 			remoteInfo = libcups;
 		};
-		271284FD1CC1265D00E517C7 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 72BF96371333042100B1EAD7 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 72220EAD1333047D00FCA411;
-			remoteInfo = libcups;
-		};
 		2712850A1CC1267A00E517C7 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 72BF96371333042100B1EAD7 /* Project object */;
@@ -1259,13 +1246,6 @@
 			remoteGlobalIDString = 271284EE1CC1264B00E517C7;
 			remoteInfo = cupsaccept;
 		};
-		271285811CC1295A00E517C7 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 72BF96371333042100B1EAD7 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 271284FB1CC1265D00E517C7;
-			remoteInfo = cupstestdsc;
-		};
 		271285831CC1295A00E517C7 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 72BF96371333042100B1EAD7 /* Project object */;
@@ -1889,20 +1869,6 @@
 			remoteGlobalIDString = 276683EF1337F78E000D33D0;
 			remoteInfo = ipptool;
 		};
-		2766840D1337FA31000D33D0 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 72BF96371333042100B1EAD7 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 72220EAD1333047D00FCA411;
-			remoteInfo = libcups;
-		};
-		276684121337FA8D000D33D0 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 72BF96371333042100B1EAD7 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 276684031337FA1D000D33D0;
-			remoteInfo = cupsaddsmb;
-		};
 		2767FC4819266A0D000F61D3 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 72BF96371333042100B1EAD7 /* Project object */;
@@ -2369,15 +2335,6 @@
 			);
 			runOnlyForDeploymentPostprocessing = 1;
 		};
-		271285021CC1265D00E517C7 /* CopyFiles */ = {
-			isa = PBXCopyFilesBuildPhase;
-			buildActionMask = 2147483647;
-			dstPath = /usr/share/man/man1/;
-			dstSubfolderSpec = 0;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 1;
-		};
 		2712850F1CC1267A00E517C7 /* CopyFiles */ = {
 			isa = PBXCopyFilesBuildPhase;
 			buildActionMask = 2147483647;
@@ -2765,15 +2722,6 @@
 			);
 			runOnlyForDeploymentPostprocessing = 1;
 		};
-		276684021337FA1D000D33D0 /* CopyFiles */ = {
-			isa = PBXCopyFilesBuildPhase;
-			buildActionMask = 2147483647;
-			dstPath = /usr/share/man/man1/;
-			dstSubfolderSpec = 0;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 1;
-		};
 		2767FC4C19266A0D000F61D3 /* CopyFiles */ = {
 			isa = PBXCopyFilesBuildPhase;
 			buildActionMask = 2147483647;
@@ -3142,7 +3090,6 @@
 		271284E01CC125FC00E517C7 /* lprm.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lprm.c; path = ../berkeley/lprm.c; sourceTree = "<group>"; };
 		271284EC1CC1261900E517C7 /* cancel */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = cancel; sourceTree = BUILT_PRODUCTS_DIR; };
 		271284F91CC1264B00E517C7 /* cupsaccept */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = cupsaccept; sourceTree = BUILT_PRODUCTS_DIR; };
-		271285061CC1265D00E517C7 /* cupstestdsc */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = cupstestdsc; sourceTree = BUILT_PRODUCTS_DIR; };
 		271285131CC1267A00E517C7 /* lp */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = lp; sourceTree = BUILT_PRODUCTS_DIR; };
 		271285201CC1269700E517C7 /* lpc */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = lpc; sourceTree = BUILT_PRODUCTS_DIR; };
 		2712852D1CC126AA00E517C7 /* lpinfo */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = lpinfo; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -3185,7 +3132,6 @@
 		2712872C1CC140BE00E517C7 /* genstrings */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = genstrings; sourceTree = BUILT_PRODUCTS_DIR; };
 		2732E089137A3F5200FAFEF6 /* cancel.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = cancel.c; path = ../systemv/cancel.c; sourceTree = "<group>"; };
 		2732E08A137A3F5200FAFEF6 /* cupsaccept.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = cupsaccept.c; path = ../systemv/cupsaccept.c; sourceTree = "<group>"; };
-		2732E08B137A3F5200FAFEF6 /* cupstestdsc.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = cupstestdsc.c; path = ../systemv/cupstestdsc.c; sourceTree = "<group>"; };
 		2732E08C137A3F5200FAFEF6 /* lp.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = lp.c; path = ../systemv/lp.c; sourceTree = "<group>"; };
 		2732E08D137A3F5200FAFEF6 /* lpadmin.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = lpadmin.c; path = ../systemv/lpadmin.c; sourceTree = "<group>"; };
 		2732E08E137A3F5200FAFEF6 /* lpinfo.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = lpinfo.c; path = ../systemv/lpinfo.c; sourceTree = "<group>"; };
@@ -3246,8 +3192,6 @@
 		276683D41337B237000D33D0 /* ppdpo.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ppdpo.cxx; path = ../ppdc/ppdpo.cxx; sourceTree = "<group>"; };
 		276683F01337F78E000D33D0 /* ipptool */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = ipptool; sourceTree = BUILT_PRODUCTS_DIR; };
 		276683F91337F7A9000D33D0 /* ipptool.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ipptool.c; path = ../test/ipptool.c; sourceTree = "<group>"; };
-		276684041337FA1D000D33D0 /* cupsaddsmb */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = cupsaddsmb; sourceTree = BUILT_PRODUCTS_DIR; };
-		276684101337FA7C000D33D0 /* cupsaddsmb.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = cupsaddsmb.c; path = ../systemv/cupsaddsmb.c; sourceTree = "<group>"; };
 		2767FC5019266A0D000F61D3 /* testdest */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = testdest; sourceTree = BUILT_PRODUCTS_DIR; };
 		2767FC5119266A36000F61D3 /* testdest.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = testdest.c; path = ../cups/testdest.c; sourceTree = "<group>"; };
 		2767FC591926750C000F61D3 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; };
@@ -3634,14 +3578,6 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		271285001CC1265D00E517C7 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				271285011CC1265D00E517C7 /* libcups.dylib in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		2712850D1CC1267A00E517C7 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
@@ -4070,14 +4006,6 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		276684011337FA1D000D33D0 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				2766840F1337FA38000D33D0 /* libcups.dylib in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		2767FC4B19266A0D000F61D3 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
@@ -4732,10 +4660,8 @@
 			children = (
 				2732E089137A3F5200FAFEF6 /* cancel.c */,
 				2732E08A137A3F5200FAFEF6 /* cupsaccept.c */,
-				276684101337FA7C000D33D0 /* cupsaddsmb.c */,
 				276683681337AA00000D33D0 /* cupsctl.c */,
 				274FF68713333B6E00317ECB /* cupsfilter.c */,
-				2732E08B137A3F5200FAFEF6 /* cupstestdsc.c */,
 				72F75A5B1336F988004BB496 /* cupstestppd.c */,
 				72CF95F218A19165000FCAE4 /* ippfind.c */,
 				726AD701135E8A90002C930D /* ippserver.c */,
@@ -4791,7 +4717,6 @@
 				276683971337ACA2000D33D0 /* ppdmerge */,
 				276683A41337ACAB000D33D0 /* ppdpo */,
 				276683F01337F78E000D33D0 /* ipptool */,
-				276684041337FA1D000D33D0 /* cupsaddsmb */,
 				7258EAE2134594C4009286F1 /* rastertopwg */,
 				720DD6C21358FD5F0064AA82 /* snmp */,
 				270CCDA7135E3C9E00007BE2 /* testmime */,
@@ -4833,7 +4758,6 @@
 				724FA76B1CC03AF60092477B /* libcupscgi_static.a */,
 				271284EC1CC1261900E517C7 /* cancel */,
 				271284F91CC1264B00E517C7 /* cupsaccept */,
-				271285061CC1265D00E517C7 /* cupstestdsc */,
 				271285131CC1267A00E517C7 /* lp */,
 				271285201CC1269700E517C7 /* lpc */,
 				2712852D1CC126AA00E517C7 /* lpinfo */,
@@ -5503,24 +5427,6 @@
 			productReference = 271284F91CC1264B00E517C7 /* cupsaccept */;
 			productType = "com.apple.product-type.tool";
 		};
-		271284FB1CC1265D00E517C7 /* cupstestdsc */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 271285031CC1265D00E517C7 /* Build configuration list for PBXNativeTarget "cupstestdsc" */;
-			buildPhases = (
-				271284FE1CC1265D00E517C7 /* Sources */,
-				271285001CC1265D00E517C7 /* Frameworks */,
-				271285021CC1265D00E517C7 /* CopyFiles */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-				271284FC1CC1265D00E517C7 /* PBXTargetDependency */,
-			);
-			name = cupstestdsc;
-			productName = cupsaddsmb;
-			productReference = 271285061CC1265D00E517C7 /* cupstestdsc */;
-			productType = "com.apple.product-type.tool";
-		};
 		271285081CC1267A00E517C7 /* lp */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = 271285101CC1267A00E517C7 /* Build configuration list for PBXNativeTarget "lp" */;
@@ -6337,24 +6243,6 @@
 			productReference = 276683F01337F78E000D33D0 /* ipptool */;
 			productType = "com.apple.product-type.tool";
 		};
-		276684031337FA1D000D33D0 /* cupsaddsmb */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 2766840A1337FA1E000D33D0 /* Build configuration list for PBXNativeTarget "cupsaddsmb" */;
-			buildPhases = (
-				276684001337FA1D000D33D0 /* Sources */,
-				276684011337FA1D000D33D0 /* Frameworks */,
-				276684021337FA1D000D33D0 /* CopyFiles */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-				2766840E1337FA31000D33D0 /* PBXTargetDependency */,
-			);
-			name = cupsaddsmb;
-			productName = cupsaddsmb;
-			productReference = 276684041337FA1D000D33D0 /* cupsaddsmb */;
-			productType = "com.apple.product-type.tool";
-		};
 		2767FC4619266A0D000F61D3 /* testdest */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = 2767FC4D19266A0D000F61D3 /* Build configuration list for PBXNativeTarget "testdest" */;
@@ -7251,7 +7139,6 @@
 				271286871CC13DC000E517C7 /* checkpo */,
 				271285A31CC12D3A00E517C7 /* classes.cgi */,
 				271285CD1CC12DBF00E517C7 /* commandtops */,
-				276684031337FA1D000D33D0 /* cupsaddsmb */,
 				271284EE1CC1264B00E517C7 /* cupsaccept */,
 				2766835B1337A9B6000D33D0 /* cupsctl */,
 				72220F5A13330A5A00FCA411 /* cupsd */,
@@ -7260,7 +7147,6 @@
 				274FF63D1333358B00317ECB /* cups-exec */,
 				274FF64E133339C400317ECB /* cups-lpd */,
 				274FF67713333B2F00317ECB /* cupsfilter */,
-				271284FB1CC1265D00E517C7 /* cupstestdsc */,
 				72F75A511336F950004BB496 /* cupstestppd */,
 				724379461333FEA9009631B9 /* dnssd */,
 				2712871E1CC140BE00E517C7 /* genstrings */,
@@ -7415,14 +7301,6 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		271284FE1CC1265D00E517C7 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				271285071CC1267400E517C7 /* cupstestdsc.c in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		2712850B1CC1267A00E517C7 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -7862,14 +7740,6 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		276684001337FA1D000D33D0 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				276684111337FA7C000D33D0 /* cupsaddsmb.c in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		2767FC4919266A0D000F61D3 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -8579,11 +8449,6 @@
 			target = 72220EAD1333047D00FCA411 /* libcups */;
 			targetProxy = 271284F01CC1264B00E517C7 /* PBXContainerItemProxy */;
 		};
-		271284FC1CC1265D00E517C7 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 72220EAD1333047D00FCA411 /* libcups */;
-			targetProxy = 271284FD1CC1265D00E517C7 /* PBXContainerItemProxy */;
-		};
 		271285091CC1267A00E517C7 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = 72220EAD1333047D00FCA411 /* libcups */;
@@ -8639,11 +8504,6 @@
 			target = 271284EE1CC1264B00E517C7 /* cupsaccept */;
 			targetProxy = 2712857F1CC1295A00E517C7 /* PBXContainerItemProxy */;
 		};
-		271285821CC1295A00E517C7 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 271284FB1CC1265D00E517C7 /* cupstestdsc */;
-			targetProxy = 271285811CC1295A00E517C7 /* PBXContainerItemProxy */;
-		};
 		271285841CC1295A00E517C7 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = 271285081CC1267A00E517C7 /* lp */;
@@ -9089,16 +8949,6 @@
 			target = 276683EF1337F78E000D33D0 /* ipptool */;
 			targetProxy = 276683FE1337F7C5000D33D0 /* PBXContainerItemProxy */;
 		};
-		2766840E1337FA31000D33D0 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 72220EAD1333047D00FCA411 /* libcups */;
-			targetProxy = 2766840D1337FA31000D33D0 /* PBXContainerItemProxy */;
-		};
-		276684131337FA8D000D33D0 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 276684031337FA1D000D33D0 /* cupsaddsmb */;
-			targetProxy = 276684121337FA8D000D33D0 /* PBXContainerItemProxy */;
-		};
 		2767FC4719266A0D000F61D3 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = 274FF6891333B1C400317ECB /* libcups_static */;
@@ -9515,24 +9365,6 @@
 			};
 			name = Release;
 		};
-		271285041CC1265D00E517C7 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CLANG_ENABLE_OBJC_WEAK = YES;
-				INSTALL_PATH = /usr/bin;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-			};
-			name = Debug;
-		};
-		271285051CC1265D00E517C7 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CLANG_ENABLE_OBJC_WEAK = YES;
-				INSTALL_PATH = /usr/bin;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-			};
-			name = Release;
-		};
 		271285111CC1267A00E517C7 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -10383,24 +10215,6 @@
 			};
 			name = Release;
 		};
-		2766840B1337FA1E000D33D0 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CLANG_ENABLE_OBJC_WEAK = YES;
-				INSTALL_PATH = /usr/sbin;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-			};
-			name = Debug;
-		};
-		2766840C1337FA1E000D33D0 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CLANG_ENABLE_OBJC_WEAK = YES;
-				INSTALL_PATH = /usr/sbin;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-			};
-			name = Release;
-		};
 		2767FC4E19266A0D000F61D3 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -11450,15 +11264,6 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		271285031CC1265D00E517C7 /* Build configuration list for PBXNativeTarget "cupstestdsc" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				271285041CC1265D00E517C7 /* Debug */,
-				271285051CC1265D00E517C7 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
 		271285101CC1267A00E517C7 /* Build configuration list for PBXNativeTarget "lp" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
@@ -11882,15 +11687,6 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		2766840A1337FA1E000D33D0 /* Build configuration list for PBXNativeTarget "cupsaddsmb" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				2766840B1337FA1E000D33D0 /* Debug */,
-				2766840C1337FA1E000D33D0 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
 		2767FC4D19266A0D000F61D3 /* Build configuration list for PBXNativeTarget "testdest" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
diff --git a/xcode/config.h b/xcode/config.h
index 6358e0a34..4fc686566 100644
--- a/xcode/config.h
+++ b/xcode/config.h
@@ -327,14 +327,9 @@
 #  define HAVE_AUTHORIZATION_H 1
 #endif /* !TARGET_OS_IOS */
 
-/* #undef HAVE_SECBASEPRIV_H */
 #define HAVE_SECCERTIFICATE_H 1
-/* #undef HAVE_SECIDENTITYSEARCHPRIV_H */
 #define HAVE_SECITEM_H 1
-/* #undef HAVE_SECITEMPRIV_H */
 #define HAVE_SECPOLICY_H 1
-/* #undef HAVE_SECPOLICYPRIV_H */
-/* #undef HAVE_SECURETRANSPORTPRIV_H */
 
 
 /*
@@ -488,12 +483,10 @@
 
 
 /*
- * Do we have CoreFoundation public and private headers?
+ * Do we have CoreFoundation public headers?
  */
 
 #define HAVE_COREFOUNDATION_H 1
-/* #undef HAVE_CFPRIV_H */
-/* #undef HAVE_CFBUNDLEPRIV_H */
 
 
 /*
@@ -526,7 +519,6 @@
  */
 
 #define HAVE_MEMBERSHIP_H 1
-/* #undef HAVE_MEMBERSHIPPRIV_H */
 #define HAVE_MBR_UID_TO_UUID 1
 
 
@@ -685,14 +677,6 @@
  */
 
 #define HAVE_XPC 1
-/* #undef HAVE_XPC_PRIVATE_H */
-
-
-/*
- * Do we have Mini-XML?
- */
-
-/* #undef HAVE_MXML_H */
 
 
 /*