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

Timestamp:

Nov 14, 2012, 12:59:34 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to 3.6.0

File:

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

vendor/current/source3/printing/pcap.c

@@ -27 +27 @@
 
 /*
- *  This module contains code to parse and cache printcap data, possibly
- *  in concert with the CUPS/SYSV/AIX-specific code found elsewhere.
- *
- *  The way this module looks at the printcap file is very simplistic.
- *  Only the local printcap file is inspected (no searching of NIS
- *  databases etc).
- *
- *  There are assumed to be one or more printer names per record, held
- *  as a set of sub-fields separated by vertical bar symbols ('|') in the
- *  first field of the record. The field separator is assumed to be a colon
- *  ':' and the record separator a newline.
- * 
- *  Lines ending with a backspace '\' are assumed to flag that the following
- *  line is a continuation line so that a set of lines can be read as one
- *  printcap entry.
- *
- *  A line stating with a hash '#' is assumed to be a comment and is ignored
- *  Comments are discarded before the record is strung together from the
- *  set of continuation lines.
- *
- *  Opening a pipe for "lpc status" and reading that would probably 
- *  be pretty effective. Code to do this already exists in the freely
- *  distributable PCNFS server code.
- *
  *  Modified to call SVID/XPG4 support if printcap name is set to "lpstat"
  *  in smb.conf under Solaris.
@@ -62 +38 @@
 
 #include "includes.h"
-
+#include "printing/pcap.h"
+#include "printer_list.h"
 
 struct pcap_cache {
         char *name;
         char *comment;
+        char *location;
         struct pcap_cache *next;
 };
 
-/* The systemwide printcap cache. */
-static struct pcap_cache *pcap_cache = NULL;
-
-bool pcap_cache_add_specific(struct pcap_cache **ppcache, const char *name, const char *comment)
+bool pcap_cache_add_specific(struct pcap_cache **ppcache, const char *name, const char *comment, const char *location)
 {
         struct pcap_cache *p;
@@ -82 +57 @@
         p->name = SMB_STRDUP(name);
         p->comment = (comment && *comment) ? SMB_STRDUP(comment) : NULL;
-
-        DEBUG(11,("pcap_cache_add_specific: Adding name %s info %s\n",
-                p->name, p->comment ? p->comment : ""));
+        p->location = (location && *location) ? SMB_STRDUP(location) : NULL;
+
+        DEBUG(11,("pcap_cache_add_specific: Adding name %s info %s, location: %s\n",
+                p->name, p->comment ? p->comment : "",
+                p->location ? p->location : ""));
 
         p->next = *ppcache;
@@ -101 +78 @@
                 SAFE_FREE(p->name);
                 SAFE_FREE(p->comment);
+                SAFE_FREE(p->location);
                 SAFE_FREE(p);
         }
@@ -106 +84 @@
 }
 
-bool pcap_cache_add(const char *name, const char *comment)
-{
-        return pcap_cache_add_specific(&pcap_cache, name, comment);
+bool pcap_cache_add(const char *name, const char *comment, const char *location)
+{
+        NTSTATUS status;
+        time_t t = time_mono(NULL);
+
+        status = printer_list_set_printer(talloc_tos(), name, comment, location, t);
+        return NT_STATUS_IS_OK(status);
 }
 
 bool pcap_cache_loaded(void)
 {
-        return (pcap_cache != NULL);
-}
-
-void pcap_cache_replace(const struct pcap_cache *pcache)
+        NTSTATUS status;
+        time_t last;
+
+        status = printer_list_get_last_refresh(&last);
+        return NT_STATUS_IS_OK(status);
+}
+
+bool pcap_cache_replace(const struct pcap_cache *pcache)
 {
         const struct pcap_cache *p;
-
-        pcap_cache_destroy_specific(&pcap_cache);
+        NTSTATUS status;
+
+        status = printer_list_mark_reload();
+        if (!NT_STATUS_IS_OK(status)) {
+                DEBUG(0, ("Failed to mark printer list for reload!\n"));
+                return false;
+        }
+
         for (p = pcache; p; p = p->next) {
-                pcap_cache_add(p->name, p->comment);
-        }
-}
-
-void pcap_cache_reload(void (*post_cache_fill_fn)(void))
+                pcap_cache_add(p->name, p->comment, p->location);
+        }
+
+        status = printer_list_clean_old();
+        if (!NT_STATUS_IS_OK(status)) {
+                DEBUG(0, ("Failed to cleanup printer list!\n"));
+                return false;
+        }
+
+        return true;
+}
+
+void pcap_cache_reload(struct tevent_context *ev,
+                       struct messaging_context *msg_ctx,
+                       void (*post_cache_fill_fn)(struct tevent_context *,
+                                                  struct messaging_context *))
 {
         const char *pcap_name = lp_printcapname();
         bool pcap_reloaded = False;
-        struct pcap_cache *tmp_cache = NULL;
-        XFILE *pcap_file;
-        char *pcap_line;
+        NTSTATUS status;
         bool post_cache_fill_fn_handled = false;
 
@@ -143 +144 @@
         }
 
-        tmp_cache = pcap_cache;
-        pcap_cache = NULL;
+        status = printer_list_mark_reload();
+        if (!NT_STATUS_IS_OK(status)) {
+                DEBUG(0, ("Failed to mark printer list for reload!\n"));
+                return;
+        }
 
 #ifdef HAVE_CUPS
         if (strequal(pcap_name, "cups")) {
-                pcap_reloaded = cups_cache_reload(post_cache_fill_fn);
+                pcap_reloaded = cups_cache_reload(ev, msg_ctx,
+                                                  post_cache_fill_fn);
                 /*
                  * cups_cache_reload() is async and calls post_cache_fill_fn()
@@ -179 +184 @@
 #endif
 
-        /* handle standard printcap - moved from pcap_printer_fn() */
-
-        if ((pcap_file = x_fopen(pcap_name, O_RDONLY, 0)) == NULL) {
-                DEBUG(0, ("Unable to open printcap file %s for read!\n", pcap_name));
-                goto done;
-        }
-
-        for (; (pcap_line = fgets_slash(NULL, 1024, pcap_file)) != NULL; free(pcap_line)) {
-                char name[MAXPRINTERLEN+1];
-                char comment[62];
-                char *p, *q;
-
-                if (*pcap_line == '#' || *pcap_line == 0)
-                        continue;
-
-                /* now we have a real printer line - cut at the first : */      
-                if ((p = strchr_m(pcap_line, ':')) != NULL)
-                        *p = 0;
-      
-                /*
-                 * 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;
-
-                        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));
-                                continue;
-                        }
-
-                        if (strlen(p) <= MAXPRINTERLEN && *name == '\0' && !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));
-                                continue;
-                        }
-                }
-
-                if (*name && !pcap_cache_add(name, comment)) {
-                        x_fclose(pcap_file);
-                        goto done;
-                }
-        }
-
-        x_fclose(pcap_file);
-        pcap_reloaded = True;
+        pcap_reloaded = std_pcap_cache_reload(pcap_name);
 
 done:
         DEBUG(3, ("reload status: %s\n", (pcap_reloaded) ? "ok" : "error"));
 
-        if (pcap_reloaded) {
-                pcap_cache_destroy_specific(&tmp_cache);
-                if ((post_cache_fill_fn_handled == false)
-                 && (post_cache_fill_fn != NULL)) {
-                        post_cache_fill_fn();
+        if ((pcap_reloaded) && (post_cache_fill_fn_handled == false)) {
+                /* cleanup old entries only if the operation was successful,
+                 * otherwise keep around the old entries until we can
+                 * successfuly reaload */
+                status = printer_list_clean_old();
+                if (!NT_STATUS_IS_OK(status)) {
+                        DEBUG(0, ("Failed to cleanup printer list!\n"));
                 }
-        } else {
-                pcap_cache_destroy_specific(&pcap_cache);
-                pcap_cache = tmp_cache;
+                if (post_cache_fill_fn != NULL) {
+                        post_cache_fill_fn(ev, msg_ctx);
+                }
         }
 
@@ -266 +208 @@
 bool pcap_printername_ok(const char *printername)
 {
-        struct pcap_cache *p;
-
-        for (p = pcap_cache; p != NULL; p = p->next)
-                if (strequal(p->name, printername))
-                        return True;
-
-        return False;
+        NTSTATUS status;
+
+        status = printer_list_get_printer(talloc_tos(), printername, NULL, NULL, 0);
+        return NT_STATUS_IS_OK(status);
 }
 
@@ -280 +219 @@
 
 void pcap_printer_fn_specific(const struct pcap_cache *pc,
-                        void (*fn)(const char *, const char *, void *),
+                        void (*fn)(const char *, const char *, const char *, void *),
                         void *pdata)
 {
@@ -286 +225 @@
 
         for (p = pc; p != NULL; p = p->next)
-                fn(p->name, p->comment, pdata);
+                fn(p->name, p->comment, p->location, pdata);
 
         return;
 }
 
-void pcap_printer_fn(void (*fn)(const char *, const char *, void *), void *pdata)
-{
-        pcap_printer_fn_specific(pcap_cache, fn, pdata);
-}
+void pcap_printer_fn(void (*fn)(const char *, const char *, const char *, void *), void *pdata)
+{
+        NTSTATUS status;
+
+        status = printer_list_run_fn(fn, pdata);
+        if (!NT_STATUS_IS_OK(status)) {
+                DEBUG(3, ("Failed to run fn for all printers!\n"));
+        }
+        return;
+}