summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--COPYING2
-rw-r--r--NEWS.xml3
-rw-r--r--configure.ac2
-rw-r--r--src/process.cc14
4 files changed, 13 insertions, 8 deletions
diff --git a/COPYING b/COPYING
index 873f196..8ceaf0a 100644
--- a/COPYING
+++ b/COPYING
@@ -1,19 +1,19 @@
1Copyright (c) 2004 Klever Group (http://www.klever.net/) 1Copyright (c) 2004-2006 Klever Group (http://www.klever.net/)
2 2
3Permission is hereby granted, free of charge, to any person obtaining a copy of 3Permission is hereby granted, free of charge, to any person obtaining a copy of
4this software and associated documentation files (the "Software"), to deal in 4this software and associated documentation files (the "Software"), to deal in
5the Software without restriction, including without limitation the rights to 5the Software without restriction, including without limitation the rights to
6use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies 6use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
7of the Software, and to permit persons to whom the Software is furnished to do 7of the Software, and to permit persons to whom the Software is furnished to do
8so, subject to the following conditions: 8so, subject to the following conditions:
9 9
10The above copyright notice and this permission notice shall be included in all 10The above copyright notice and this permission notice shall be included in all
11copies or substantial portions of the Software. 11copies or substantial portions of the Software.
12 12
13THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 13THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
14IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 14IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
15FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 15FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
16AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 16AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
17LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 17LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
18OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 18OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
19SOFTWARE. 19SOFTWARE.
diff --git a/NEWS.xml b/NEWS.xml
index f9be239..2041a58 100644
--- a/NEWS.xml
+++ b/NEWS.xml
@@ -1,19 +1,22 @@
1<?xml version="1.0" encoding="us-ascii"?> 1<?xml version="1.0" encoding="us-ascii"?>
2<news> 2<news>
3 <version version="0.2.2" date="November 8th, 2006">
4 <ni>Do not try to set unspecified group</ni>
5 </version>
3 <version version="0.2.1" date="August 1st, 2004"> 6 <version version="0.2.1" date="August 1st, 2004">
4 <ni>do not act -e when doing -r</ni> 7 <ni>do not act -e when doing -r</ni>
5 <ni>proper handling of <kbd>ProcessName</kbd> on <kbd>FreeBSD</kbd></ni> 8 <ni>proper handling of <kbd>ProcessName</kbd> on <kbd>FreeBSD</kbd></ni>
6 </version> 9 </version>
7 <version version="0.2" date="July 24th, 2004"> 10 <version version="0.2" date="July 24th, 2004">
8 <ni>now dudki sends arbitrary signals to the processes being monitored from the command line</ni> 11 <ni>now dudki sends arbitrary signals to the processes being monitored from the command line</ni>
9 <ni>detection of running processes which do not keep pidfiles, using process name</ni> 12 <ni>detection of running processes which do not keep pidfiles, using process name</ni>
10 </version> 13 </version>
11 <version version="0.1" date="July 21st, 2004"> 14 <version version="0.1" date="July 21st, 2004">
12 <ni><kbd>initgroups()</kbd> called before executing <kbd>RestartCommand</kbd></ni> 15 <ni><kbd>initgroups()</kbd> called before executing <kbd>RestartCommand</kbd></ni>
13 <ni>more civilized way of restarting on <kbd>SIGHUP</kbd></ni> 16 <ni>more civilized way of restarting on <kbd>SIGHUP</kbd></ni>
14 <ni>minor changes to build process</ni> 17 <ni>minor changes to build process</ni>
15 </version> 18 </version>
16 <version version="0.0" date="July 11th, 2004"> 19 <version version="0.0" date="July 11th, 2004">
17 <ni>Initial release</ni> 20 <ni>Initial release</ni>
18 </version> 21 </version>
19</news> 22</news>
diff --git a/configure.ac b/configure.ac
index eed8e97..a0e01e4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,25 +1,25 @@
1AC_INIT([dudki], [0.2.1], [dudki-bugs@klever.net]) 1AC_INIT([dudki], [0.2.2], [dudki-bugs@klever.net])
2AC_CONFIG_SRCDIR([src/dudki.cc]) 2AC_CONFIG_SRCDIR([src/dudki.cc])
3AC_CONFIG_HEADER([config.h]) 3AC_CONFIG_HEADER([config.h])
4AM_INIT_AUTOMAKE([dist-bzip2]) 4AM_INIT_AUTOMAKE([dist-bzip2])
5 5
6AC_PROG_CXX 6AC_PROG_CXX
7AC_PROG_CC 7AC_PROG_CC
8 8
9AC_HEADER_SYS_WAIT 9AC_HEADER_SYS_WAIT
10AC_CHECK_HEADERS([syslog.h unistd.h getopt.h]) 10AC_CHECK_HEADERS([syslog.h unistd.h getopt.h])
11 11
12AC_HEADER_STDBOOL 12AC_HEADER_STDBOOL
13AC_C_CONST 13AC_C_CONST
14AC_TYPE_UID_T 14AC_TYPE_UID_T
15AC_TYPE_PID_T 15AC_TYPE_PID_T
16 16
17AC_FUNC_FORK 17AC_FUNC_FORK
18AC_HEADER_STDC 18AC_HEADER_STDC
19AC_TYPE_SIGNAL 19AC_TYPE_SIGNAL
20AC_CHECK_FUNCS([dup2 memmove strtol]) 20AC_CHECK_FUNCS([dup2 memmove strtol])
21AC_CHECK_FUNC([getopt_long],[ 21AC_CHECK_FUNC([getopt_long],[
22 AC_DEFINE([HAVE_GETOPT_LONG],[1],[Define to make use of getopt_long]) 22 AC_DEFINE([HAVE_GETOPT_LONG],[1],[Define to make use of getopt_long])
23 AC_SUBST([HAVE_GETOPT_LONG],1) 23 AC_SUBST([HAVE_GETOPT_LONG],1)
24],[ 24],[
25 AC_SUBST([HAVE_GETOPT_LONG],0) 25 AC_SUBST([HAVE_GETOPT_LONG],0)
diff --git a/src/process.cc b/src/process.cc
index 96c874f..6d3b2a2 100644
--- a/src/process.cc
+++ b/src/process.cc
@@ -74,54 +74,56 @@ void process::launch(const string& id,configuration& config) {
74 errno=0; 74 errno=0;
75 uid = strtol(user.c_str(),NULL,0); 75 uid = strtol(user.c_str(),NULL,0);
76 if(errno) 76 if(errno)
77 throw runtime_error("Failed to resolve User value to uid"); 77 throw runtime_error("Failed to resolve User value to uid");
78 } 78 }
79 } 79 }
80 if(!group.empty()) { 80 if(!group.empty()) {
81 struct group *gtmp = getgrnam(group.c_str()); 81 struct group *gtmp = getgrnam(group.c_str());
82 if(gtmp) { 82 if(gtmp) {
83 gid = gtmp->gr_gid; 83 gid = gtmp->gr_gid;
84 }else{ 84 }else{
85 errno = 0; 85 errno = 0;
86 gid = strtol(group.c_str(),NULL,0); 86 gid = strtol(group.c_str(),NULL,0);
87 if(errno) 87 if(errno)
88 throw runtime_error("Failed to reslove Group value to gid"); 88 throw runtime_error("Failed to reslove Group value to gid");
89 } 89 }
90 } 90 }
91 pid_t p = fork(); 91 pid_t p = fork();
92 if(p<0) 92 if(p<0)
93 throw runtime_error(string(__PRETTY_FUNCTION__)+": failed to fork()"); 93 throw runtime_error(string(__PRETTY_FUNCTION__)+": failed to fork()");
94 if(!p) { 94 if(!p) {
95 // child 95 // child
96 try { 96 try {
97 setsid(); 97 setsid();
98 if(user.empty()) { 98 if(!group.empty()) {
99 if((getgid()!=gid) && setgid(gid)) 99 if(user.empty()) {
100 throw runtime_error(string(__PRETTY_FUNCTION__)+": failed to setgid()"); 100 if((getgid()!=gid) && setgid(gid))
101 }else{ 101 throw runtime_error(string(__PRETTY_FUNCTION__)+": failed to setgid()");
102 if(initgroups(user.c_str(),gid)) 102 }else{
103 throw runtime_error(string(__PRETTY_FUNCTION__)+": failed to initgroups()"); 103 if(initgroups(user.c_str(),gid))
104 throw runtime_error(string(__PRETTY_FUNCTION__)+": failed to initgroups()");
105 }
104 } 106 }
105 if(!chroot.empty()) { 107 if(!chroot.empty()) {
106 if(::chroot(chroot.c_str())) 108 if(::chroot(chroot.c_str()))
107 throw runtime_error(string(__PRETTY_FUNCTION__)+": failed to chroot()"); 109 throw runtime_error(string(__PRETTY_FUNCTION__)+": failed to chroot()");
108 } 110 }
109 if(!user.empty()) { 111 if(!user.empty()) {
110 if((getuid()!=uid) && setuid(uid)) 112 if((getuid()!=uid) && setuid(uid))
111 throw runtime_error(string(__PRETTY_FUNCTION__)+": failed to setuid()"); 113 throw runtime_error(string(__PRETTY_FUNCTION__)+": failed to setuid()");
112 } 114 }
113 char *argv[] = { "/bin/sh", "-c", (char*)restart_cmd.c_str(), NULL }; 115 char *argv[] = { "/bin/sh", "-c", (char*)restart_cmd.c_str(), NULL };
114 close(0); close(1); close(2); 116 close(0); close(1); close(2);
115 execv("/bin/sh",argv); 117 execv("/bin/sh",argv);
116 }catch(exception& e) { 118 }catch(exception& e) {
117 syslog(LOG_ERR,"Error trying to launch process '%s': %s",id.c_str(),e.what()); 119 syslog(LOG_ERR,"Error trying to launch process '%s': %s",id.c_str(),e.what());
118 } 120 }
119 _exit(-1); 121 _exit(-1);
120 } 122 }
121 // parent 123 // parent
122 int rv; 124 int rv;
123 if(waitpid(p,&rv,0)<0) 125 if(waitpid(p,&rv,0)<0)
124 throw runtime_error(string(__PRETTY_FUNCTION__)+": failed to waitpid()"); 126 throw runtime_error(string(__PRETTY_FUNCTION__)+": failed to waitpid()");
125} 127}
126 128
127void process::do_notify(const string& id,const string& event,const string& description,configuration& config) { 129void process::do_notify(const string& id,const string& event,const string& description,configuration& config) {