Getting ready for first Red Hat Linux RPMs for 1.9.19 pre-alpha release

(This used to be commit 4e424d0ba652bf9c5dfd3c44216b6145538cf821)

diff --git a/source3/include/local.h b/source3/include/local.h
index 9a62aa7eb3fb9fb89f2f1fc5992cdd6a08a75be2..144c2d2838b33598cf51bee12f410d1d312139cd 100644 (file)
--- a/source3/include/local.h
+++ b/source3/include/local.h
@@ -1,3 +1,6 @@
+/* Copyright (C) 1995-1998 Samba-Team */
+/* Copyright (C) 1998 John H Terpstra <jht@aquasoft.com.au> */
+
 /* local definitions for file server */
 #ifndef _LOCAL_H
 #define _LOCAL_H
@@ -17,6 +20,11 @@
    refer to the special "printers" service */
 #define PRINTERS_NAME "printers"
 
+/* Yves Gaige <yvesg@hptnodur.grenoble.hp.com> requested this set this              */
+/* to a maximum of 8 if old smb clients break because of long printer names. */
+#define MAXPRINTERLEN 15
+
+
 /* define what facility to use for syslog */
 #ifndef SYSLOG_FACILITY
 #define SYSLOG_FACILITY LOG_DAEMON

diff --git a/source3/include/smb.h b/source3/include/smb.h
index f0cdf9f356f64591347f2ea89cb358419d0cf888..0acc5cbfa340f79981fe8a7a8f80de20ec278186 100644 (file)
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -24,9 +24,6 @@
 #ifndef _SMB_H
 #define _SMB_H
 
-/* Yves Gaige <yvesg@hptnodur.grenoble.hp.com> requested this */
-#define MAXPRINTERLEN 15
-
 #define BUFFER_SIZE (0xFFFF)
 #define SAFETY_MARGIN 1024
 

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index 065c524cb86c730364ea9ba1b9cd021f5e90570b..a1aa4d753dc96e79b0a36ada7d6dba54d167dbf6 100644 (file)
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -26,7 +26,7 @@
 /* set the expiry on fixed pages */
 #define EXPIRY_TIME (60*60*24*7)
 
-#define CGI_LOGGING 1
+#define CGI_LOGGING 0
 
 #ifdef DEBUG_COMMENTS
 extern void print_title(char *fmt, ...);

diff --git a/swat/README b/swat/README
index 65efba9b0aaade691e070c56a867fe453a878ab4..2810e4e086a80bab92ad6ca88fd651a9abc3d9ac 100644 (file)
--- a/swat/README
+++ b/swat/README
@@ -36,9 +36,9 @@ details of your inetd daemon).
 
 In /etc/inetd.conf you should add a line like this:
 
-swat    stream  tcp     nowait  root    /usr/local/samba/bin/swat swat
+swat    stream  tcp     nowait.400  root    /usr/local/samba/bin/swat swat
 
-If you just want to see a demo of ho swat works and don't want to be
+If you just want to see a demo of how swat works and don't want to be
 able to actually change any Samba config via swat then you may chose
 to change "root" to some other user that does not have permission to
 write to smb.conf.