[SCM] Samba Shared Repository - branch v3-6-test updated

[Karolin Seeger]

The branch, v3-6-test has been updated
       via  bc602ad Fix bug #8157 - std_pcap_cache_reload() fails to parse a 
cups printcap file correctly.
      from  ccab9ef Patch for bug #8156 - net ads join fails to use the user's 
kerberos ticket.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -----------------------------------------------------------------
commit bc602ad464291380d4dea007668d453439467cc4
Author: Jeremy Allison <j...@samba.org>
Date:   Fri May 20 12:27:02 2011 -0700

    Fix bug #8157 - std_pcap_cache_reload() fails to parse a cups printcap file 
correctly.
    
    The parsing code made some strange assumptions about what is a printer
    name, and what is a comment.

-----------------------------------------------------------------------

Summary of changes:
 source3/printing/print_standard.c |   13 +++++--------
 1 files changed, 5 insertions(+), 8 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/printing/print_standard.c 
b/source3/printing/print_standard.c
index 6a86d84..c4f9c5b 100644
--- a/source3/printing/print_standard.c
+++ b/source3/printing/print_standard.c
@@ -93,6 +93,10 @@ bool std_pcap_cache_reload(const char *pcap_name)
 
                        has_punctuation = (strchr_m(p, ' ') ||
                                           strchr_m(p, '\t') ||
+                                          strchr_m(p, '"') ||
+                                          strchr_m(p, '\'') ||
+                                          strchr_m(p, ';') ||
+                                          strchr_m(p, ',') ||
                                           strchr_m(p, '(') ||
                                           strchr_m(p, ')'));
 
@@ -101,11 +105,7 @@ bool std_pcap_cache_reload(const char *pcap_name)
                                continue;
                        }
 
-                       if (strlen(p) <= MAXPRINTERLEN &&
-                           strlen(p) > strlen(name) && !has_punctuation) {
-                               if (!*comment) {
-                                       strlcpy(comment, name, sizeof(comment));
-                               }
+                       if (strlen(p) <= MAXPRINTERLEN && *name == '\0' && 
!has_punctuation) {
                                strlcpy(name, p, sizeof(name));
                                continue;
                        }
@@ -117,9 +117,6 @@ bool std_pcap_cache_reload(const char *pcap_name)
                        }
                }
 
-               comment[60] = 0;
-               name[MAXPRINTERLEN] = 0;
-
                if (*name && !pcap_cache_add(name, comment, NULL)) {
                        x_fclose(pcap_file);
                        return false;


-- 
Samba Shared Repository