The branch, master has been updated
via 348b4b9... Make pcap headers private
via f36396f... Move standard printcap parsing to print_standard.c
from 566418f... ntprinting: add ntprinting.idl.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 348b4b9bab0cd0f87860441218658802e8aba410
Author: Simo Sorce <[email protected]>
Date: Thu May 13 16:24:35 2010 -0400
Make pcap headers private
Signed-off-by: Günther Deschner <[email protected]>
commit f36396f90f925ff1f41e6e58c0a51245eab21784
Author: Simo Sorce <[email protected]>
Date: Thu May 13 14:23:23 2010 -0400
Move standard printcap parsing to print_standard.c
Signed-off-by: Günther Deschner <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
source3/Makefile.in | 2 +-
source3/include/proto.h | 30 ---------
source3/include/smb.h | 1 -
source3/printing/load.c | 1 +
source3/printing/nt_printing.c | 1 +
source3/printing/pcap.c | 95 +--------------------------
source3/printing/pcap.h | 52 +++++++++++++++
source3/printing/print_aix.c | 1 +
source3/printing/print_cups.c | 1 +
source3/printing/print_iprint.c | 1 +
source3/printing/print_standard.c | 130 +++++++++++++++++++++++++++++++++++++
source3/printing/print_svid.c | 1 +
12 files changed, 191 insertions(+), 125 deletions(-)
create mode 100644 source3/printing/pcap.h
create mode 100644 source3/printing/print_standard.c
Changeset truncated at 500 lines:
diff --git a/source3/Makefile.in b/source3/Makefile.in
index d661b94..968e5ba 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -831,7 +831,7 @@ SMBD_OBJ_BASE = $(PARAM_WITHOUT_REG_OBJ) $(SMBD_OBJ_SRV)
$(LIBSMB_OBJ) \
PRINTING_OBJ = printing/pcap.o printing/print_svid.o printing/print_aix.o \
printing/print_cups.o printing/print_generic.o \
printing/lpq_parse.o printing/load.o \
- printing/print_iprint.o
+ printing/print_iprint.o printing/print_standard.o
PRINTBASE_OBJ = printing/notify.o printing/printing_db.o
PRINTBACKEND_OBJ = printing/printing.o printing/nt_printing.o $(PRINTBASE_OBJ)
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 0d0864e..91b6bd9 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -4895,38 +4895,8 @@ char* get_server_name( Printer_entry *printer );
/* The following definitions come from printing/pcap.c */
-bool pcap_cache_add_specific(struct pcap_cache **ppcache, const char *name,
const char *comment);
-void pcap_cache_destroy_specific(struct pcap_cache **ppcache);
-bool pcap_cache_add(const char *name, const char *comment);
-bool pcap_cache_loaded(void);
-void pcap_cache_replace(const struct pcap_cache *cache);
void pcap_cache_reload(void);
bool pcap_printername_ok(const char *printername);
-void pcap_printer_fn_specific(const struct pcap_cache *, void (*fn)(const char
*, const char *, void *), void *);
-void pcap_printer_fn(void (*fn)(const char *, const char *, void *), void *);
-
-/* The following definitions come from printing/print_aix.c */
-
-bool aix_cache_reload(void);
-
-/* The following definitions come from printing/print_cups.c */
-
-bool cups_cache_reload(void);
-bool cups_pull_comment_location(TALLOC_CTX *mem_ctx,
- const char *printername,
- char **comment,
- char **location);
-
-/* The following definitions come from printing/print_generic.c */
-
-
-/* The following definitions come from printing/print_iprint.c */
-
-bool iprint_cache_reload(void);
-
-/* The following definitions come from printing/print_svid.c */
-
-bool sysv_cache_reload(void);
/* The following definitions come from printing/printfsp.c */
diff --git a/source3/include/smb.h b/source3/include/smb.h
index f8ec5d4..e1ec21f 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -334,7 +334,6 @@ struct idle_event;
struct share_mode_entry;
struct uuid;
struct named_mutex;
-struct pcap_cache;
struct wb_context;
struct rpc_cli_smbd_conn;
struct fncall_context;
diff --git a/source3/printing/load.c b/source3/printing/load.c
index fc21f27..d440a22 100644
--- a/source3/printing/load.c
+++ b/source3/printing/load.c
@@ -18,6 +18,7 @@
*/
#include "includes.h"
+#include "pcap.h"
/***************************************************************************
diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
index d59e3c5..a8bc577 100644
--- a/source3/printing/nt_printing.c
+++ b/source3/printing/nt_printing.c
@@ -21,6 +21,7 @@
#include "includes.h"
#include "librpc/gen_ndr/messaging.h"
+#include "printing/pcap.h"
static TDB_CONTEXT *tdb_forms; /* used for forms files */
static TDB_CONTEXT *tdb_drivers; /* used for driver files */
diff --git a/source3/printing/pcap.c b/source3/printing/pcap.c
index a6bf52a..2b1ab63 100644
--- a/source3/printing/pcap.c
+++ b/source3/printing/pcap.c
@@ -26,30 +26,6 @@
*/
/*
- * 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.
*
@@ -61,7 +37,7 @@
*/
#include "includes.h"
-
+#include "pcap.h"
struct pcap_cache {
char *name;
@@ -130,8 +106,6 @@ void pcap_cache_reload(void)
const char *pcap_name = lp_printcapname();
bool pcap_reloaded = False;
struct pcap_cache *tmp_cache = NULL;
- XFILE *pcap_file;
- char *pcap_line;
DEBUG(3, ("reloading printcap cache\n"));
@@ -172,72 +146,7 @@ void pcap_cache_reload(void)
}
#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, ')'));
-
- if (strlen(p) > strlen(comment) && has_punctuation) {
- strlcpy(comment, p, sizeof(comment));
- 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));
- continue;
- }
- }
-
- comment[60] = 0;
- name[MAXPRINTERLEN] = 0;
-
- 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"));
diff --git a/source3/printing/pcap.h b/source3/printing/pcap.h
new file mode 100644
index 0000000..47abc0f
--- /dev/null
+++ b/source3/printing/pcap.h
@@ -0,0 +1,52 @@
+/*
+ Unix SMB/CIFS implementation.
+ printcap headers
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+struct pcap_cache;
+
+/* The following definitions come from printing/pcap.c */
+
+bool pcap_cache_add_specific(struct pcap_cache **ppcache, const char *name,
const char *comment);
+void pcap_cache_destroy_specific(struct pcap_cache **ppcache);
+bool pcap_cache_add(const char *name, const char *comment);
+bool pcap_cache_loaded(void);
+void pcap_cache_replace(const struct pcap_cache *cache);
+void pcap_printer_fn_specific(const struct pcap_cache *, void (*fn)(const char
*, const char *, void *), void *);
+void pcap_printer_fn(void (*fn)(const char *, const char *, void *), void *);
+
+/* The following definitions come from printing/print_aix.c */
+
+bool aix_cache_reload(void);
+
+/* The following definitions come from printing/print_cups.c */
+
+bool cups_cache_reload(void);
+bool cups_pull_comment_location(TALLOC_CTX *mem_ctx,
+ const char *printername,
+ char **comment,
+ char **location);
+
+/* The following definitions come from printing/print_iprint.c */
+
+bool iprint_cache_reload(void);
+
+/* The following definitions come from printing/print_svid.c */
+
+bool sysv_cache_reload(void);
+
+/* The following definitions come from printing/print_standard.c */
+bool std_pcap_cache_reload(const char *pcap_name);
diff --git a/source3/printing/print_aix.c b/source3/printing/print_aix.c
index 523be77..dbdfbc7 100644
--- a/source3/printing/print_aix.c
+++ b/source3/printing/print_aix.c
@@ -25,6 +25,7 @@
*/
#include "includes.h"
+#include "pcap.h"
#ifdef AIX
bool aix_cache_reload(void)
diff --git a/source3/printing/print_cups.c b/source3/printing/print_cups.c
index 6735f14..1db0518 100644
--- a/source3/printing/print_cups.c
+++ b/source3/printing/print_cups.c
@@ -24,6 +24,7 @@
#include "includes.h"
#include "printing.h"
+#include "pcap.h"
#ifdef HAVE_CUPS
#include <cups/cups.h>
diff --git a/source3/printing/print_iprint.c b/source3/printing/print_iprint.c
index b038f8d..4f483d9 100644
--- a/source3/printing/print_iprint.c
+++ b/source3/printing/print_iprint.c
@@ -21,6 +21,7 @@
#include "includes.h"
#include "printing.h"
+#include "pcap.h"
#ifdef HAVE_IPRINT
#include <cups/cups.h>
diff --git a/source3/printing/print_standard.c
b/source3/printing/print_standard.c
new file mode 100644
index 0000000..9945699
--- /dev/null
+++ b/source3/printing/print_standard.c
@@ -0,0 +1,130 @@
+/*
+ Unix SMB/CIFS implementation.
+ printcap parsing
+ Copyright (C) Karl Auer 1993-1998
+
+ Re-working by Martin Kiff, 1994
+
+ Re-written again by Andrew Tridgell
+
+ Modified for SVID support by Norm Jacobs, 1997
+
+ Modified for CUPS support by Michael Sweet, 1999
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+ * 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.
+ */
+
+/* printcap parsing specific code moved here from printing/pcap.c */
+
+
+#include "includes.h"
+#include "pcap.h"
+
+/* handle standard printcap - moved from pcap_printer_fn() */
+bool std_pcap_cache_reload(const char *pcap_name)
+{
+ XFILE *pcap_file;
+ char *pcap_line;
+
+ if ((pcap_file = x_fopen(pcap_name, O_RDONLY, 0)) == NULL) {
+ DEBUG(0, ("Unable to open printcap file %s for read!\n",
pcap_name));
+ return false;
+ }
+
+ 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, ')'));
+
+ if (strlen(p) > strlen(comment) && has_punctuation) {
+ strlcpy(comment, p, sizeof(comment));
+ 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));
+ continue;
+ }
+ }
+
+ comment[60] = 0;
+ name[MAXPRINTERLEN] = 0;
+
+ if (*name && !pcap_cache_add(name, comment)) {
+ x_fclose(pcap_file);
+ return false;
+ }
+ }
+
+ x_fclose(pcap_file);
+ return true;
+}
diff --git a/source3/printing/print_svid.c b/source3/printing/print_svid.c
index 681b2bf..4d4e92e 100644
--- a/source3/printing/print_svid.c
+++ b/source3/printing/print_svid.c
@@ -32,6 +32,7 @@
#include "includes.h"
+#include "pcap.h"
#if defined(SYSV) || defined(HPUX)
bool sysv_cache_reload(void)
--
Samba Shared Repository
