X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=common.h;h=5fdfd76670a356105e03710135dace489bb4c17a;hb=9f56f874416db295bdb50d448bd99cdd34db969d;hp=539ecf000f3a50cbb3201a5289605f931a14f21f;hpb=854704a34d6f22e6595b75b934347a2ddb36aee0;p=userv.git diff --git a/common.h b/common.h index 539ecf0..5fdfd76 100644 --- 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" */