Fix domain socket support on Linux (STR #4679)

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@12817 a1ca3aef-8c08-0410-bb20-df032aa958be

diff --git a/CHANGES.txt b/CHANGES.txt
index b7be79bc7d71b71441d8d14228a74e585e4aa099..d2be290088c854bc593f36f7413336bc6375c098 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,6 +7,7 @@ CHANGES IN CUPS V2.1rc1
          based on PWG white paper.
        - Fixed bugs in the new journald support (STR #4655, STR #4658,
          STR #4661)
+       - Fixed domain socket support on Linux (STR #4679)
        - Configure script changes for systemd support (STR #4669)
        - Updated autoconf sources to use newer form of AC_INIT (STR #4664)
 

diff --git a/cups/usersys.c b/cups/usersys.c
index 4273df7151e8943dfe2acc1dd241c477b1317797..6fb8670a5c99a9f7a839cd2b690c6ed22ea7ada2 100644 (file)
--- a/cups/usersys.c
+++ b/cups/usersys.c
@@ -1012,7 +1012,7 @@ cups_finalize_client_conf(
     struct stat        sockinfo;               /* Domain socket information */
 
     if (!stat(CUPS_DEFAULT_DOMAINSOCKET, &sockinfo) &&
-       (sockinfo.st_mode & S_IRWXO) == S_IRWXO)
+       (sockinfo.st_mode & (S_IROTH | S_IWOTH)) == (S_IROTH | S_IWOTH))
       cups_set_server_name(cc, CUPS_DEFAULT_DOMAINSOCKET);
     else
 #endif /* CUPS_DEFAULT_DOMAINSOCKET */