[gentoo-commits] gentoo-x86 commit in net-print/cups-pk-helper/files: cups-pk-helper-0.2.4-revert-stricter.patch cups-pk-helper-0.2.2-cups-1.6.patch

[Pacho Ramos (pacho)]

pacho       13/03/03 14:48:52

  Added:                cups-pk-helper-0.2.4-revert-stricter.patch
  Removed:              cups-pk-helper-0.2.2-cups-1.6.patch
  Log:
  Revert Be
  
  (Portage version: 2.1.11.52/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

Revision  Changes    Path
1.1                  net-print/cups-pk-helper/files/cups-pk-helper-0.2.4-revert-stricter.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups-pk-helper/files/cups-pk-helper-0.2.4-revert-stricter.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups-pk-helper/files/cups-pk-helper-0.2.4-revert-stricter.patch?rev=1.1&content-type=text/plain

Index: cups-pk-helper-0.2.4-revert-stricter.patch
===================================================================
From f00aee0b43c31e94087668b23b72e873c660de5e Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@××××.com>
Date: Mon, 10 Dec 2012 09:44:31 +0000
Subject: Revert "Be stricter when validating printer names"

Apparently, this is way too strict. The lpadmin man page says:

  CUPS allows printer names to contain any printable character except
  SPACE, TAB, "/", or  "#".

So the previous code was (mostly) correct.

This reverts commit 7bf9cbe43ef8f648f308e4760f75c2aa6b61fa8e.
---
diff --git a/src/cups.c b/src/cups.c
index 96c2c20..09f0e7b 100644
--- a/src/cups.c
+++ b/src/cups.c
@@ -327,25 +327,23 @@ _cph_cups_is_printer_name_valid_internal (const char *name)
         int i;
         int len;
 
-        /* Quoting http://www.cups.org/documentation.php/doc-1.1/sam.html#4_1:
-         *
-         *    The printer name must start with any printable character except
-         *    " ", "/", and "@". It can contain up to 127 letters, numbers, and
-         *    the underscore (_).
-         *
-         * The first part is a bit weird, as the second part is more
-         * restrictive. So we only consider the second part. */
-
         /* no empty string */
         if (!name || name[0] == '\0')
                 return FALSE;
 
         len = strlen (name);
-        if (len > 127)
+        /* no string that is too long; see comment at the beginning of the
+         * validation code block */
+        if (len > CPH_STR_MAXLEN)
                 return FALSE;
 
+        /* only printable characters, no space, no /, no # */
         for (i = 0; i < len; i++) {
-                if (!g_ascii_isalnum (name[i]) && name[i] != '_')
+                if (!g_ascii_isprint (name[i]))
+                        return FALSE;
+                if (g_ascii_isspace (name[i]))
+                        return FALSE;
+                if (name[i] == '/' || name[i] == '#')
                         return FALSE;
         }
 
--
cgit v0.9.0.2-2-gbebe