Mirror 1.1.x changes.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/branches/branch-1.2@4173 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/CHANGES-1.1.txt b/CHANGES-1.1.txt
index 06a71596bb8c4f5b9169e654784d22dcf426ce8a..c3fccf8affd618e363559582ae2827dd74232cbe 100644 (file)
--- a/CHANGES-1.1.txt
+++ b/CHANGES-1.1.txt
@@ -3,6 +3,12 @@ CHANGES-1.1.txt
 
 CHANGES IN CUPS V1.1.21rc1
 
+       - The scheduler did not properly parse name-based
+         BrowseRelay directives in the cupsd.conf file (STR
+         #711)
+       - The IPP backend now supports the following options in
+         the device URI: encryption, waitjob, and waitprinter
+         (STR #699)
        - The parallel, serial, socket, and USB backends did not
          return a non-zero exit status when a job failed to
          print in the middle of sending it (STR #715)

diff --git a/scheduler/conf.c b/scheduler/conf.c
index 4256e1321f030b26b2688c8916df796242585c5c..25c6a0dab610efaedbd8978294cf1ab6d5aefeaa 100644 (file)
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: conf.c,v 1.77.2.50 2004/04/20 13:40:30 mike Exp $"
+ * "$Id: conf.c,v 1.77.2.51 2004/05/13 20:22:01 mike Exp $"
  *
  *   Configuration routines for the Common UNIX Printing System (CUPS).
  *
@@ -1230,9 +1230,13 @@ read_configuration(cups_file_t *fp)      /* I - File to read from */
        if (value[0] == '*')
          value ++;
 
+        strlcpy(name, value, sizeof(name));
+       if ((nameptr = strchr(name, ' ')) != NULL)
+         *nameptr = '\0';
+
         relay->from.type             = AUTH_NAME;
-       relay->from.mask.name.name   = strdup(value);
-       relay->from.mask.name.length = strlen(value);
+       relay->from.mask.name.name   = strdup(name);
+       relay->from.mask.name.length = strlen(name);
       }
       else
       {
@@ -2305,5 +2309,5 @@ CDSAGetServerCerts(void)
 
 
 /*
- * End of "$Id: conf.c,v 1.77.2.50 2004/04/20 13:40:30 mike Exp $".
+ * End of "$Id: conf.c,v 1.77.2.51 2004/05/13 20:22:01 mike Exp $".
  */