]> git.ipfire.org Git - thirdparty/cups.git/blobdiff - scheduler/cups-lpd.c
Full sweep of all Clang warnings, plus some bug fixes for incorrect memcpy usage.
[thirdparty/cups.git] / scheduler / cups-lpd.c
index eda350c52655784d409e0cd987e242f33eee82bb..a1de09058b32986bc176123dce93b4ffae7d9613 100644 (file)
@@ -1,53 +1,26 @@
 /*
- * "$Id: cups-lpd.c 5196 2006-02-27 21:23:00Z mike $"
+ * "$Id$"
  *
- *   Line Printer Daemon interface for the Common UNIX Printing System (CUPS).
+ * Line Printer Daemon interface for CUPS.
  *
- *   Copyright 1997-2006 by Easy Software Products, all rights reserved.
+ * Copyright 2007-2014 by Apple Inc.
+ * Copyright 1997-2006 by Easy Software Products, all rights reserved.
  *
- *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
- *
- * Contents:
- *
- *   main()           - Process an incoming LPD request...
- *   create_job()     - Create a new print job.
- *   get_printer()    - Get the named printer and its options.
- *   print_file()     - Add a file to the current job.
- *   recv_print_job() - Receive a print job from the client.
- *   remove_jobs()    - Cancel one or more jobs.
- *   send_state()     - Send the queue state.
- *   smart_gets()     - Get a line of text, removing the trailing CR and/or LF.
+ * These coded instructions, statements, and computer programs are the
+ * property of Apple Inc. and are protected by Federal copyright
+ * law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file.  If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
  */
 
 /*
  * Include necessary headers...
  */
 
-#include <cups/http-private.h>
-#include <cups/cups.h>
-#include <cups/string.h>
-#include <cups/language.h>
-#include <stdlib.h>
-#include <errno.h>
+#include <cups/cups-private.h>
 #include <syslog.h>
-#include <ctype.h>
 #include <unistd.h>
 #include <fcntl.h>
-
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #  include <inttypes.h>
 #endif /* HAVE_INTTYPES_H */
 
-#ifdef HAVE_COREFOUNDATION_H
-#  include <CoreFoundation/CoreFoundation.h>
-#endif /* HAVE_COREFOUNDATION_H */
-#ifdef HAVE_CFPRIV_H
-#  include <CoreFoundation/CFPriv.h>
-#endif /* HAVE_CFPRIV_H */
-
 
 /*
  * LPD "mini-daemon" for CUPS.  This program must be used in conjunction
  */
 
 static int     create_job(http_t *http, const char *dest, const char *title,
-                          const char *user, int num_options,
-                          cups_option_t *options);
+                           const char *docname, const char *user,
+                          int num_options, cups_option_t *options);
 static int     get_printer(http_t *http, const char *name, char *dest,
                            int destsize, cups_option_t **options,
                            int *accepting, int *shared, ipp_pstate_t *state);
 static int     print_file(http_t *http, int id, const char *filename,
-                          const char *docname, const char *user, int last);
+                          const char *docname, const char *user,
+                          const char *format, int last);
 static int     recv_print_job(const char *name, int num_defaults,
                               cups_option_t *defaults);
 static int     remove_jobs(const char *name, const char *agent,
@@ -128,6 +95,7 @@ main(int  argc,                              /* I - Number of command-line arguments */
   char         hostname[256],          /* Name of client */
                hostip[256],            /* IP address */
                *hostfamily;            /* Address family */
+  int          hostlookups;            /* Do hostname lookups? */
 
 
  /*
@@ -142,48 +110,32 @@ main(int  argc,                           /* I - Number of command-line arguments */
 
   openlog("cups-lpd", LOG_PID, LOG_LPR);
 
- /*
-  * Get the address of the client...
-  */
-
-  hostlen = sizeof(hostaddr);
-
-  if (getpeername(0, (struct sockaddr *)&hostaddr, &hostlen))
-  {
-    syslog(LOG_WARNING, "Unable to get client address - %s", strerror(errno));
-    strcpy(hostname, "unknown");
-  }
-  else
-  {
-    httpAddrLookup(&hostaddr, hostname, sizeof(hostname));
-    httpAddrString(&hostaddr, hostip, sizeof(hostip));
-
-#ifdef AF_INET6
-    if (hostaddr.addr.sa_family == AF_INET6)
-      hostfamily = "IPv6";
-    else
-#endif /* AF_INET6 */
-    hostfamily = "IPv4";
-
-    syslog(LOG_INFO, "Connection from %s (%s %s)", hostname, hostfamily,
-           hostip);
-  }
-
  /*
   * Scan the command-line for options...
   */
 
   num_defaults = 0;
   defaults     = NULL;
-
-  num_defaults = cupsAddOption("job-originating-host-name", hostname,
-                               num_defaults, &defaults);
+  hostlookups  = 1;
 
   for (i = 1; i < argc; i ++)
     if (argv[i][0] == '-')
     {
       switch (argv[i][1])
       {
+        case 'h' : /* -h hostname[:port] */
+            if (argv[i][2])
+             cupsSetServer(argv[i] + 2);
+           else
+           {
+             i ++;
+             if (i < argc)
+               cupsSetServer(argv[i]);
+             else
+               syslog(LOG_WARNING, "Expected hostname string after -h option!");
+           }
+           break;
+
        case 'o' : /* Option */
            if (argv[i][2])
              num_defaults = cupsParseOptions(argv[i] + 2, num_defaults,
@@ -198,6 +150,11 @@ main(int  argc,                            /* I - Number of command-line arguments */
                syslog(LOG_WARNING, "Expected option string after -o option!");
             }
            break;
+
+        case 'n' : /* Don't do hostname lookups */
+           hostlookups = 0;
+           break;
+
        default :
            syslog(LOG_WARNING, "Unknown option \"%c\" ignored!", argv[i][1]);
            break;
@@ -207,6 +164,40 @@ main(int  argc,                            /* I - Number of command-line arguments */
       syslog(LOG_WARNING, "Unknown command-line option \"%s\" ignored!",
              argv[i]);
 
+ /*
+  * Get the address of the client...
+  */
+
+  hostlen = sizeof(hostaddr);
+
+  if (getpeername(0, (struct sockaddr *)&hostaddr, &hostlen))
+  {
+    syslog(LOG_WARNING, "Unable to get client address - %s", strerror(errno));
+    strlcpy(hostname, "unknown", sizeof(hostname));
+  }
+  else
+  {
+    httpAddrString(&hostaddr, hostip, sizeof(hostip));
+
+    if (hostlookups)
+      httpAddrLookup(&hostaddr, hostname, sizeof(hostname));
+    else
+      strlcpy(hostname, hostip, sizeof(hostname));
+
+#ifdef AF_INET6
+    if (hostaddr.addr.sa_family == AF_INET6)
+      hostfamily = "IPv6";
+    else
+#endif /* AF_INET6 */
+    hostfamily = "IPv4";
+
+    syslog(LOG_INFO, "Connection from %s (%s %s)", hostname, hostfamily,
+           hostip);
+  }
+
+  num_defaults = cupsAddOption("job-originating-host-name", hostname,
+                               num_defaults, &defaults);
+
  /*
   * RFC1179 specifies that only 1 daemon command can be received for
   * every connection.
@@ -235,7 +226,7 @@ main(int  argc,                             /* I - Number of command-line arguments */
     list = NULL;
   else
   {
-    for (list = dest + 1; *list && !isspace(*list & 255); list ++);
+    for (list = dest; *list && !isspace(*list & 255); list ++);
 
     while (isspace(*list & 255))
       *list++ = '\0';
@@ -266,37 +257,42 @@ main(int  argc,                           /* I - Number of command-line arguments */
         syslog(LOG_INFO, "Receive print job for %s", dest);
         /* recv_print_job() sends initial status byte */
 
-        status = recv_print_job(dest, num_defaults, defaults);
+        status = (char)recv_print_job(dest, num_defaults, defaults);
        break;
 
     case 0x03 : /* Send queue state (short) */
         syslog(LOG_INFO, "Send queue state (short) for %s %s", dest, list);
        /* no status byte for this command */
 
-        status = send_state(dest, list, 0);
+        status = (char)send_state(dest, list, 0);
        break;
 
     case 0x04 : /* Send queue state (long) */
         syslog(LOG_INFO, "Send queue state (long) for %s %s", dest, list);
        /* no status byte for this command */
 
-        status = send_state(dest, list, 1);
+        status = (char)send_state(dest, list, 1);
        break;
 
     case 0x05 : /* Remove jobs */
-       /*
-        * Grab the agent and skip to the list of users and/or jobs.
-       */
+        if (list)
+       {
+        /*
+         * Grab the agent and skip to the list of users and/or jobs.
+         */
 
-        agent = list;
+         agent = list;
 
-       for (; *list && !isspace(*list & 255); list ++);
-       while (isspace(*list & 255))
-         *list++ = '\0';
+         for (; *list && !isspace(*list & 255); list ++);
+         while (isspace(*list & 255))
+           *list++ = '\0';
 
-        syslog(LOG_INFO, "Remove jobs %s on %s by %s", list, dest, agent);
+         syslog(LOG_INFO, "Remove jobs %s on %s by %s", list, dest, agent);
 
-        status = remove_jobs(dest, agent, list);
+         status = (char)remove_jobs(dest, agent, list);
+        }
+       else
+         status = 1;
 
        putchar(status);
        break;
@@ -317,6 +313,7 @@ static int                          /* O - Job ID or -1 on error */
 create_job(http_t        *http,                /* I - HTTP connection */
            const char    *dest,                /* I - Destination name */
           const char    *title,        /* I - job-name */
+          const char    *docname,      /* I - Name of job file */
            const char    *user,                /* I - requesting-user-name */
           int           num_options,   /* I - Number of options for job */
           cups_option_t *options)      /* I - Options for job */
@@ -343,10 +340,14 @@ create_job(http_t        *http,           /* I - HTTP connection */
   ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
                "requesting-user-name", NULL, user);
 
-  if (title)
+  if (title[0])
     ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "job-name",
                  NULL, title);
 
+  if (docname[0])
+    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "document-name",
+                 NULL, docname);
+
   cupsEncodeOptions(request, num_options, options);
 
  /*
@@ -438,14 +439,41 @@ get_printer(http_t        *http,  /* I - HTTP connection */
     *options = NULL;
 
  /*
-  * If the queue name contains a space, lookup the printer-name using
-  * the printer-info value...
+  * See if the name is a queue name optionally with an instance name.
+  */
+
+  strlcpy(dest, name, destsize);
+  if ((value = strchr(dest, '/')) != NULL)
+    *value = '\0';
+
+ /*
+  * Setup the Get-Printer-Attributes request...
+  */
+
+  request = ippNewRequest(IPP_GET_PRINTER_ATTRIBUTES);
+
+  httpAssembleURIf(HTTP_URI_CODING_ALL, uri, sizeof(uri), "ipp", NULL,
+                  "localhost", 0, "/printers/%s", dest);
+
+  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
+              NULL, uri);
+
+  ippAddStrings(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
+               "requested-attributes",
+               (int)(sizeof(requested) / sizeof(requested[0])),
+               NULL, requested);
+
+ /*
+  * Do the request...
   */
 
-  if (strchr(name, ' '))
+  response = cupsDoRequest(http, request, "/");
+
+  if (!response || cupsLastError() > IPP_OK_CONFLICT)
   {
    /*
-    * Lookup the printer-info...
+    * If we can't find the printer by name, look up the printer-name
+    * using the printer-info values...
     */
 
     ipp_attribute_t    *accepting_attr,/* printer-is-accepting-jobs */
@@ -455,13 +483,15 @@ get_printer(http_t        *http,  /* I - HTTP connection */
                        *state_attr;    /* printer-state */
 
 
+    ippDelete(response);
+
    /*
     * Setup the CUPS-Get-Printers request...
     */
 
     request = ippNewRequest(CUPS_GET_PRINTERS);
 
-    ippAddStrings(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
+    ippAddStrings(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
                   "requested-attributes",
                  (int)(sizeof(requested) / sizeof(requested[0])),
                   NULL, requested);
@@ -533,7 +563,7 @@ get_printer(http_t        *http,    /* I - HTTP connection */
       }
 
       if (info_attr && name_attr &&
-          !strcasecmp(name, info_attr->values[0].string.text))
+          !_cups_strcasecmp(name, info_attr->values[0].string.text))
       {
        /*
         * Found a match, use this one!
@@ -567,47 +597,6 @@ get_printer(http_t        *http,   /* I - HTTP connection */
   }
   else
   {
-   /*
-    * Otherwise treat it as a queue name optionally with an instance name.
-    */
-
-    strlcpy(dest, name, destsize);
-    if ((value = strchr(dest, '/')) != NULL)
-      *value = '\0';
-
-   /*
-    * Setup the Get-Printer-Attributes request...
-    */
-
-    request = ippNewRequest(IPP_GET_PRINTER_ATTRIBUTES);
-
-    httpAssembleURIf(HTTP_URI_CODING_ALL, uri, sizeof(uri), "ipp", NULL,
-                     "localhost", 0, "/printers/%s", dest);
-
-    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
-                NULL, uri);
-
-    ippAddStrings(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
-                  "requested-attributes",
-                 (int)(sizeof(requested) / sizeof(requested[0])),
-                  NULL, requested);
-
-   /*
-    * Do the request...
-    */
-
-    response = cupsDoRequest(http, request, "/");
-
-    if (!response || cupsLastError() > IPP_OK_CONFLICT)
-    {
-      syslog(LOG_ERR, "Unable to check printer status - %s",
-             cupsLastErrorString());
-
-      ippDelete(response);
-
-      return (-1);
-    }
-
    /*
     * Get values from the response...
     */
@@ -615,9 +604,9 @@ get_printer(http_t        *http,    /* I - HTTP connection */
     if (accepting)
     {
       if ((attr = ippFindAttribute(response, "printer-is-accepting-jobs",
-                                  IPP_TAG_BOOLEAN)) == NULL)
+                                  IPP_TAG_BOOLEAN)) == NULL)
        syslog(LOG_ERR, "No printer-is-accepting-jobs attribute found in "
-                       "response from server!");
+                       "response from server!");
       else
        *accepting = attr->values[0].boolean;
     }
@@ -625,10 +614,10 @@ get_printer(http_t        *http,  /* I - HTTP connection */
     if (shared)
     {
       if ((attr = ippFindAttribute(response, "printer-is-shared",
-                                  IPP_TAG_BOOLEAN)) == NULL)
+                                  IPP_TAG_BOOLEAN)) == NULL)
       {
        syslog(LOG_ERR, "No printer-is-shared attribute found in "
-                       "response from server!");
+                       "response from server!");
        *shared = 1;
       }
       else
@@ -638,9 +627,9 @@ get_printer(http_t        *http,    /* I - HTTP connection */
     if (state)
     {
       if ((attr = ippFindAttribute(response, "printer-state",
-                                  IPP_TAG_INTEGER)) == NULL)
+                                  IPP_TAG_ENUM)) == NULL)
        syslog(LOG_ERR, "No printer-state attribute found in "
-                       "response from server!");
+                       "response from server!");
       else
        *state = (ipp_pstate_t)attr->values[0].integer;
     }
@@ -648,104 +637,6 @@ get_printer(http_t        *http,  /* I - HTTP connection */
     ippDelete(response);
   }
 
- /*
-  * Override shared value for LPD using system-specific APIs...
-  */
-
-#ifdef HAVE_CFPRIV_H /* MacOS X */
-  if (shared && *shared)
-  {
-    CFURLRef           prefsurl;       /* */
-    CFDataRef          xmldata;        /* */
-    CFPropertyListRef  plist;          /* */
-    CFStringRef                queueid;        /* */
-    CFArrayRef         lprqarray;      /* */
-    CFBooleanRef       serverflag;     /* */
-    Boolean            prefsok;        /* */
-    static const char printerprefsfile[] =
-        "/Library/Preferences/com.apple.printservice.plist";
-                                       /* Preferences file */
-
-
-   /*
-    * See if we are running on MacOS X Server...
-    */
-
-    CFDictionaryRef versdict = _CFCopyServerVersionDictionary();
-
-    if (versdict)
-    {
-     /*
-      * Yes, use the LPR sharing preference...
-      */
-
-      CFRelease(versdict);
-
-      *shared = 0;
-
-      prefsurl = CFURLCreateFromFileSystemRepresentation(
-                     kCFAllocatorDefault, 
-                    (const UInt8 *)printerprefsfile, 
-                    (CFIndex)strlen(printerprefsfile), 
-                    false);
-      if (prefsurl)
-      {
-        prefsok = CFURLCreateDataAndPropertiesFromResource(
-                     kCFAllocatorDefault, prefsurl, &xmldata, 
-                     NULL, NULL, NULL);
-        if (prefsok)
-       {
-         plist = CFPropertyListCreateFromXMLData(kCFAllocatorDefault, xmldata, 
-                                                 kCFPropertyListImmutable, NULL);
-         if (plist)
-         {
-           serverflag = (CFBooleanRef)CFDictionaryGetValue(
-                            (CFDictionaryRef)plist, CFSTR("serviceState"));
-
-            if (serverflag && CFBooleanGetValue(serverflag))
-           {
-             lprqarray = (CFArrayRef)CFDictionaryGetValue(
-                             (CFDictionaryRef)plist, CFSTR("lprSharedQueues"));
-
-             if (lprqarray)
-             {
-               queueid = CFStringCreateWithCString(CFAllocatorGetDefault(), 
-                                                   dest,
-                                                   kCFStringEncodingUTF8);
-
-                if (queueid)
-               {
-                 *shared = CFArrayContainsValue(
-                               lprqarray,
-                               CFRangeMake(0, CFArrayGetCount(lprqarray)),
-                               queueid);
-
-                  CFRelease(queueid);
-               }
-
-                CFRelease(lprqarray);
-             }
-           }
-
-            if (serverflag)
-             CFRelease(serverflag);
-
-           CFRelease(plist);
-         }
-
-         CFRelease(prefsok);
-       }
-
-       CFRelease(prefsurl);
-      }
-
-      if (!shared)
-       syslog(LOG_ERR, "Warning - Print Service sharing disabled for LPD "
-                       "on queue: %s", name);
-    }
-  }
-#endif /* HAVE_CFPRIV_H */
-
  /*
   * Next look for the printer in the lpoptions file...
   */
@@ -767,7 +658,7 @@ get_printer(http_t        *http,    /* I - HTTP connection */
        * Make sure we have "Dest name options" or "Default name options"...
        */
 
-       if ((strcasecmp(line, "Dest") && strcasecmp(line, "Default")) || !value)
+       if ((_cups_strcasecmp(line, "Dest") && _cups_strcasecmp(line, "Default")) || !value)
           continue;
 
        /*
@@ -784,7 +675,7 @@ get_printer(http_t        *http,    /* I - HTTP connection */
        * the loop - we're done!
        */
 
-       if (!strcasecmp(value, name))
+       if (!_cups_strcasecmp(value, name))
        {
           num_options = cupsParseOptions(optptr, num_options, options);
          break;
@@ -815,6 +706,7 @@ print_file(http_t     *http,                /* I - HTTP connection */
           const char *filename,        /* I - File to print */
            const char *docname,                /* I - document-name */
           const char *user,            /* I - requesting-user-name */
+          const char *format,          /* I - document-format */
           int        last)             /* I - 1 = last file in job */
 {
   ipp_t                *request;               /* IPP request */
@@ -837,8 +729,11 @@ print_file(http_t     *http,               /* I - HTTP connection */
     ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
                 "document-name", NULL, docname);
 
-  if (last)
-    ippAddBoolean(request, IPP_TAG_OPERATION, "last-document", 1);
+  if (format)
+    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
+                 "document-format", NULL, format);
+
+  ippAddBoolean(request, IPP_TAG_OPERATION, "last-document", (char)last);
 
  /*
   * Do the request...
@@ -875,7 +770,8 @@ recv_print_job(
   int          fd;                     /* Temporary file */
   FILE         *fp;                    /* File pointer */
   char         filename[1024];         /* Temporary filename */
-  int          bytes;                  /* Bytes received */
+  ssize_t      bytes;                  /* Bytes received */
+  size_t       total;                  /* Total bytes */
   char         line[256],              /* Line from file/stdin */
                command,                /* Command from line */
                *count,                 /* Number of bytes */
@@ -1008,7 +904,7 @@ recv_print_job(
              break;
            }
 
-           strcpy(filename, control);
+           strlcpy(filename, control, sizeof(filename));
          }
          break;
 
@@ -1044,7 +940,7 @@ recv_print_job(
            break;
          }
 
-         strcpy(filename, temp[num_data]);
+         strlcpy(filename, temp[num_data], sizeof(filename));
 
           num_data ++;
          break;
@@ -1059,15 +955,15 @@ recv_print_job(
     * Copy the data or control file from the client...
     */
 
-    for (i = atoi(count); i > 0; i -= bytes)
+    for (total = (size_t)strtoll(count, NULL, 10); total > 0; total -= (size_t)bytes)
     {
-      if (i > sizeof(line))
-        bytes = sizeof(line);
+      if (total > sizeof(line))
+        bytes = (ssize_t)sizeof(line);
       else
-        bytes = i;
+        bytes = (ssize_t)total;
 
-      if ((bytes = fread(line, 1, bytes, stdin)) > 0)
-        bytes = write(fd, line, bytes);
+      if ((bytes = (ssize_t)fread(line, 1, (size_t)bytes, stdin)) > 0)
+        bytes = write(fd, line, (size_t)bytes);
 
       if (bytes < 1)
       {
@@ -1133,9 +1029,10 @@ recv_print_job(
       * Grab the job information...
       */
 
-      title[0] = '\0';
-      user[0]  = '\0';
-      doccount = 0;
+      title[0]   = '\0';
+      user[0]    = '\0';
+      docname[0] = '\0';
+      doccount   = 0;
 
       while (smart_gets(line, sizeof(line), fp) != NULL)
       {
@@ -1149,6 +1046,10 @@ recv_print_job(
              strlcpy(title, line + 1, sizeof(title));
              break;
 
+          case 'N' : /* Document name */
+              strlcpy(docname, line + 1, sizeof(docname));
+              break;
+
          case 'P' : /* User identification */
              strlcpy(user, line + 1, sizeof(user));
              break;
@@ -1205,14 +1106,15 @@ recv_print_job(
       {
        syslog(LOG_WARNING, "No username specified by client! "
                            "Using \"anonymous\"...");
-       strcpy(user, "anonymous");
+       strlcpy(user, "anonymous", sizeof(user));
       }
 
      /*
       * Create the job...
       */
 
-      if ((id = create_job(http, dest, title, user, num_options, options)) < 0)
+      if ((id = create_job(http, dest, title, docname, user, num_options,
+                           options)) < 0)
         status = 1;
       else
       {
@@ -1269,6 +1171,8 @@ recv_print_job(
                docnumber ++;
 
                if (print_file(http, id, temp[i], docname, user,
+                              cupsGetOption("document-format", num_options,
+                                            options),
                               docnumber == doccount))
                   status = 1;
                else
@@ -1280,9 +1184,9 @@ recv_print_job(
          if (status)
            break;
        }
-
-       fclose(fp);
       }
+
+      fclose(fp);
     }
   }
 
@@ -1379,7 +1283,7 @@ remove_jobs(const char *dest,             /* I - Destination */
       return (1);
     }
     else
-      syslog(LOG_INFO, "Job ID %d cancelled", id);
+      syslog(LOG_INFO, "Job ID %d canceled", id);
   }
 
   httpClose(http);
@@ -1614,7 +1518,7 @@ send_state(const char *queue,             /* I - Destination */
     */
 
     if (jobstate == IPP_JOB_PROCESSING)
-      strcpy(rankstr, "active");
+      strlcpy(rankstr, "active", sizeof(rankstr));
     else
     {
       snprintf(rankstr, sizeof(rankstr), "%d%s", rank, ranks[rank % 10]);
@@ -1695,7 +1599,7 @@ smart_gets(char *s,                       /* I - Pointer to line buffer */
       break;
     }
     else if (ptr < end)
-      *ptr++ = ch;
+      *ptr++ = (char)ch;
   }
 
   *ptr = '\0';
@@ -1708,5 +1612,5 @@ smart_gets(char *s,                       /* I - Pointer to line buffer */
 
 
 /*
- * End of "$Id: cups-lpd.c 5196 2006-02-27 21:23:00Z mike $".
+ * End of "$Id$".
  */