summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>1998-11-17 00:31:39 +0000
committerJeremy Allison <jra@samba.org>1998-11-17 00:31:39 +0000
commitc1af0b40274752f85ba82f5a42426dbe3d3d890c (patch)
tree10c095bd4f286926ec3d4465f616eccd6e5e7482
parent3b4a9ff3809ee05a7f06c3eaddd1e5a6e35bfc49 (diff)
downloadsamba-c1af0b40274752f85ba82f5a42426dbe3d3d890c.tar.gz
samba-c1af0b40274752f85ba82f5a42426dbe3d3d890c.tar.bz2
samba-c1af0b40274752f85ba82f5a42426dbe3d3d890c.zip
Moved PRINTCAP_NAME from smb.h to includes to allow it to
be tuned per system type. Jeremy. (This used to be commit c1a3346547d887bfd2402a6b0bcc185680eb4470)
-rw-r--r--source3/include/includes.h3
-rw-r--r--source3/include/smb.h4
2 files changed, 3 insertions, 4 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h
index fc718961a9..24fb84c803 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -29,6 +29,7 @@
#ifdef AIX
#define DEFAULT_PRINTING PRINT_AIX
+#define PRINTCAP_NAME "/etc/qconfig"
#endif
#ifdef HPUX
@@ -543,8 +544,10 @@ extern int errno;
#ifndef DEFAULT_PRINTING
#ifdef SYSV
#define DEFAULT_PRINTING PRINT_SYSV
+#define PRINTCAP_NAME "lpstat"
#else
#define DEFAULT_PRINTING PRINT_BSD
+#define PRINTCAP_NAME "/etc/printcap"
#endif
#endif
diff --git a/source3/include/smb.h b/source3/include/smb.h
index 0f1683e3c9..0ffbcded13 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -54,10 +54,6 @@ typedef int BOOL;
#define DEF_CREATE_MASK (0755)
#endif
-#ifndef PRINTCAP_NAME
-#define PRINTCAP_NAME "/etc/printcap"
-#endif
-
/* how long to wait for secondary SMB packets (milli-seconds) */
#define SMB_SECONDARY_WAIT (60*1000)