87 lines
2.5 KiB
Diff
87 lines
2.5 KiB
Diff
diff --git a/cups/http-addr.c b/cups/http-addr.c
|
|
index 61c86384b..e86dcb622 100644
|
|
--- a/cups/http-addr.c
|
|
+++ b/cups/http-addr.c
|
|
@@ -198,31 +198,29 @@ httpAddrListen(http_addr_t *addr, /* I - Address to bind to */
|
|
{
|
|
mode_t mask; /* Umask setting */
|
|
|
|
- /*
|
|
- * Remove any existing domain socket file...
|
|
- */
|
|
-
|
|
- unlink(addr->un.sun_path);
|
|
-
|
|
- /*
|
|
- * Save the current umask and set it to 0 so that all users can access
|
|
- * the domain socket...
|
|
- */
|
|
-
|
|
- mask = umask(0);
|
|
-
|
|
- /*
|
|
- * Bind the domain socket...
|
|
- */
|
|
+ // Remove any existing domain socket file...
|
|
+ if ((status = unlink(addr->un.sun_path)) < 0)
|
|
+ {
|
|
+ DEBUG_printf(("1httpAddrListen: Unable to unlink \"%s\": %s", addr->un.sun_path, strerror(errno)));
|
|
+ if (errno == ENOENT)
|
|
+ status = 0;
|
|
+ }
|
|
|
|
- status = bind(fd, (struct sockaddr *)addr, (socklen_t)httpAddrLength(addr));
|
|
+ if (!status)
|
|
+ {
|
|
+ // Save the current umask and set it to 0 so that all users can access
|
|
+ // the domain socket...
|
|
+ mask = umask(0);
|
|
|
|
- /*
|
|
- * Restore the umask and fix permissions...
|
|
- */
|
|
+ // Bind the domain socket...
|
|
+ if ((status = bind(fd, (struct sockaddr *)addr, (socklen_t)httpAddrLength(addr))) < 0)
|
|
+ {
|
|
+ DEBUG_printf(("1httpAddrListen: Unable to bind domain socket \"%s\": %s", addr->un.sun_path, strerror(errno)));
|
|
+ }
|
|
|
|
- umask(mask);
|
|
- chmod(addr->un.sun_path, 0140777);
|
|
+ // Restore the umask...
|
|
+ umask(mask);
|
|
+ }
|
|
}
|
|
else
|
|
#endif /* AF_LOCAL */
|
|
diff --git a/scheduler/conf.c b/scheduler/conf.c
|
|
index bc52d2add..93de8cf77 100644
|
|
--- a/scheduler/conf.c
|
|
+++ b/scheduler/conf.c
|
|
@@ -3055,6 +3055,25 @@ read_cupsd_conf(cups_file_t *fp) /* I - File to read from */
|
|
|
|
cupsd_listener_t *lis; /* New listeners array */
|
|
|
|
+ /*
|
|
+ * If we are launched on-demand, do not use domain sockets from the config
|
|
+ * file. Also check that the domain socket path is not too long...
|
|
+ */
|
|
+
|
|
+#ifdef HAVE_ONDEMAND
|
|
+ if (*value == '/' && OnDemand)
|
|
+ {
|
|
+ if (strcmp(value, CUPS_DEFAULT_DOMAINSOCKET))
|
|
+ cupsdLogMessage(CUPSD_LOG_INFO, "Ignoring %s address %s at line %d - only using domain socket from launchd/systemd.", line, value, linenum);
|
|
+ continue;
|
|
+ }
|
|
+#endif // HAVE_ONDEMAND
|
|
+
|
|
+ if (*value == '/' && strlen(value) > (sizeof(addr->addr.un.sun_path) - 1))
|
|
+ {
|
|
+ cupsdLogMessage(CUPSD_LOG_INFO, "Ignoring %s address %s at line %d - too long.", line, value, linenum);
|
|
+ continue;
|
|
+ }
|
|
|
|
/*
|
|
* Get the address list...
|