53 lines
1.2 KiB
Diff
53 lines
1.2 KiB
Diff
|
From 6131f6a73c188f3db0ec94ae488991ce80cfd7ea Mon Sep 17 00:00:00 2001
|
||
|
|
From: Michael R Sweet <msweet@msweet.org>
|
||
|
|
Date: Fri, 14 Jun 2024 15:10:21 -0400
|
||
|
|
Subject: [PATCH] Don't abort early if there are no listen sockets after
|
||
|
|
loading cupsd.conf (Issue #985)
|
||
|
|
|
||
|
|
---
|
||
|
|
scheduler/conf.c | 2 +-
|
||
|
|
scheduler/main.c | 17 +++++++++++++++++
|
||
|
|
2 files changed, 18 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/scheduler/conf.c b/scheduler/conf.c
|
||
|
|
index ebf8ca8ccd..34b30e56d1 100644
|
||
|
|
--- a/scheduler/conf.c
|
||
|
|
+++ b/scheduler/conf.c
|
||
|
|
@@ -1048,7 +1048,7 @@ cupsdReadConfiguration(void)
|
||
|
|
* as an error and exit!
|
||
|
|
*/
|
||
|
|
|
||
|
|
- if (cupsArrayCount(Listeners) == 0)
|
||
|
|
+ if (cupsArrayCount(Listeners) == 0 && !OnDemand)
|
||
|
|
{
|
||
|
|
/*
|
||
|
|
* No listeners!
|
||
|
|
diff --git a/scheduler/main.c b/scheduler/main.c
|
||
|
|
index 4472863081..70f3159df6 100644
|
||
|
|
--- a/scheduler/main.c
|
||
|
|
+++ b/scheduler/main.c
|
||
|
|
@@ -2036,6 +2036,23 @@ service_checkin(void)
|
||
|
|
service_add_listener(fd, 0);
|
||
|
|
}
|
||
|
|
#endif /* HAVE_LAUNCHD */
|
||
|
|
+
|
||
|
|
+ if (cupsArrayCount(Listeners) == 0)
|
||
|
|
+ {
|
||
|
|
+ /*
|
||
|
|
+ * No listeners!
|
||
|
|
+ */
|
||
|
|
+
|
||
|
|
+ cupsdLogMessage(CUPSD_LOG_EMERG,
|
||
|
|
+ "No valid Listen or Port lines were found in the "
|
||
|
|
+ "configuration file.");
|
||
|
|
+
|
||
|
|
+ /*
|
||
|
|
+ * Commit suicide...
|
||
|
|
+ */
|
||
|
|
+
|
||
|
|
+ cupsdEndProcess(getpid(), 0);
|
||
|
|
+ }
|
||
|
|
}
|
||
|
|
|
||
|
|
|