bughz/tinyproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added a check to make sure the Upstream and Tunnel directives are not both

Browse Source 
set in the configuration file.
This commit is contained in:
Robert James Kaes 2001-09-16 20:11:54 +00:00
parent 2a566d194d
commit 490754594e
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/tinyproxy.c
View File

@ -1,4 +1,4 @@
/* $Id: tinyproxy.c,v 1.16 2001-09-16 05:38:27 rjkaes Exp $
/* $Id: tinyproxy.c,v 1.17 2001-09-16 20:11:54 rjkaes Exp $
*
* The initialise routine. Basically sets up all the initial stuff (logfile,
* listening socket, config options, etc.) and then sits there and loops
@ -250,6 +250,13 @@ int main(int argc, char **argv)
}
yyparse();
#if defined(TUNNEL_SUPPORT) && defined(UPSTREAM_SUPPORT)
if (config.tunnel_name && config.upstream_name) {
fprintf(stderr, "%s: \"Tunnel\" and \"Upstream\" directives can not be both set.\n", argv[0]);
exit(EX_SOFTWARE);
}
#endif
/* Open the log file if not using syslog */
if (config.syslog == FALSE) {
int log_file_fd;