- sequent-ptx support from bressler@iftccu.ca.boeing.com (Rick

Bressler)
- machten support from Trevor Strohman (trev@figment.tenon.com)

- added qinfo command to client as part of drag-and-drop printer
support for win95 from David Chappell <chappell@mouse.cc.trincoll.edu>
He also added the "printer driver" option

- use sigblock() on more systems and use sigsetmask(0) instead of
sigunblock() as its more portable. This beats a problem with zombies
on heavilily loaded systems.

- added internals.doc written by David Chappell into the source tree

- get rid of PRINT_COMMAND options from local.h as they are no longer
relevent

- new kanji code from Fujita

- don't set the recursion_available flag on queries in nmbd

- fix a potential bug with pointer subtraction in printing.c

- got rid of error_count code as the real fix (the EOF problem) is now
in
(This used to be commit aa6f8b04d125b5bc00f267abf72b800228aabf7d)

3 files changed, 11 insertions, 14 deletions

diff --git a/source3/include/includes.h b/source3/include/includes.h
index 56a63d46ae..bcf79ac79a 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -223,6 +223,7 @@ Here come some platform specific sections
 #define USE_SETSID
 #define HAVE_BZERO
 #define HAVE_MEMMOVE
+#define USE_SIGBLOCK
 #if _LINUX_C_LIB_VERSION_MAJOR >= 5
 #define USE_SETFS
 #endif
@@ -255,6 +256,7 @@ typedef unsigned short mode_t;
 #endif
 #define REPLACE_GETPASS
 #define BSD_TERMIO
+#define USE_SIGBLOCK
 #endif
 
 
@@ -288,6 +290,7 @@ extern int innetgr (const char *, const char *, const char *, const char *);
 #define USE_GETCWD
 #define USE_SETSID
 #define REPLACE_GETPASS
+#define USE_SIGBLOCK
 #endif
 
 
@@ -479,6 +482,7 @@ char *mktemp(char *); /* No standard include */
 #include <netinet/tcp.h>
 #define SYSV
 #define USE_WAITPID
+#define USE_SIGBLOCK
 #define SIGNAL_CAST (void (*)())
 #define DEFAULT_PRINTING PRINT_AIX
 /* we undef this because sys/param.h is broken in aix. uggh. */
@@ -529,7 +533,12 @@ char *mktemp(char *); /* No standard include */
 #define NO_EID
 #define STATFS4
 #define USE_DIRECT
+#ifdef PTX4
+#undef USE_DIRECT
 #endif
+#endif
+
+
 
 #ifdef SEQUENT_PTX4
 #include <string.h>
diff --git a/source3/include/local.h b/source3/include/local.h
index 2cfacd66b3..5a577909e1 100644
--- a/source3/include/local.h
+++ b/source3/include/local.h
@@ -53,17 +53,6 @@
 /* this is where browse lists are kept in the lock dir */
 #define SERVER_LIST "browse.dat"
 
-/* the print command on the server, %s is replaced with the filename  */
-/* note that the -r removes the file after printing - you'll run out  */
-/* of disk pretty quickly if you don't. This command is only used as  */
-/* the default - it can be overridden in the configuration file.      */
-#define PRINT_COMMAND "lpr -r %s"
-
-/* the lpq command on the server. the printername is passed as an argument */
-#ifndef LPQ_COMMAND
-#define LPQ_COMMAND "lpq -P"
-#endif
-
 /* shall guest entries in printer queues get changed to user entries,
    so they can be deleted using the windows print manager? */
 #define LPQ_GUEST_TO_USER
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 10f2bc3325..4d1c4bf6f9 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -194,6 +194,7 @@ char *lp_lprmcommand(int );
 char *lp_lppausecommand(int );
 char *lp_lpresumecommand(int );
 char *lp_printername(int );
+char *lp_printerdriver(int );
 char *lp_hostsallow(int );
 char *lp_hostsdeny(int );
 char *lp_magicscript(int );
@@ -313,9 +314,6 @@ struct browse_cache_record *add_browser_entry(char *name, int type, char *wg,
 					      time_t ttl, struct in_addr ip, BOOL local);
 void do_browser_lists(void);
 
-/*The following definitions come from  namedb.c  */
-
-
 /*The following definitions come from  namedbname.c  */
 
 void set_samba_nb_type(void);
@@ -720,6 +718,7 @@ int sys_rmdir(char *dname);
 int sys_chdir(char *dname);
 int sys_utime(char *fname,struct utimbuf *times);
 int sys_rename(char *from, char *to);
+int sys_chmod(char *fname,int mode);
 int sys_chown(char *fname,int uid,int gid);
 int sys_chroot(char *dname);