X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=daemon.c;h=666b0a5c645cbc0f34b3347a3e021355a6444193;hp=d3a43b9a2de32fe50f2a42009cbcfb7830972985;hb=74cfed2536a16ca85bc0ce97f6bf307c96ae0d3d;hpb=5fde5b4d4abeb795f71101d1fd3524f8a27971eb

diff --git a/daemon.c b/daemon.c
index d3a43b9a..666b0a5c 100644
--- a/daemon.c
+++ b/daemon.c
@@ -1,19 +1,7 @@
 /*
  * Copyright (C) 1997-2006 Andre Noll <maan@systemlinux.org>
  *
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \file daemon.c some helpers for programs that detach from the console */
@@ -101,18 +89,22 @@ void close_log(FILE* logfile)
  */
 void log_welcome(const char *whoami, int loglevel)
 {
-	PARA_INFO_LOG("welcome to %s " VERSION " ("BUILD_DATE")\n", whoami);
+	PARA_INFO_LOG("welcome to %s " PACKAGE_VERSION " ("BUILD_DATE")\n",
+		whoami);
 	PARA_DEBUG_LOG("using loglevel %d\n", loglevel);
 }
 
 /**
  * give up superuser privileges
  *
+ * \param username the user to switch to
+ * \param groupname the group to switch to
+ *
  * This function returns immediately if not invoked with EUID zero. Otherwise,
  * it tries to obtain the GID of \a groupname and the UID of \a username.  On
  * success, effective and real GID/UID and the saved set-group-ID/set-user-ID
- * are all set accordingly. On errors, an appropriate message is logged and exit()
- * is called to terminate the process.
+ * are all set accordingly. On errors, an appropriate message is logged and
+ * exit() is called to terminate the process.
  *
  * \sa getpwnam(3), getuid(2), setuid(2), getgrnam(2), setgid(2)
  */
@@ -149,7 +141,6 @@ void para_drop_privileges(const char *username, const char *groupname)
 	PARA_INFO_LOG("%s", "dropping root privileges\n");
 	setuid(p->pw_uid);
 	PARA_DEBUG_LOG("uid: %d, euid: %d\n", getuid(), geteuid());
-	setuid(p->pw_uid);
 }
 
 /**
@@ -168,13 +159,15 @@ time_t server_uptime(enum uptime set_or_get)
 {
 	static time_t startuptime;
 	time_t now;
+	double diff;
 
 	if (set_or_get == UPTIME_SET) {
 		time(&startuptime);
 		return 0;
 	}
 	time(&now);
-	return (time_t) difftime(now, startuptime);
+	diff = difftime(now, startuptime);
+	return (time_t) diff;
 }
 
 /**