From: Michael R Sweet <msweet@msweet.org>
Date: Sat, 14 Nov 2020 13:47:43 +0000 (-0500)
Subject: Don't log errors when IPv6 listeners fail because IPv6 is disabled (Issue #25)
X-Git-Tag: v2.3.3op1~29
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1476b03a4b9064c90904b297ec977b17ec30c1b1;p=thirdparty%2Fcups.git

Don't log errors when IPv6 listeners fail because IPv6 is disabled (Issue #25)
---

diff --git a/CHANGES-OPENPRINTING.md b/CHANGES-OPENPRINTING.md
index dbe3e93408..9876ea6536 100644
--- a/CHANGES-OPENPRINTING.md
+++ b/CHANGES-OPENPRINTING.md
@@ -17,6 +17,8 @@ Changes in CUPS v2.3.3op1
   (Issue #5)
 - The scheduler now allows root backends to have world read permissions but not
   world execute permissions (Issue #21)
+- Failures to bind IPv6 listener sockets no longer cause errors if IPv6 is
+  disabled on the host (Issue #25)
 - The SNMP backend now supports the HP and Ricoh vendor MIBs (Issue #28)
 - The scheduler no longer includes a timestamp in files it writes (Issue #29)
 - The systemd service names are now "cups.service" and "cups-lpd.service"
diff --git a/scheduler/listen.c b/scheduler/listen.c
index 92c7c626b1..dbf959b25a 100644
--- a/scheduler/listen.c
+++ b/scheduler/listen.c
@@ -160,7 +160,7 @@ cupsdStartListening(void)
 
       if (lis->fd == -1)
       {
-	cupsdLogMessage(CUPSD_LOG_ERROR,
+	cupsdLogMessage(errno == EAFNOSUPPORT ? CUPSD_LOG_INFO : CUPSD_LOG_ERROR,
 			"Unable to open listen socket for address %s:%d - %s.",
 			s, p, strerror(errno));