summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>1997-12-03 05:08:07 +0000
committerAndrew Tridgell <tridge@samba.org>1997-12-03 05:08:07 +0000
commit7a668a7641cd747455b7a9854dbc208a3e4bc7ef (patch)
tree337d3570bd8160d93ee74c2e3ff139be0db9e4d9 /source3
parent02bc90ea442f5d115df17de0ebd0bbfdf214c1a5 (diff)
downloadsamba-7a668a7641cd747455b7a9854dbc208a3e4bc7ef.tar.gz
samba-7a668a7641cd747455b7a9854dbc208a3e4bc7ef.tar.bz2
samba-7a668a7641cd747455b7a9854dbc208a3e4bc7ef.zip
applied a patch from Norm Jacobs to allow "printcap name = lpstat"
to use lpstat to obtain the printer list on systemV systems. I've now made this the default on all SYSV systems. Jeremy, you were a little worried about the security of this patch. I believe it's OK as the user has no control over the options given to popen() and the pipe is only open for reading. (This used to be commit 6a83de0ae954bb18d3f15382f2b0b3259fedff09)
Diffstat (limited to 'source3')
-rw-r--r--source3/include/local.h9
-rw-r--r--source3/param/loadparm.c8
-rw-r--r--source3/printing/pcap.c21
-rw-r--r--source3/printing/print_svid.c121
4 files changed, 150 insertions, 9 deletions
diff --git a/source3/include/local.h b/source3/include/local.h
index ca8d231dcd..c4bdcc80d5 100644
--- a/source3/include/local.h
+++ b/source3/include/local.h
@@ -23,7 +23,16 @@
printcap file is a quick-n-dirty way to allow dynamic access to a subset
of available printers.
*/
+
+#ifndef PRINTCAP_NAME
+#ifdef AIX
+#define PRINTCAP_NAME "/etc/qconfig"
+#elif defined(SYSV)
+#define PRINTCAP_NAME "lpstat"
+#else
#define PRINTCAP_NAME "/etc/printcap"
+#endif
+#endif
/* this affects server level security. With this set (recommended)
samba will do a full NetWkstaUserLogon to confirm that the client
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index abb3496f4e..a8e70717b6 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -64,14 +64,6 @@ extern pstring myname;
#define GLOBAL_NAME "global"
#endif
-#ifndef PRINTCAP_NAME
-#ifdef AIX
-#define PRINTCAP_NAME "/etc/qconfig"
-#else
-#define PRINTCAP_NAME "/etc/printcap"
-#endif
-#endif
-
#ifndef PRINTERS_NAME
#define PRINTERS_NAME "printers"
#endif
diff --git a/source3/printing/pcap.c b/source3/printing/pcap.c
index 65195ab1af..ff0a2b5477 100644
--- a/source3/printing/pcap.c
+++ b/source3/printing/pcap.c
@@ -7,6 +7,8 @@
Re-working by Martin Kiff, 1994
Re-written again by Andrew Tridgell
+
+ Modified for SVID support by Norm Jacobs, 1997
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
@@ -49,6 +51,9 @@
* 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.
*/
#include "includes.h"
@@ -255,10 +260,17 @@ BOOL pcap_printername_ok(char *pszPrintername, char *pszPrintcapname)
DEBUG(0,( "No printcap file name configured!\n"));
return(False);
}
+
+#ifdef SYSV
+ if (strequal(psz, "lpstat"))
+ return (sysv_printername_ok(pszPrintername));
+#endif
+
#ifdef AIX
if (strlocate(psz,"/qconfig") != NULL)
return(ScanQconfig(psz,pszPrintername));
#endif
+
if ((pfile = fopen(psz, "r")) == NULL)
{
DEBUG(0,( "Unable to open printcap file %s for read!\n", psz));
@@ -292,7 +304,6 @@ BOOL pcap_printername_ok(char *pszPrintername, char *pszPrintcapname)
}
}
-
fclose(pfile);
return(False);
}
@@ -317,6 +328,13 @@ void pcap_printer_fn(void (*fn)())
return;
}
+#ifdef SYSV
+ if (strequal(psz, "lpstat")) {
+ sysv_printer_fn(fn);
+ return;
+ }
+#endif
+
#ifdef AIX
if (strlocate(psz,"/qconfig") != NULL)
{
@@ -324,6 +342,7 @@ void pcap_printer_fn(void (*fn)())
return;
}
#endif
+
if ((pfile = fopen(psz, "r")) == NULL)
{
DEBUG(0,( "Unable to open printcap file %s for read!\n", psz));
diff --git a/source3/printing/print_svid.c b/source3/printing/print_svid.c
new file mode 100644
index 0000000000..5b98036e08
--- /dev/null
+++ b/source3/printing/print_svid.c
@@ -0,0 +1,121 @@
+/*
+ * Copyright (C) 1997 by Norm Jacobs, Colorado Springs, Colorado, USA
+ * Copyright (C) 1997 by Sun Microsystem, Inc.
+ * All Rights Reserved
+ *
+ * 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 2 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, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+/*
+ * This module implements support for gathering and comparing available
+ * printer information on a SVID or XPG4 compliant system. It does this
+ * through the use of the SVID/XPG4 command "lpstat(1)".
+ *
+ * The expectations is that execution of the command "lpstat -v" will
+ * generate responses in the form of:
+ *
+ * device for serial: /dev/term/b
+ * system for fax: server
+ * system for color: server (as printer chroma)
+ */
+
+
+#include "includes.h"
+#include "smb.h"
+
+#ifdef SYSV
+
+extern int DEBUGLEVEL;
+
+typedef struct printer {
+ char *name;
+ struct printer *next;
+} printer_t;
+static printer_t *printers = NULL;
+
+static void populate_printers()
+{
+ FILE *fp;
+
+ if ((fp = popen("/usr/bin/lpstat -v", "r")) != NULL) {
+ char buf[BUFSIZ];
+
+ while (fgets(buf, sizeof (buf), fp) != NULL) {
+ printer_t *ptmp;
+ char *name, *tmp;
+
+ /* eat "system/device for " */
+ if (((tmp = strchr(buf, ' ')) == NULL) ||
+ ((tmp = strchr(++tmp, ' ')) == NULL))
+ continue;
+ name = tmp++;
+
+ /* truncate the ": ..." */
+ if ((tmp = strchr(name, ':')) != NULL)
+ *tmp = NULL;
+
+ /* add it to the cache */
+ if ((ptmp = malloc(sizeof (*ptmp))) != NULL) {
+ memset(ptmp, NULL, sizeof (*ptmp));
+ ptmp->name = strdup(name);
+ ptmp->next = printers;
+ printers = ptmp;
+ }
+ }
+ pclose(fp);
+ } else {
+ DEBUG(0,( "Unable to run lpstat!\n"));
+ }
+}
+
+
+/*
+ * provide the equivalent of pcap_printer_fn() for SVID/XPG4 conforming
+ * systems. It was unclear why pcap_printer_fn() was tossing names longer
+ * than 8 characters. I suspect that its a protocol limit, but amazingly
+ * names longer than 8 characters appear to work with my test
+ * clients (Win95/NT).
+ */
+void sysv_printer_fn(void (*fn)())
+{
+ printer_t *tmp;
+
+ if (printers == NULL)
+ populate_printers();
+ for (tmp = printers; tmp != NULL; tmp = tmp->next)
+ (fn)(tmp->name, "");
+}
+
+
+/*
+ * provide the equivalent of pcap_printername_ok() for SVID/XPG4 conforming
+ * systems.
+ */
+int sysv_printername_ok(char *name)
+{
+ printer_t *tmp;
+
+ if (printers == NULL)
+ populate_printers();
+ for (tmp = printers; tmp != NULL; tmp = tmp->next)
+ if (strcmp(tmp->name, name) == 0)
+ return (True);
+ return (False);
+}
+
+#else
+/* this keeps fussy compilers happy */
+ void print_svid_dummy(void) {}
+#endif