From: Michael R Sweet Date: Thu, 21 Mar 2019 22:28:41 +0000 (-0400) Subject: One more spot needs attention. X-Git-Tag: v2.3b8~77 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9e24f768b9051731c70c64eb931ebcffbaae4577;hp=cdb2e72460253a318e2c62edf7618b578bf5fee0;p=thirdparty%2Fcups.git One more spot needs attention. --- diff --git a/cups/usersys.c b/cups/usersys.c index 4a65236e5..6b2833766 100644 --- a/cups/usersys.c +++ b/cups/usersys.c @@ -1137,17 +1137,22 @@ cups_finalize_client_conf( if (!cc->server_name[0]) { -#ifdef CUPS_DEFAULT_DOMAINSOCKET /* * If we are compiled with domain socket support, only use the * domain socket if it exists and has the right permissions... */ +#if defined(__APPLE__) && !TARGET_OS_OSX + cups_set_server_name(cc, "/private/var/run/printd"); + +#else +# ifdef CUPS_DEFAULT_DOMAINSOCKET if (!access(CUPS_DEFAULT_DOMAINSOCKET, R_OK)) cups_set_server_name(cc, CUPS_DEFAULT_DOMAINSOCKET); else -#endif /* CUPS_DEFAULT_DOMAINSOCKET */ - cups_set_server_name(cc, "localhost"); +# endif /* CUPS_DEFAULT_DOMAINSOCKET */ + cups_set_server_name(cc, "localhost"); +#endif /* __APPLE__ && !TARGET_OS_OSX */ } if (!cc->user[0])