Changeset 597 for vendor/current/source3/printing/pcap.c

Timestamp:

Jul 2, 2011, 4:01:14 PM (14 years ago)

Author:

Herwig Bauernfeind

Message:

Samba 3.5: Update vendor to version 3.5.9

File:

• vendor/current/source3/printing/pcap.c (modified) (7 diffs)

vendor/current/source3/printing/pcap.c

@@ -126 +126 @@
 }
 
-void pcap_cache_reload(void)
+void pcap_cache_reload(void (*post_cache_fill_fn)(void))
 {
         const char *pcap_name = lp_printcapname();
@@ -133 +133 @@
         XFILE *pcap_file;
         char *pcap_line;
+        bool post_cache_fill_fn_handled = false;
 
         DEBUG(3, ("reloading printcap cache\n"));
@@ -147 +148 @@
 #ifdef HAVE_CUPS
         if (strequal(pcap_name, "cups")) {
-                pcap_reloaded = cups_cache_reload();
+                pcap_reloaded = cups_cache_reload(post_cache_fill_fn);
+                /*
+                 * cups_cache_reload() is async and calls post_cache_fill_fn()
+                 * on successful completion
+                 */
+                post_cache_fill_fn_handled = true;
                 goto done;
         }
@@ -204 +210 @@
                         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, ')'));
@@ -212 +222 @@
                         }
 
-                        if (strlen(p) <= MAXPRINTERLEN &&
-                            strlen(p) > strlen(name) && !has_punctuation) {
+                        if (strlen(p) <= MAXPRINTERLEN && *name == '\0' && !has_punctuation) {
                                 if (!*comment) {
                                         strlcpy(comment, name, sizeof(comment));
@@ -228 +237 @@
                 }
 
-                comment[60] = 0;
-                name[MAXPRINTERLEN] = 0;
-
                 if (*name && !pcap_cache_add(name, comment)) {
                         x_fclose(pcap_file);
@@ -243 +249 @@
         DEBUG(3, ("reload status: %s\n", (pcap_reloaded) ? "ok" : "error"));
 
-        if (pcap_reloaded)
+        if (pcap_reloaded) {
                 pcap_cache_destroy_specific(&tmp_cache);
-        else {
+                if ((post_cache_fill_fn_handled == false)
+                 && (post_cache_fill_fn != NULL)) {
+                        post_cache_fill_fn();
+                }
+        } else {
                 pcap_cache_destroy_specific(&pcap_cache);
                 pcap_cache = tmp_cache;