diff --git a/tests/server/mqttd.c b/tests/server/mqttd.c index 9a7a0baef3..dbc844d823 100644 --- a/tests/server/mqttd.c +++ b/tests/server/mqttd.c @@ -66,10 +66,6 @@ #define DEFAULT_PORT 1883 /* MQTT default port */ -#ifndef DEFAULT_LOGFILE -#define DEFAULT_LOGFILE "log/mqttd.log" -#endif - #ifndef DEFAULT_CONFIG #define DEFAULT_CONFIG "mqttd.config" #endif @@ -927,7 +923,7 @@ int main(int argc, char *argv[]) int error; int arg = 1; - serverlogfile = DEFAULT_LOGFILE; + serverlogfile = "log/mqttd.log"; while(argc > arg) { if(!strcmp("--version", argv[arg])) { diff --git a/tests/server/rtspd.c b/tests/server/rtspd.c index 5d0fbd8a85..5e7fbfca36 100644 --- a/tests/server/rtspd.c +++ b/tests/server/rtspd.c @@ -117,10 +117,6 @@ static void storerequest(char *reqbuf, size_t totalsize); #define DEFAULT_PORT 8999 -#ifndef DEFAULT_LOGFILE -#define DEFAULT_LOGFILE "log/rtspd.log" -#endif - static const char *logdir = "log"; static char loglockfile[256]; @@ -1045,7 +1041,7 @@ int main(int argc, char *argv[]) memset(&req, 0, sizeof(req)); - serverlogfile = DEFAULT_LOGFILE; + serverlogfile = "log/rtspd.log"; while(argc > arg) { if(!strcmp("--version", argv[arg])) { diff --git a/tests/server/sockfilt.c b/tests/server/sockfilt.c index 80b44c0003..04ec469fb7 100644 --- a/tests/server/sockfilt.c +++ b/tests/server/sockfilt.c @@ -116,10 +116,6 @@ #define DEFAULT_PORT 8999 -#ifndef DEFAULT_LOGFILE -#define DEFAULT_LOGFILE "log/sockfilt.log" -#endif - /* buffer is this excessively large only to be able to support things like test 1003 which tests exceedingly large server response lines */ #define BUFFER_SIZE 17010 @@ -1393,7 +1389,7 @@ int main(int argc, char *argv[]) enum sockmode mode = PASSIVE_LISTEN; /* default */ const char *addr = NULL; - serverlogfile = DEFAULT_LOGFILE; + serverlogfile = "log/sockfilt.log"; while(argc > arg) { if(!strcmp("--version", argv[arg])) { diff --git a/tests/server/socksd.c b/tests/server/socksd.c index 8216dbf63d..e98071ea73 100644 --- a/tests/server/socksd.c +++ b/tests/server/socksd.c @@ -87,10 +87,6 @@ #define DEFAULT_PORT 8905 -#ifndef DEFAULT_LOGFILE -#define DEFAULT_LOGFILE "log/socksd.log" -#endif - #ifndef DEFAULT_REQFILE #define DEFAULT_REQFILE "log/socksd-request.log" #endif @@ -973,7 +969,7 @@ int main(int argc, char *argv[]) bool unlink_socket = false; #endif - serverlogfile = DEFAULT_LOGFILE; + serverlogfile = "log/socksd.log"; while(argc > arg) { if(!strcmp("--version", argv[arg])) { diff --git a/tests/server/sws.c b/tests/server/sws.c index b8e6b0fb37..fc40d3eac9 100644 --- a/tests/server/sws.c +++ b/tests/server/sws.c @@ -122,10 +122,6 @@ static void storerequest(const char *reqbuf, size_t totalsize); #define DEFAULT_PORT 8999 -#ifndef DEFAULT_LOGFILE -#define DEFAULT_LOGFILE "log/sws.log" -#endif - static const char *logdir = "log"; static char loglockfile[256]; @@ -2043,7 +2039,7 @@ int main(int argc, char *argv[]) /* a default CONNECT port is basically pointless but still ... */ size_t socket_idx; - serverlogfile = DEFAULT_LOGFILE; + serverlogfile = "log/sws.log"; while(argc > arg) { if(!strcmp("--version", argv[arg])) { diff --git a/tests/server/tftpd.c b/tests/server/tftpd.c index 0e62855242..5f29fd38d5 100644 --- a/tests/server/tftpd.c +++ b/tests/server/tftpd.c @@ -150,10 +150,6 @@ struct bf { #undef MIN #define MIN(x,y) ((x)<(y)?(x):(y)) -#ifndef DEFAULT_LOGFILE -#define DEFAULT_LOGFILE "log/tftpd.log" -#endif - #define REQUEST_DUMP "server.input" #define DEFAULT_PORT 8999 /* UDP */ @@ -563,7 +559,7 @@ int main(int argc, char **argv) memset(&test, 0, sizeof(test)); - serverlogfile = DEFAULT_LOGFILE; + serverlogfile = "log/tftpd.log" while(argc > arg) { if(!strcmp("--version", argv[arg])) {