Really mirror fix for STR #4402 (compile problem) that wasn't picked up

(STR #4424)

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/branches/branch-1.7@11906 a1ca3aef-8c08-0410-bb20-df032aa958be

diff --git a/CHANGES.txt b/CHANGES.txt
index d5aab15896f82011f952b7677709c3cff4fbb880..732245499697b73408a23f5f7ad14799bd3a46fb 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,12 @@
-CHANGES.txt - 1.7.3 - 2014-05-27
+CHANGES.txt - 1.7.3 - 2014-06-09
 --------------------------------
 
+CHANGES IN CUPS V1.7.4
+
+       - CUPS did not compile when Avahi or mDNSResponder was not present
+         (STR #4402, STR #4424)
+
+
 CHANGES IN CUPS V1.7.3
 
        - Added Brazilian Portuguese translation (STR #4409)
@@ -19,8 +25,6 @@ CHANGES IN CUPS V1.7.3
          (STR #4397)
        - The configure script incorrectly added libgcrypt as a GNU TLS
          dependency (STR #4399)
-       - CUPS did not compile when Avahi or mDNSResponder was not present
-         (STR #4402)
        - cupsGetDestMediaCount did not work for CUPS_MEDIA_FLAGS DEFAULT
          (STR #4414)
        - Auto-typing of PWG Raster files did not work (STR #4417)

diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4
index da2b4fc3ffb806bc43816353bc403343301e7288..6341d25217e7ceee1c421a5163d660ac82382212 100644 (file)
--- a/config-scripts/cups-common.m4
+++ b/config-scripts/cups-common.m4
@@ -20,7 +20,7 @@ dnl Set the name of the config header file...
 AC_CONFIG_HEADER(config.h)
 
 dnl Version number information...
-CUPS_VERSION="1.7.3"
+CUPS_VERSION="1.7.4"
 CUPS_REVISION=""
 #if test -z "$CUPS_REVISION" -a -d .svn; then
 #      CUPS_REVISION="-r`svnversion . | awk -F: '{print $NF}' | sed -e '1,$s/[[a-zA-Z]]*//g'`"

diff --git a/cups/cups.h b/cups/cups.h
index 3224c8383128b311b2799f470e25cb814d7dc559..2b65478fc8983efaec96f80d5cd16d2dc373e468 100644 (file)
--- a/cups/cups.h
+++ b/cups/cups.h
@@ -53,10 +53,10 @@ extern "C" {
  * Constants...
  */
 
-#  define CUPS_VERSION                 1.0703
+#  define CUPS_VERSION                 1.0704
 #  define CUPS_VERSION_MAJOR           1
 #  define CUPS_VERSION_MINOR           7
-#  define CUPS_VERSION_PATCH           3
+#  define CUPS_VERSION_PATCH           4
 
 #  define CUPS_BC_FD                   3
                                        /* Back-channel file descriptor for

diff --git a/scheduler/dirsvc.c b/scheduler/dirsvc.c
index 4547b99f1efbfca983883e0b029fff9c38047fd3..4e417b0b29f5bf17253d44ba457ca25bdefbd0a7 100644 (file)
--- a/scheduler/dirsvc.c
+++ b/scheduler/dirsvc.c
@@ -237,11 +237,13 @@ cupsdStartBrowsing(void)
   if (BrowseLocalProtocols & BROWSE_SMB)
     update_smb(1);
 
+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
  /*
   * Register the individual printers
   */
 
   dnssdRegisterAllPrinters(0);
+#endif /* HAVE_DNSSD || HAVE_AVAHI */
 }
 
 
@@ -255,6 +257,7 @@ cupsdStopBrowsing(void)
   if (!Browsing || !BrowseLocalProtocols)
     return;
 
+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
  /*
   * De-register the individual printers
   */
@@ -265,7 +268,6 @@ cupsdStopBrowsing(void)
   * Shut down browsing sockets...
   */
 
-#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
   if ((BrowseLocalProtocols & BROWSE_DNSSD) && DNSSDMaster)
     dnssdStop();
 #endif /* HAVE_DNSSD || HAVE_AVAHI */
@@ -1548,7 +1550,7 @@ get_auth_info_required(
       if (i)
        *bufptr++ = ',';
 
-      strlcpy(bufptr, p->auth_info_required[i], bufsize - (bufptr - buffer));
+      strlcpy(bufptr, p->auth_info_required[i], bufsize - (size_t)(bufptr - buffer));
       bufptr += strlen(bufptr);
     }