Internal review up to end of p11.

[userv.git] / common.h

diff --git a/common.h b/common.h
index 539ecf000f3a50cbb3201a5289605f931a14f21f..5fdfd76670a356105e03710135dace489bb4c17a 100644 (file)
--- a/common.h
+++ b/common.h
@@ -32,34 +32,32 @@ static const unsigned char protocolchecksumversion[PCSUMSIZE]= {
 # define VARDIR "/var/run/userv"
 #endif
 
-#define DIRSEP "/"
-
 #ifndef RENDEZVOUS
 # define RENDEZVOUS "socket"
 #endif
 
 #ifndef RENDEZVOUSPATH
-# define RENDEZVOUSPATH VARDIR DIRSEP RENDEZVOUS
+# define RENDEZVOUSPATH VARDIR "/" RENDEZVOUS
 #endif
 
 #ifndef PIPEFORMAT
-# ifdef AC_SYS_LONG_FILENAMES
-#  define PIPEFORMAT "pipe.%lu.%lu.%d"
-#  define PIPEFORMATEXTEND (sizeof(long)*3*2+sizeof(int)*3+1)
-# else
-#  define PIPEFORMAT "%lx.%lx.%x"
-#  define PIPEFORMATEXTEND (sizeof(long)*2*2+sizeof(int)*2+1)
-# endif
+# define PIPEFORMAT "%lx.%lx.%x"
+# define PIPEPATTERN "[0-9a-f]*.[0-9a-f]*.*[0-9a-f]"
+# define PIPEFORMATEXTEND (sizeof(long)*2*2+sizeof(int)*2+1)
+# define PIPEMAXLEN (sizeof(PIPEFORMAT)+PIPEFORMATEXTEND)
 #endif
 
 #ifndef PIPEPATHFORMAT
-# define PIPEPATHFORMAT VARDIR DIRSEP PIPEFORMAT
+# define PIPEPATHFORMAT VARDIR "/" PIPEFORMAT
 # define PIPEPATHMAXLEN (sizeof(PIPEPATHFORMAT)+PIPEFORMATEXTEND)
 #endif
 
-#define MAX_ALLOW_FD 255
+#define MAX_ALLOW_FD 1024
 #define MAX_INCLUDE_NEST 40
-#define MAX_OVERRIDE_LEN (1024*1024)
+#define MAX_GENERAL_STRING (1024*1024)
+#define MAX_OVERRIDE_LEN MAX_GENERAL_STRING
+#define MAX_ARGSDEFVARS 4096
+#define MAX_GIDS 1024
 
 #ifdef DEBUG
 # define BASE_MAGIC 0x5deb7567 /* "\x5d\xebug" */