diff options
| author | Martin Wilke <miwi@FreeBSD.org> | 2008-09-24 08:42:53 +0000 |
|---|---|---|
| committer | Martin Wilke <miwi@FreeBSD.org> | 2008-09-24 08:42:53 +0000 |
| commit | e52ae825b306b016b24124b27b33cb140fb4a311 (patch) | |
| tree | 9e1966d724b0cb83a60d78b42cad942d9b2bc7ac /net/siproxd/files/patch-src__siproxd.c | |
| parent | - Update to 0.9 (diff) | |
- Update to 0.7.1
PR: 127570
Submitted by: "Frank W. Josellis" <frank@dynamical-systems.org> (maintainer)
Notes
Notes:
svn path=/head/; revision=220620
Diffstat (limited to 'net/siproxd/files/patch-src__siproxd.c')
| -rw-r--r-- | net/siproxd/files/patch-src__siproxd.c | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/net/siproxd/files/patch-src__siproxd.c b/net/siproxd/files/patch-src__siproxd.c index 87f49e7f6fb0..96e56d8dc276 100644 --- a/net/siproxd/files/patch-src__siproxd.c +++ b/net/siproxd/files/patch-src__siproxd.c @@ -1,20 +1,34 @@ ---- src/siproxd.c.orig Sat Jan 19 17:06:51 2008 -+++ src/siproxd.c Mon Feb 4 16:42:25 2008 -@@ -182,10 +182,15 @@ +--- src/siproxd.c.orig 2008-02-04 21:38:47.000000000 +0100 ++++ src/siproxd.c 2008-08-29 19:37:53.000000000 +0200 +@@ -226,8 +226,6 @@ /* * Init stuff */ - INFO(PACKAGE"-"VERSION"-"BUILDSTR" "UNAME" starting up"); - /* read the config file */ - if (read_config(configfile, config_search) == STS_FAILURE) exit(1); -+ + if (read_config(configfile, config_search, main_cfg_opts, "") == STS_FAILURE) { + exit(1); +@@ -237,6 +235,13 @@ + configuration.configfile = strdup(configfile); + configuration.config_search = config_search; + + /* Don't log to stderr if daemonizing is intended. */ + if (configuration.daemonize) { + log_set_stderr(0); + } + + INFO(PACKAGE"-"VERSION"-"BUILDSTR" "UNAME" starting up"); - ++ /* if a debug level > 0 has been given on the commandline use its value and not what is in the config file */ + if (cmdline_debuglevel != 0) { +@@ -301,7 +306,7 @@ + * the jail, too. However, it will be owned by root and not deleted + * on process termination... */ + if (configuration.chrootjail && ((getuid()==0) || (geteuid()==0))) { +- if (pidfilename) createpidfile(pidfilename); ++ if (pidfilename && *pidfilename == '/') createpidfile(pidfilename); + } + + /* change user and group IDs */ |