summaryrefslogtreecommitdiffabout
authorMichael Krelin <hacker@klever.net>2006-11-08 14:16:31 (UTC)
committer Michael Krelin <hacker@klever.net>2006-11-08 14:16:31 (UTC)
commit4148b7ad68f2b5bf83d637bdc5ebbb9f0d2aa869 (patch) (side-by-side diff)
tree1816e76710d722b77ac99f8ca8719f0208b31088
parentf3915982902595f324ef27dd67589f5e950a046b (diff)
downloaddudki-4148b7ad68f2b5bf83d637bdc5ebbb9f0d2aa869.zip
dudki-4148b7ad68f2b5bf83d637bdc5ebbb9f0d2aa869.tar.gz
dudki-4148b7ad68f2b5bf83d637bdc5ebbb9f0d2aa869.tar.bz2
fixed a bug for setting up unspecified group,
bumped version and years, added NEWS item
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--COPYING2
-rw-r--r--NEWS.xml3
-rw-r--r--configure.ac2
-rw-r--r--src/process.cc2
4 files changed, 7 insertions, 2 deletions
diff --git a/COPYING b/COPYING
index 873f196..8ceaf0a 100644
--- a/COPYING
+++ b/COPYING
@@ -1,17 +1,17 @@
-Copyright (c) 2004 Klever Group (http://www.klever.net/)
+Copyright (c) 2004-2006 Klever Group (http://www.klever.net/)
Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
of the Software, and to permit persons to whom the Software is furnished to do
so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
diff --git a/NEWS.xml b/NEWS.xml
index f9be239..2041a58 100644
--- a/NEWS.xml
+++ b/NEWS.xml
@@ -1,18 +1,21 @@
<?xml version="1.0" encoding="us-ascii"?>
<news>
+ <version version="0.2.2" date="November 8th, 2006">
+ <ni>Do not try to set unspecified group</ni>
+ </version>
<version version="0.2.1" date="August 1st, 2004">
<ni>do not act -e when doing -r</ni>
<ni>proper handling of <kbd>ProcessName</kbd> on <kbd>FreeBSD</kbd></ni>
</version>
<version version="0.2" date="July 24th, 2004">
<ni>now dudki sends arbitrary signals to the processes being monitored from the command line</ni>
<ni>detection of running processes which do not keep pidfiles, using process name</ni>
</version>
<version version="0.1" date="July 21st, 2004">
<ni><kbd>initgroups()</kbd> called before executing <kbd>RestartCommand</kbd></ni>
<ni>more civilized way of restarting on <kbd>SIGHUP</kbd></ni>
<ni>minor changes to build process</ni>
</version>
<version version="0.0" date="July 11th, 2004">
<ni>Initial release</ni>
</version>
diff --git a/configure.ac b/configure.ac
index eed8e97..a0e01e4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,17 +1,17 @@
-AC_INIT([dudki], [0.2.1], [dudki-bugs@klever.net])
+AC_INIT([dudki], [0.2.2], [dudki-bugs@klever.net])
AC_CONFIG_SRCDIR([src/dudki.cc])
AC_CONFIG_HEADER([config.h])
AM_INIT_AUTOMAKE([dist-bzip2])
AC_PROG_CXX
AC_PROG_CC
AC_HEADER_SYS_WAIT
AC_CHECK_HEADERS([syslog.h unistd.h getopt.h])
AC_HEADER_STDBOOL
AC_C_CONST
AC_TYPE_UID_T
AC_TYPE_PID_T
AC_FUNC_FORK
diff --git a/src/process.cc b/src/process.cc
index 96c874f..6d3b2a2 100644
--- a/src/process.cc
+++ b/src/process.cc
@@ -82,39 +82,41 @@ void process::launch(const string& id,configuration& config) {
if(gtmp) {
gid = gtmp->gr_gid;
}else{
errno = 0;
gid = strtol(group.c_str(),NULL,0);
if(errno)
throw runtime_error("Failed to reslove Group value to gid");
}
}
pid_t p = fork();
if(p<0)
throw runtime_error(string(__PRETTY_FUNCTION__)+": failed to fork()");
if(!p) {
// child
try {
setsid();
+ if(!group.empty()) {
if(user.empty()) {
if((getgid()!=gid) && setgid(gid))
throw runtime_error(string(__PRETTY_FUNCTION__)+": failed to setgid()");
}else{
if(initgroups(user.c_str(),gid))
throw runtime_error(string(__PRETTY_FUNCTION__)+": failed to initgroups()");
}
+ }
if(!chroot.empty()) {
if(::chroot(chroot.c_str()))
throw runtime_error(string(__PRETTY_FUNCTION__)+": failed to chroot()");
}
if(!user.empty()) {
if((getuid()!=uid) && setuid(uid))
throw runtime_error(string(__PRETTY_FUNCTION__)+": failed to setuid()");
}
char *argv[] = { "/bin/sh", "-c", (char*)restart_cmd.c_str(), NULL };
close(0); close(1); close(2);
execv("/bin/sh",argv);
}catch(exception& e) {
syslog(LOG_ERR,"Error trying to launch process '%s': %s",id.c_str(),e.what());
}
_exit(-1);
}