Mirror fix from trunk.

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

diff --git a/CHANGES.txt b/CHANGES.txt
index 5047b1cea05e46d32323e8c58ce54b4e4d69a486..ff2ea8c5c91f8891434b5b3e201c8ef81127a336 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,11 @@
-CHANGES.txt - 1.7.0 - 2013-10-18
+CHANGES.txt - 1.7.1 - 2013-10-28
 --------------------------------
 
+CHANGES IN CUPS V1.7.1
+
+       - Auto debug logging was broken in 1.7.0 (<rdar://problem/15331639>)
+
+
 CHANGES IN CUPS V1.7.0
 
        - Updated Japanese localization.

diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4
index af1b8f1052d29b534258c725f520bc71f3cb67c7..b961bc132705c11986360022d6a2fa3da04f2f7e 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.0"
+CUPS_VERSION="1.7.1"
 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 b9f52eaf28ced4fcd914db6efafd36bf74693c1b..b4729107864e12aee03dc864d7ce11b9ca307645 100644 (file)
--- a/cups/cups.h
+++ b/cups/cups.h
@@ -53,10 +53,10 @@ extern "C" {
  * Constants...
  */
 
-#  define CUPS_VERSION                 1.0700
+#  define CUPS_VERSION                 1.0701
 #  define CUPS_VERSION_MAJOR           1
 #  define CUPS_VERSION_MINOR           7
-#  define CUPS_VERSION_PATCH           0
+#  define CUPS_VERSION_PATCH           1
 
 #  define CUPS_BC_FD                   3
                                        /* Back-channel file descriptor for

diff --git a/scheduler/log.c b/scheduler/log.c
index 0d49357364b91c74374256bd64eac30d90538007..940eb9a2fa7f5c9fe5a93ed373ac7a84d6ed0018 100644 (file)
--- a/scheduler/log.c
+++ b/scheduler/log.c
@@ -496,12 +496,13 @@ cupsdLogJob(cupsd_job_t *job,             /* I - Job */
       */
 
       cupsd_joblog_t *temp;            /* Copy of log message */
+      size_t         log_len = strlen(log_line);
+                                       /* Length of log message */
 
-
-      if ((temp = malloc(sizeof(cupsd_joblog_t) + strlen(log_line))) != NULL)
+      if ((temp = malloc(sizeof(cupsd_joblog_t) + log_len)) != NULL)
       {
         temp->time = time(NULL);
-       strlcpy(temp->message, log_line, sizeof(temp->message));
+       memcpy(temp->message, log_line, log_len + 1);
       }
 
       if (!job->history)