s3:pylibsmb: remember that a connection uses SMB1

[samba.git] / source3 / printing / print_standard.c

diff --git a/source3/printing/print_standard.c b/source3/printing/print_standard.c
index 6a86d84b1e225e5df9f474ce5a1e0dd9fa343773..7cbdac7b2572f9d2aa4a6f33579ee168ecd6d1c9 100644 (file)
--- a/source3/printing/print_standard.c
+++ b/source3/printing/print_standard.c
@@ -59,23 +59,30 @@
 #include "printing/pcap.h"
 
 /* handle standard printcap - moved from pcap_printer_fn() */
-bool std_pcap_cache_reload(const char *pcap_name)
+bool std_pcap_cache_reload(const char *pcap_name, struct pcap_cache **_pcache)
 {
-       XFILE *pcap_file;
+       TALLOC_CTX *frame = talloc_stackframe();
+       FILE *pcap_file;
        char *pcap_line;
+       struct pcap_cache *pcache = NULL;
+       bool print_warning = false;
 
-       if ((pcap_file = x_fopen(pcap_name, O_RDONLY, 0)) == NULL) {
+       if ((pcap_file = fopen(pcap_name, "r")) == NULL) {
                DEBUG(0, ("Unable to open printcap file %s for read!\n", pcap_name));
+               talloc_free(frame);
                return false;
        }
 
-       for (; (pcap_line = fgets_slash(NULL, 1024, pcap_file)) != NULL; free(pcap_line)) {
-               char name[MAXPRINTERLEN+1];
-               char comment[62];
+       while ((pcap_line = fgets_slash(frame, NULL, 1024,
+                                       pcap_file)) != NULL) {
+               char *name = NULL;
+               char *comment = NULL;
                char *p, *q;
 
-               if (*pcap_line == '#' || *pcap_line == 0)
+               if (*pcap_line == '#' || *pcap_line == 0) {
+                       TALLOC_FREE(pcap_line);
                        continue;
+               }
 
                /* now we have a real printer line - cut at the first : */
                if ((p = strchr_m(pcap_line, ':')) != NULL)
@@ -85,47 +92,66 @@ bool std_pcap_cache_reload(const char *pcap_name)
                 * now find the most likely printer name and comment
                 * this is pure guesswork, but it's better than nothing
                 */
-               for (*name = *comment = 0, p = pcap_line; p != NULL; p = q) {
-                       bool has_punctuation;
+               for (p = pcap_line; p != NULL; p = q) {
+                       bool has_punctuation = false;
 
                        if ((q = strchr_m(p, '|')) != NULL)
                                *q++ = 0;
 
                        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, ')'));
 
-                       if (strlen(p) > strlen(comment) && has_punctuation) {
-                               strlcpy(comment, p, sizeof(comment));
+                       if (name == NULL && !has_punctuation) {
+                               name = talloc_strdup(frame, p);
+                               TALLOC_FREE(pcap_line);
                                continue;
                        }
 
-                       if (strlen(p) <= MAXPRINTERLEN &&
-                           strlen(p) > strlen(name) && !has_punctuation) {
-                               if (!*comment) {
-                                       strlcpy(comment, name, sizeof(comment));
-                               }
-                               strlcpy(name, p, sizeof(name));
-                               continue;
-                       }
-
-                       if (!strchr_m(comment, ' ') &&
-                           strlen(p) > strlen(comment)) {
-                               strlcpy(comment, p, sizeof(comment));
+                       if (has_punctuation) {
+                               comment = talloc_strdup(frame, p);
+                               TALLOC_FREE(pcap_line);
                                continue;
                        }
                }
 
-               comment[60] = 0;
-               name[MAXPRINTERLEN] = 0;
+               if (name != NULL) {
+                       bool ok;
 
-               if (*name && !pcap_cache_add(name, comment, NULL)) {
-                       x_fclose(pcap_file);
-                       return false;
+                       if (!print_warning && strlen(name) > MAXPRINTERLEN) {
+                               print_warning = true;
+                       }
+
+                       ok = pcap_cache_add_specific(&pcache,
+                                                    name,
+                                                    comment,
+                                                    NULL);
+                       if (!ok) {
+                               fclose(pcap_file);
+                               pcap_cache_destroy_specific(&pcache);
+                               talloc_free(frame);
+                               return false;
+                       }
                }
+               TALLOC_FREE(name);
+               TALLOC_FREE(comment);
+               TALLOC_FREE(pcap_line);
+       }
+
+       if (print_warning) {
+               DBG_WARNING("WARNING: You have some printer names that are "
+                           "longer than %u characters. These may not be "
+                           "accessible to some older clients!\n",
+                           (unsigned int)MAXPRINTERLEN);
        }
 
-       x_fclose(pcap_file);
+       fclose(pcap_file);
+       *_pcache = pcache;
+       talloc_free(frame);
        return true;
 }