Blame SOURCES/cups-1.6.3-resolv_reload.patch

5e7041
diff -up cups-1.6.3/cups/auth.c.resolv_reload cups-1.6.3/cups/auth.c
5e7041
--- cups-1.6.3/cups/auth.c.resolv_reload	2013-06-07 03:12:52.000000000 +0200
5e7041
+++ cups-1.6.3/cups/auth.c	2017-04-07 13:34:55.224510840 +0200
5e7041
@@ -527,6 +527,18 @@ cups_gss_getname(
5e7041
   DEBUG_printf(("7cups_gss_getname(http=%p, service_name=\"%s\")", http,
5e7041
                 service_name));
5e7041
 
5e7041
+#ifdef HAVE_RES_INIT
5e7041
+ /*
5e7041
+  * Check if /etc/resolv.conf is modified.
5e7041
+  * If so, reload resolver.
5e7041
+  */
5e7041
+
5e7041
+  dns_resolver_reload_rv retval;
5e7041
+
5e7041
+  retval = dnsReloadResolver();
5e7041
+  if (retval.status == DNS_RESOLVER_RELOAD_ERROR)
5e7041
+    DEBUG_printf(("1cups_gss_getname: dnsReloadResolver() failed - %s.", strerror(retval.errnum)));
5e7041
+#endif /* HAVE_RES_INIT */
5e7041
 
5e7041
  /*
5e7041
   * Get the hostname...
5e7041
diff -up cups-1.6.3/cups/http-addr.c.resolv_reload cups-1.6.3/cups/http-addr.c
5e7041
--- cups-1.6.3/cups/http-addr.c.resolv_reload	2017-04-07 13:34:55.112511816 +0200
5e7041
+++ cups-1.6.3/cups/http-addr.c	2017-04-07 13:34:55.224510840 +0200
5e7041
@@ -220,6 +220,20 @@ httpAddrLookup(
5e7041
 
5e7041
 #ifdef HAVE_RES_INIT
5e7041
  /*
5e7041
+  * Check if /etc/resolv.conf is modified.
5e7041
+  * If so, reload resolver and set need_res_init to 0.
5e7041
+  */
5e7041
+
5e7041
+  dns_resolver_reload_rv retval;
5e7041
+
5e7041
+  retval = dnsReloadResolver();
5e7041
+
5e7041
+  if (retval.status == DNS_RESOLVER_RELOAD_RELOADED && cg->need_res_init == 1)
5e7041
+    cg->need_res_init = 0;
5e7041
+
5e7041
+  if (retval.status == DNS_RESOLVER_RELOAD_ERROR)
5e7041
+    DEBUG_printf(("1httpAddrLookup: dnsReloadResolver() failed - %s.", strerror(retval.errnum)));
5e7041
+ /*
5e7041
   * STR #2920: Initialize resolver after failure in cups-polld
5e7041
   *
5e7041
   * If the previous lookup failed, re-initialize the resolver to prevent
5e7041
diff -up cups-1.6.3/cups/http-addrlist.c.resolv_reload cups-1.6.3/cups/http-addrlist.c
5e7041
--- cups-1.6.3/cups/http-addrlist.c.resolv_reload	2017-04-07 13:34:55.112511816 +0200
5e7041
+++ cups-1.6.3/cups/http-addrlist.c	2017-04-07 13:34:55.224510840 +0200
5e7041
@@ -389,6 +389,20 @@ httpAddrGetList(const char *hostname,	/*
5e7041
 
5e7041
 #ifdef HAVE_RES_INIT
5e7041
  /*
5e7041
+  * Check if /etc/resolv.conf is modified.
5e7041
+  * If so, reload resolver and set cg->need_res_init to 0
5e7041
+  */
5e7041
+
5e7041
+  dns_resolver_reload_rv retval;
5e7041
+
5e7041
+  retval = dnsReloadResolver();
5e7041
+
5e7041
+  if (retval.status == DNS_RESOLVER_RELOAD_RELOADED && cg->need_res_init == 1)
5e7041
+    cg->need_res_init = 0;
5e7041
+
5e7041
+  if (retval.status == DNS_RESOLVER_RELOAD_ERROR)
5e7041
+    DEBUG_printf(("1httpAddrGetList: dnsReloadResolver() failed - %s.", strerror(retval.errnum)));
5e7041
+ /*
5e7041
   * STR #2920: Initialize resolver after failure in cups-polld
5e7041
   *
5e7041
   * If the previous lookup failed, re-initialize the resolver to prevent
5e7041
diff -up cups-1.6.3/cups/http.c.resolv_reload cups-1.6.3/cups/http.c
5e7041
--- cups-1.6.3/cups/http.c.resolv_reload	2017-04-07 13:34:55.207510988 +0200
5e7041
+++ cups-1.6.3/cups/http.c	2017-04-10 21:21:41.528795395 +0200
5e7041
@@ -4795,6 +4795,108 @@ _httpTLSSetOptions(int options)
5e7041
   tls_options = options;
5e7041
 }
5e7041
 
5e7041
+#ifdef HAVE_RES_INIT
5e7041
+/*
5e7041
+ * Function to check modification time of resolv.conf. 
5e7041
+ * If time is changed, it reloads resolver. 
5e7041
+ * If /etc/resolv.conf doesn't exist, it tries to reload resolver with local nameserver, if it wasn't reloaded before
5e7041
+ * If even reloading resolver with local nameserver doesn't work, it ends with error.
5e7041
+ * Global variable resolv_conf_modtime is set to -1 before the first call of this function - this is for prevention of resolver's reloading when cupsd is just started and resolv.conf exists - cupsd has current configuration in that case.
5e7041
+ */
5e7041
+
5e7041
+dns_resolver_reload_rv
5e7041
+dnsReloadResolver()
5e7041
+{
5e7041
+  dns_resolver_reload_rv retval, lstat_retval, stat_retval, res_init_retval;
5e7041
+  struct stat resolv_conf_stat, resolv_conf_lstat, resolv_conf_status;
5e7041
+  retval.status = DNS_RESOLVER_RELOAD_OK;
5e7041
+  retval.errnum = 0;
5e7041
+  stat_retval.errnum = 0;
5e7041
+  lstat_retval.errnum = 0;
5e7041
+  res_init_retval.errnum = 0;
5e7041
+
5e7041
+  /* Variable to store /etc/resolv.conf modification time - initialized by actual time*/
5e7041
+  static time_t resolv_conf_modtime = -1;
5e7041
+
5e7041
+  /* This part of code is to ensure we get modification time of symlink and original file - we will decide which is newer later */
5e7041
+  stat_retval.status = stat(DNS_RESOLV_CONF_PATH, &resolv_conf_stat);
5e7041
+  stat_retval.errnum = errno;
5e7041
+  lstat_retval.status = lstat(DNS_RESOLV_CONF_PATH, &resolv_conf_lstat);
5e7041
+  lstat_retval.errnum = errno;
5e7041
+
5e7041
+  /* symlink /etc/resolv.conf or original file couldn't be stated because it doesn't exist, try resolver on localhost 
5e7041
+   * Covers cases:
5e7041
+   * - resolv.conf and original file existed and it doesn't now - resolv_conf_modtime has different value than 0  - reload resolver with local nameserver
5e7041
+   * - resolv.conf and original file didn't exist and still doesn't exist - resolv_conf_modtime is set to 0 - do nothing
5e7041
+   */
5e7041
+  if (stat_retval.status == -1 && lstat_retval.status == -1 && stat_retval.errnum == ENOENT && lstat_retval.errnum == ENOENT)
5e7041
+  {
5e7041
+    /* if resolv_conf_modtime is set to 0, it means previous reload was for resolver with local nameserver - no need to reload again */
5e7041
+    if (resolv_conf_modtime != 0)
5e7041
+    {
5e7041
+      res_init_retval.status = res_init();
5e7041
+      res_init_retval.errnum = errno;
5e7041
+      if (res_init_retval.status == 0)
5e7041
+      {
5e7041
+        resolv_conf_modtime = 0;
5e7041
+        retval.status = DNS_RESOLVER_RELOAD_RELOADED;
5e7041
+      }
5e7041
+      else
5e7041
+        retval.status = res_init_retval.status;
5e7041
+
5e7041
+      retval.errnum = res_init_retval.errnum;
5e7041
+    }
5e7041
+    else
5e7041
+    {
5e7041
+      retval.status = DNS_RESOLVER_RELOAD_OK;
5e7041
+      retval.errnum = ENOENT;
5e7041
+    }
5e7041
+
5e7041
+    return (retval);
5e7041
+  }
5e7041
+
5e7041
+  /* If stat ends with different errno, return status - it should return both statuses and errnos, but for simplification it returns only stat */
5e7041
+  if (stat_retval.status == -1 && lstat_retval.status == -1)
5e7041
+  {
5e7041
+    retval.errnum = stat_retval.errnum;
5e7041
+    retval.status = stat_retval.status;
5e7041
+    return (retval);
5e7041
+  }
5e7041
+
5e7041
+  /* Here we compare modification times from lstat and stat to decide which is newer - if they are equal, lstat modification time is used. We are checking only stat() errno, because case with errors in both lstat() and stat() functions is checked before */
5e7041
+  if (stat_retval.errnum == 0)
5e7041
+    if (resolv_conf_stat.st_mtime > resolv_conf_lstat.st_mtime)
5e7041
+      resolv_conf_status = resolv_conf_stat;
5e7041
+    else
5e7041
+      resolv_conf_status = resolv_conf_lstat;
5e7041
+  else
5e7041
+    resolv_conf_status = resolv_conf_lstat;
5e7041
+
5e7041
+  /* If /etc/resolv.conf exists and modification times are different, reload resolver.
5e7041
+   * Covers cases:
5e7041
+   * - resolv.conf or original file exists and it was modified - resolv_conf_modtime has different value than resolv_conf_status.st_mtime - reload resolver with nameserver from /etc/resolv.conf 
5e7041
+   * - resolv.conf or original file didn't exist and it does now - resolv_conf_modtime is set to 0 and resolv_conf_status.st_mtime has value - reload resolver with nameserver form /etc/resolv.conf
5e7041
+   * - resolv.conf or original file exists and it wasn't modified - resolv_conf_modtime is equal to resolv_conf_status.st_mtime - do nothing
5e7041
+   */
5e7041
+  if (resolv_conf_status.st_mtime != resolv_conf_modtime)
5e7041
+  {
5e7041
+    res_init_retval.status = res_init();
5e7041
+    res_init_retval.errnum = errno;
5e7041
+    if (res_init_retval.status == 0)
5e7041
+    {
5e7041
+      retval.status = DNS_RESOLVER_RELOAD_RELOADED;
5e7041
+    }
5e7041
+    else
5e7041
+      retval.status = res_init_retval.status;
5e7041
+
5e7041
+    retval.errnum = res_init_retval.errnum;
5e7041
+  }
5e7041
+
5e7041
+  resolv_conf_modtime = resolv_conf_status.st_mtime;
5e7041
+
5e7041
+  return (retval);
5e7041
+}
5e7041
+#endif /* HAVE_RES_INIT */
5e7041
 
5e7041
 /*
5e7041
  * End of "$Id: http.c 7850 2008-08-20 00:07:25Z mike $".
5e7041
diff -up cups-1.6.3/cups/http.h.resolv_reload cups-1.6.3/cups/http.h
5e7041
--- cups-1.6.3/cups/http.h.resolv_reload	2013-06-07 03:12:52.000000000 +0200
5e7041
+++ cups-1.6.3/cups/http.h	2017-04-07 13:34:55.225510832 +0200
5e7041
@@ -60,6 +60,12 @@ typedef off_t ssize_t;			/* @private@ */
5e7041
 #      define SO_PEERCRED LOCAL_PEERCRED
5e7041
 #    endif /* LOCAL_PEERCRED && !SO_PEERCRED */
5e7041
 #  endif /* WIN32 */
5e7041
+#  ifdef HAVE_RES_INIT
5e7041
+#    include <sys/stat.h>
5e7041
+#    include <unistd.h>
5e7041
+#    include <arpa/nameser.h>
5e7041
+#    include <resolv.h>
5e7041
+#  endif /* HAVE_RES_INIT */
5e7041
 
5e7041
 
5e7041
 /*
5e7041
@@ -102,6 +108,13 @@ extern "C" {
5e7041
 #endif /* AF_INET6 && !s6_addr32 */
5e7041
 
5e7041
 
5e7041
+#ifdef HAVE_RES_INIT
5e7041
+/*
5e7041
+ * Global variable for storing old modification time of resolv.conf 
5e7041
+ */
5e7041
+  extern time_t resolv_conf_modtime;
5e7041
+#endif /* HAVE_RES_INIT */
5e7041
+
5e7041
 /*
5e7041
  * Limits...
5e7041
  */
5e7041
@@ -110,6 +123,9 @@ extern "C" {
5e7041
 #  define HTTP_MAX_HOST		256	/* Max length of hostname string */
5e7041
 #  define HTTP_MAX_BUFFER	2048	/* Max length of data buffer */
5e7041
 #  define HTTP_MAX_VALUE	256	/* Max header field value length */
5e7041
+#  ifdef HAVE_RES_INIT
5e7041
+#    define DNS_RESOLV_CONF_PATH	"/etc/resolv.conf" /* Path to resolv.conf */
5e7041
+#  endif /* HAVE_RES_INIT */
5e7041
 
5e7041
 
5e7041
 /*
5e7041
@@ -290,6 +306,15 @@ typedef enum http_version_e		/**** HTTP
5e7041
   HTTP_1_1 = 101			/* HTTP/1.1 */
5e7041
 } http_version_t;
5e7041
 
5e7041
+#ifdef HAVE_RES_INIT
5e7041
+typedef enum dns_resolver_reload_e
5e7041
+{
5e7041
+  DNS_RESOLVER_RELOAD_ERROR = -1,
5e7041
+  DNS_RESOLVER_RELOAD_OK = 0,
5e7041
+  DNS_RESOLVER_RELOAD_RELOADED = 1
5e7041
+} dns_resolver_reload_t;
5e7041
+#endif /* HAVE_RES_INIT */
5e7041
+
5e7041
 typedef union _http_addr_u		/**** Socket address union, which
5e7041
 					 **** makes using IPv6 and other
5e7041
 					 **** address types easier and
5e7041
@@ -328,6 +353,13 @@ typedef struct http_credential_s	/**** H
5e7041
 typedef int (*http_timeout_cb_t)(http_t *http, void *user_data);
5e7041
 					/**** HTTP timeout callback @since CUPS 1.5/OS X 10.7@ ****/
5e7041
 
5e7041
+#ifdef HAVE_RES_INIT
5e7041
+typedef struct dns_resolver_reload_retval
5e7041
+{
5e7041
+  dns_resolver_reload_t status;
5e7041
+  int errnum;
5e7041
+} dns_resolver_reload_rv;
5e7041
+#endif /* HAVE_RES_INIT */
5e7041
 
5e7041
 
5e7041
 /*
5e7041
@@ -472,6 +504,11 @@ extern http_version_t	httpGetVersion(htt
5e7041
 extern int		httpReconnect2(http_t *http, int msec, int *cancel)
5e7041
 			               _CUPS_API_1_6;
5e7041
 
5e7041
+/**** Prototype of function to check modification time of /etc/resolv.conf ****/
5e7041
+#ifdef HAVE_RES_INIT
5e7041
+extern dns_resolver_reload_rv	dnsReloadResolver();
5e7041
+#endif /* HAVE_RES_INIT */
5e7041
+
5e7041
 
5e7041
 /*
5e7041
  * C++ magic...
5e7041
diff -up cups-1.6.3/cups/http-support.c.resolv_reload cups-1.6.3/cups/http-support.c
5e7041
--- cups-1.6.3/cups/http-support.c.resolv_reload	2017-04-07 13:34:55.130511659 +0200
5e7041
+++ cups-1.6.3/cups/http-support.c	2017-04-07 13:34:55.225510832 +0200
5e7041
@@ -2095,6 +2095,18 @@ http_resolve_cb(
5e7041
     http_addrlist_t	*addrlist,	/* List of addresses */
5e7041
 			*addr;		/* Current address */
5e7041
 
5e7041
+#ifdef HAVE_RES_INIT
5e7041
+   /*
5e7041
+    * Check if resolv.conf is modified, if so, reload resolver
5e7041
+    */
5e7041
+
5e7041
+    dns_resolver_reload_rv retval;
5e7041
+
5e7041
+    retval = dnsReloadResolver();
5e7041
+    if (retval.status == DNS_RESOLVER_RELOAD_ERROR)
5e7041
+      DEBUG_printf(("1http_resolve_cb: dnsReloadResolver() failed - %s.", strerror(retval.errnum)));
5e7041
+#endif /* HAVE_RES_INIT */
5e7041
+
5e7041
     DEBUG_printf(("8http_resolve_cb: Looking up \"%s\".", hostTarget));
5e7041
 
5e7041
     snprintf(fqdn, sizeof(fqdn), "%d", ntohs(port));
5e7041
diff -up cups-1.6.3/scheduler/conf.c.resolv_reload cups-1.6.3/scheduler/conf.c
5e7041
--- cups-1.6.3/scheduler/conf.c.resolv_reload	2017-04-07 13:34:55.213510936 +0200
5e7041
+++ cups-1.6.3/scheduler/conf.c	2017-04-07 13:34:55.226510823 +0200
5e7041
@@ -859,6 +859,15 @@ cupsdReadConfiguration(void)
5e7041
   if (!RemotePort)
5e7041
     BrowseLocalProtocols = 0;		/* Disable sharing - no remote access */
5e7041
 
5e7041
+#ifdef HAVE_RES_INIT
5e7041
+  dns_resolver_reload_rv retval;	/* Return status of dnsReloadResolver() */
5e7041
+
5e7041
+  retval = dnsReloadResolver();
5e7041
+
5e7041
+  if (retval.status == DNS_RESOLVER_RELOAD_ERROR)
5e7041
+    syslog(LOG_LPR, "1cupsdReadConfiguration: dnsReloadResolver() failed - %s.", strerror(retval.errnum));
5e7041
+#endif /* HAVE_RES_INIT */
5e7041
+
5e7041
  /*
5e7041
   * See if the ServerName is an IP address...
5e7041
   */
5e7041
diff -up cups-1.6.3/scheduler/main.c.resolv_reload cups-1.6.3/scheduler/main.c
5e7041
--- cups-1.6.3/scheduler/main.c.resolv_reload	2017-04-07 13:34:55.149511494 +0200
5e7041
+++ cups-1.6.3/scheduler/main.c	2017-04-07 13:34:55.226510823 +0200
5e7041
@@ -164,6 +164,14 @@ main(int  argc,				/* I - Number of comm
5e7041
   long			tmo_delay;	/* Time before it must be called */
5e7041
 #endif /* HAVE_AVAHI */
5e7041
 
5e7041
+#ifdef HAVE_RES_INIT
5e7041
+  dns_resolver_reload_rv retval;	/* Return status from dnsReloadResolver() */
5e7041
+
5e7041
+  retval = dnsReloadResolver();
5e7041
+  if (retval.status == DNS_RESOLVER_RELOAD_ERROR)
5e7041
+    fprintf(stderr, "cupsd: Cannot reload a resolver - %s , using old configuration now.\n", strerror(retval.errnum));
5e7041
+#endif /* HAVE_RES_INIT */
5e7041
+
5e7041
 
5e7041
 #ifdef HAVE_GETEUID
5e7041
  /*