From ab48577afba9d965041604c1d2df35e22dc4c039 Mon Sep 17 00:00:00 2001 From: Bogomil Vasilev Date: Fri, 11 May 2018 14:40:46 +0300 Subject: [PATCH] Improve max path/name limits --- src/confparser.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/confparser.h b/src/confparser.h index 2a9a141..4d09695 100644 --- a/src/confparser.h +++ b/src/confparser.h @@ -1,11 +1,11 @@ #ifndef CONFPARSER_H #define CONFPARSER_H +#include #include "log.h" -#define MAXPATHSIZE 256 #define HOSTNAMESIZE 128 -#define CFGLINESIZE 300 +#define CFGLINESIZE PATH_MAX + NAME_MAX + 30 /* 30 is pretty random */ struct conf_db { char type[15]; @@ -19,17 +19,17 @@ struct conf_rmps { char agent_port[6]; char client_ip[13]; char client_port[6]; - char logfile[MAXPATHSIZE]; - char errlog[MAXPATHSIZE]; + char logfile[PATH_MAX+NAME_MAX]; + char errlog[PATH_MAX+NAME_MAX]; enum LOG_LEVEL loglevel; - char pidfile[MAXPATHSIZE]; - char agent_tls_crt[MAXPATHSIZE]; - char agent_tls_key[MAXPATHSIZE]; - char cafile[MAXPATHSIZE]; + char pidfile[PATH_MAX+NAME_MAX]; + char agent_tls_crt[PATH_MAX+NAME_MAX]; + char agent_tls_key[PATH_MAX+NAME_MAX]; + char cafile[PATH_MAX+NAME_MAX]; char cipherlist[1024]; int agent_poolsize; - char client_tls_crt[MAXPATHSIZE]; - char client_tls_key[MAXPATHSIZE]; + char client_tls_crt[PATH_MAX+NAME_MAX]; + char client_tls_key[PATH_MAX+NAME_MAX]; int client_poolsize; };