rpms/cups
7
0
Fork 0
Code Issues Pull Requests Releases Activity

fixing issue with #1437065 - makes res_init() call to local resolver and keeps error message, but no hard exit for cupsd

Browse Source
This commit is contained in:
Zdenek Dohnal 2017-04-05 21:36:46 +02:00
commit 06a5e3cbfe
2 changed files with 33 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
cups-resolv_reload.patch
View File

@ -1,6 +1,6 @@
diff -up cups-2.2.0/cups/auth.c.resolv_reload cups-2.2.0/cups/auth.c diff -up cups-2.2.0/cups/auth.c.resolv_reload cups-2.2.0/cups/auth.c
--- cups-2.2.0/cups/auth.c.resolv_reload 2016-09-14 01:39:47.000000000 +0200 --- cups-2.2.0/cups/auth.c.resolv_reload 2016-09-14 01:39:47.000000000 +0200
+++ cups-2.2.0/cups/auth.c 2017-03-30 13:08:06.436258996 +0200 +++ cups-2.2.0/cups/auth.c 2017-04-05 19:26:04.525464662 +0200
@@ -519,6 +519,16 @@ cups_gss_getname( @@ -519,6 +519,16 @@ cups_gss_getname(
DEBUG_printf(("7cups_gss_getname(http=%p, service_name=\"%s\")", http, DEBUG_printf(("7cups_gss_getname(http=%p, service_name=\"%s\")", http,
service_name)); service_name));
@ -19,8 +19,8 @@ diff -up cups-2.2.0/cups/auth.c.resolv_reload cups-2.2.0/cups/auth.c
/* /*
* Get the hostname... * Get the hostname...
diff -up cups-2.2.0/cups/http-addr.c.resolv_reload cups-2.2.0/cups/http-addr.c diff -up cups-2.2.0/cups/http-addr.c.resolv_reload cups-2.2.0/cups/http-addr.c
--- cups-2.2.0/cups/http-addr.c.resolv_reload 2017-03-30 13:08:06.422259148 +0200 --- cups-2.2.0/cups/http-addr.c.resolv_reload 2017-04-05 19:26:04.513464779 +0200
+++ cups-2.2.0/cups/http-addr.c 2017-03-30 13:08:06.436258996 +0200 +++ cups-2.2.0/cups/http-addr.c 2017-04-05 19:26:04.526464653 +0200
@@ -361,6 +361,17 @@ httpAddrLookup( @@ -361,6 +361,17 @@ httpAddrLookup(
#ifdef HAVE_RES_INIT #ifdef HAVE_RES_INIT
@ -40,8 +40,8 @@ diff -up cups-2.2.0/cups/http-addr.c.resolv_reload cups-2.2.0/cups/http-addr.c
* *
* If the previous lookup failed, re-initialize the resolver to prevent * If the previous lookup failed, re-initialize the resolver to prevent
diff -up cups-2.2.0/cups/http-addrlist.c.resolv_reload cups-2.2.0/cups/http-addrlist.c diff -up cups-2.2.0/cups/http-addrlist.c.resolv_reload cups-2.2.0/cups/http-addrlist.c
--- cups-2.2.0/cups/http-addrlist.c.resolv_reload 2017-03-30 13:08:06.434259017 +0200 --- cups-2.2.0/cups/http-addrlist.c.resolv_reload 2017-04-05 19:26:04.524464672 +0200
+++ cups-2.2.0/cups/http-addrlist.c 2017-03-30 13:08:06.436258996 +0200 +++ cups-2.2.0/cups/http-addrlist.c 2017-04-05 19:26:04.526464653 +0200
@@ -483,6 +483,17 @@ httpAddrGetList(const char *hostname, /* @@ -483,6 +483,17 @@ httpAddrGetList(const char *hostname, /*
#ifdef HAVE_RES_INIT #ifdef HAVE_RES_INIT
@ -62,7 +62,7 @@ diff -up cups-2.2.0/cups/http-addrlist.c.resolv_reload cups-2.2.0/cups/http-addr
* If the previous lookup failed, re-initialize the resolver to prevent * If the previous lookup failed, re-initialize the resolver to prevent
diff -up cups-2.2.0/cups/http.c.resolv_reload cups-2.2.0/cups/http.c diff -up cups-2.2.0/cups/http.c.resolv_reload cups-2.2.0/cups/http.c
--- cups-2.2.0/cups/http.c.resolv_reload 2016-09-14 01:39:47.000000000 +0200 --- cups-2.2.0/cups/http.c.resolv_reload 2016-09-14 01:39:47.000000000 +0200
+++ cups-2.2.0/cups/http.c 2017-03-30 13:12:38.411379288 +0200 +++ cups-2.2.0/cups/http.c 2017-04-05 19:28:20.601146820 +0200
@@ -107,6 +107,9 @@ static const char * const http_fields[] @@ -107,6 +107,9 @@ static const char * const http_fields[]
"Allow", "Allow",
"Server" "Server"
@ -73,7 +73,7 @@ diff -up cups-2.2.0/cups/http.c.resolv_reload cups-2.2.0/cups/http.c
/* /*
@@ -4811,3 +4814,34 @@ http_write_chunk(http_t *http, /* I @@ -4811,3 +4814,44 @@ http_write_chunk(http_t *http, /* I
return (bytes); return (bytes);
} }
@ -82,6 +82,8 @@ diff -up cups-2.2.0/cups/http.c.resolv_reload cups-2.2.0/cups/http.c
+/* +/*
+ * Function to check modification time of resolv.conf. + * Function to check modification time of resolv.conf.
+ * If time is changed, it reloads resolver. + * If time is changed, it reloads resolver.
+ * If /etc/resolv.conf doesn't exist, it tries to reload local resolver.
+ * If even reloading local resolver doesn't work, it ends with error.
+ */ + */
+ +
+http_resolv_check_t +http_resolv_check_t
@ -92,6 +94,14 @@ diff -up cups-2.2.0/cups/http.c.resolv_reload cups-2.2.0/cups/http.c
+ +
+ status = stat(HTTP_RESOLV_CONF_PATH, &resolv_conf_status); + status = stat(HTTP_RESOLV_CONF_PATH, &resolv_conf_status);
+ +
+ /* /etc/resolv.conf couldn't be stated because it doesn't exist, try resolver on localhost */
+ if (status == HTTP_RESOLV_CHECK_ERROR && errno == ENOENT)
+ {
+ status = res_init();
+ return (status);
+ }
+
+ /* If stat ends with different errno, return status */
+ if (status == HTTP_RESOLV_CHECK_ERROR) + if (status == HTTP_RESOLV_CHECK_ERROR)
+ return (status); + return (status);
+ +
@ -110,7 +120,7 @@ diff -up cups-2.2.0/cups/http.c.resolv_reload cups-2.2.0/cups/http.c
+ +
diff -up cups-2.2.0/cups/http.h.resolv_reload cups-2.2.0/cups/http.h diff -up cups-2.2.0/cups/http.h.resolv_reload cups-2.2.0/cups/http.h
--- cups-2.2.0/cups/http.h.resolv_reload 2016-09-14 01:39:47.000000000 +0200 --- cups-2.2.0/cups/http.h.resolv_reload 2016-09-14 01:39:47.000000000 +0200
+++ cups-2.2.0/cups/http.h 2017-03-30 13:08:06.437258985 +0200 +++ cups-2.2.0/cups/http.h 2017-04-05 19:26:04.526464653 +0200
@@ -55,6 +55,12 @@ typedef off_t ssize_t; /* @private@ */ @@ -55,6 +55,12 @@ typedef off_t ssize_t; /* @private@ */
# define SO_PEERCRED LOCAL_PEERCRED # define SO_PEERCRED LOCAL_PEERCRED
# endif /* LOCAL_PEERCRED && !SO_PEERCRED */ # endif /* LOCAL_PEERCRED && !SO_PEERCRED */
@ -177,8 +187,8 @@ diff -up cups-2.2.0/cups/http.h.resolv_reload cups-2.2.0/cups/http.h
* C++ magic... * C++ magic...
*/ */
diff -up cups-2.2.0/cups/http-support.c.resolv_reload cups-2.2.0/cups/http-support.c diff -up cups-2.2.0/cups/http-support.c.resolv_reload cups-2.2.0/cups/http-support.c
--- cups-2.2.0/cups/http-support.c.resolv_reload 2017-03-30 13:08:06.437258985 +0200 --- cups-2.2.0/cups/http-support.c.resolv_reload 2017-04-05 19:26:04.509464817 +0200
+++ cups-2.2.0/cups/http-support.c 2017-03-30 13:19:01.559533564 +0200 +++ cups-2.2.0/cups/http-support.c 2017-04-05 19:26:04.527464643 +0200
@@ -2258,6 +2258,16 @@ http_resolve_cb( @@ -2258,6 +2258,16 @@ http_resolve_cb(
http_addrlist_t *addrlist, /* List of addresses */ http_addrlist_t *addrlist, /* List of addresses */
*addr; /* Current address */ *addr; /* Current address */
@ -197,8 +207,8 @@ diff -up cups-2.2.0/cups/http-support.c.resolv_reload cups-2.2.0/cups/http-suppo
snprintf(fqdn, sizeof(fqdn), "%d", ntohs(port)); snprintf(fqdn, sizeof(fqdn), "%d", ntohs(port));
diff -up cups-2.2.0/scheduler/conf.c.resolv_reload cups-2.2.0/scheduler/conf.c diff -up cups-2.2.0/scheduler/conf.c.resolv_reload cups-2.2.0/scheduler/conf.c
--- cups-2.2.0/scheduler/conf.c.resolv_reload 2017-03-30 13:08:06.433259028 +0200 --- cups-2.2.0/scheduler/conf.c.resolv_reload 2017-04-05 19:26:04.523464682 +0200
+++ cups-2.2.0/scheduler/conf.c 2017-03-30 13:08:06.439258963 +0200 +++ cups-2.2.0/scheduler/conf.c 2017-04-05 19:26:04.527464643 +0200
@@ -937,6 +937,12 @@ cupsdReadConfiguration(void) @@ -937,6 +937,12 @@ cupsdReadConfiguration(void)
if (!RemotePort) if (!RemotePort)
BrowseLocalProtocols = 0; /* Disable sharing - no remote access */ BrowseLocalProtocols = 0; /* Disable sharing - no remote access */
@ -213,9 +223,9 @@ diff -up cups-2.2.0/scheduler/conf.c.resolv_reload cups-2.2.0/scheduler/conf.c
* See if the ServerName is an IP address... * See if the ServerName is an IP address...
*/ */
diff -up cups-2.2.0/scheduler/main.c.resolv_reload cups-2.2.0/scheduler/main.c diff -up cups-2.2.0/scheduler/main.c.resolv_reload cups-2.2.0/scheduler/main.c
--- cups-2.2.0/scheduler/main.c.resolv_reload 2017-03-30 13:08:06.440258952 +0200 --- cups-2.2.0/scheduler/main.c.resolv_reload 2017-04-05 19:26:04.518464730 +0200
+++ cups-2.2.0/scheduler/main.c 2017-03-30 13:23:38.886665663 +0200 +++ cups-2.2.0/scheduler/main.c 2017-04-05 19:26:04.528464633 +0200
@@ -136,6 +136,17 @@ main(int argc, /* I - Number of comm @@ -136,6 +136,14 @@ main(int argc, /* I - Number of comm
long tmo_delay; /* Time before it must be called */ long tmo_delay; /* Time before it must be called */
#endif /* HAVE_AVAHI */ #endif /* HAVE_AVAHI */
@ -224,10 +234,7 @@ diff -up cups-2.2.0/scheduler/main.c.resolv_reload cups-2.2.0/scheduler/main.c
+ +
+ status = httpCheckResolv(); + status = httpCheckResolv();
+ if (status == HTTP_RESOLV_CHECK_ERROR) + if (status == HTTP_RESOLV_CHECK_ERROR)
+ { + fputs("cupsd: Cannot reload a resolver, using old configuration now.\n", stderr);
+ fputs("cupsd: Cannot get a status of /etc/resolv.conf\n", stderr);
+ return (1);
+ }
+#endif /* HAVE_RES_INIT */ +#endif /* HAVE_RES_INIT */
+ +
#ifdef HAVE_GETEUID #ifdef HAVE_GETEUID

9
cups.spec
View File

@ -15,7 +15,7 @@ Summary: CUPS printing system
Name: cups Name: cups
Epoch: 1 Epoch: 1
Version: 2.2.2 Version: 2.2.2
Release: 4%{?dist} Release: 5%{?dist}
License: GPLv2 License: GPLv2
Url: http://www.cups.org/ Url: http://www.cups.org/
Source0: https://github.com/apple/cups/releases/download/v%{VERSION}/cups-%{VERSION}-source.tar.gz Source0: https://github.com/apple/cups/releases/download/v%{VERSION}/cups-%{VERSION}-source.tar.gz
@ -62,7 +62,7 @@ Patch34: cups-avahi-no-threaded.patch
Patch35: cups-ipp-multifile.patch Patch35: cups-ipp-multifile.patch
Patch36: cups-web-devices-timeout.patch Patch36: cups-web-devices-timeout.patch
Patch37: cups-synconclose.patch Patch37: cups-synconclose.patch
#Patch38: cups-resolv_reload.patch Patch38: cups-resolv_reload.patch
Patch100: cups-lspp.patch Patch100: cups-lspp.patch
@ -257,7 +257,7 @@ Sends IPP requests to the specified URI and tests and/or displays the results.
# Set the default for SyncOnClose to Yes. # Set the default for SyncOnClose to Yes.
%patch37 -p1 -b .synconclose %patch37 -p1 -b .synconclose
# CUPS does not recognize changes to /etc/resolv.conf until CUPS restart (bug #1437065) # CUPS does not recognize changes to /etc/resolv.conf until CUPS restart (bug #1437065)
#%%patch38 -p1 -b .resolv_reload %patch38 -p1 -b .resolv_reload
%if %{lspp} %if %{lspp}
# LSPP support. # LSPP support.
@ -623,6 +623,9 @@ rm -f %{cups_serverbin}/backend/smb
%{_mandir}/man5/ipptoolfile.5.gz %{_mandir}/man5/ipptoolfile.5.gz
%changelog %changelog
* Wed Apr 05 2017 Zdenek Dohnal <zdohnal@redhat.com> - 1:2.2.2-5
- fixing issue with #1437065 - makes res_init() call to local resolver and keeps error message, but no hard exit for cupsd
* Tue Apr 04 2017 Zdenek Dohnal <zdohnal@redhat.com> - 1:2.2.2-4 * Tue Apr 04 2017 Zdenek Dohnal <zdohnal@redhat.com> - 1:2.2.2-4
- disable patch for #1437065 for now until issue with stat is solved - disable patch for #1437065 for now until issue with stat is solved