From e78f534d4d1fecc4921d3173d9c63a69e57297f3 Mon Sep 17 00:00:00 2001
From: belliash <belliash@asiotec.eu.org>
Date: Tue, 13 Aug 2013 12:08:39 +0200
Subject: [PATCH] update to 1.42

---
 kuhttpd.c | 8 ++++----
 kuhttpd.h | 3 +--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/kuhttpd.c b/kuhttpd.c
index cda2d6b..e301ad2 100644
--- a/kuhttpd.c
+++ b/kuhttpd.c
@@ -1308,7 +1308,7 @@ int main(int argc, char** argv) {
 	language = DEFAULT_LANGUAGE;
 	p3p = (char*) 0;
 	max_age = -1;
-	user = DEFAULT_USER;
+	user = NULL;
 	hostname = (char*) 0;
 	logfile = (char*) 0;
 	pidfile = (char*) 0;
@@ -1429,7 +1429,7 @@ int main(int argc, char** argv) {
 		}
 	}
 
-	if(getuid() == 0) {
+	if(getuid() == 0 && user != NULL) {
 		pwd = getpwnam(user);
 		if(pwd == (struct passwd*) 0) {
 			syslog(LOG_CRIT, "unknown user - '%s'", user);
@@ -1533,7 +1533,7 @@ int main(int argc, char** argv) {
 
 	tzset();
 
-	if(getuid() == 0) {
+	if(getuid() == 0 && user != NULL) {
 		if(setgroups(0, (gid_t*) 0) < 0) {
 			syslog(LOG_CRIT, "setgroups - %m");
 			perror("setgroups");
@@ -1568,7 +1568,7 @@ int main(int argc, char** argv) {
 			exit(1);
 		}
 	}
-	if(getuid() == 0) {
+	if(getuid() == 0 && user != NULL) {
 		if(setuid(uid) < 0) {
 			syslog(LOG_CRIT, "setuid - %m");
 			perror("setuid");
diff --git a/kuhttpd.h b/kuhttpd.h
index 311bdaa..209dbff 100644
--- a/kuhttpd.h
+++ b/kuhttpd.h
@@ -22,7 +22,6 @@
 #define DEFAULT_CHARSET "UTF-8"
 #define DEFAULT_LANGUAGE "english"
 #define DEFAULT_CGI_PATTERN "cgi-bin/**|**.cgi|**.sh"
-#define DEFAULT_USER "nobody"
 #define CGI_NICE 10
 #define CGI_PATH "/usr/local/bin:/usr/ucb:/bin:/usr/bin:/usr/local/sbin:/sbin:/usr/sbin"
 #define CGI_LD_LIBRARY_PATH "/usr/local/lib:/usr/lib:/lib"
@@ -35,7 +34,7 @@
 #define METHOD_HEAD 2
 #define METHOD_POST 3
 
-#define SERVER_SOFTWARE "Kagera uHTTP Daemon 1.41"
+#define SERVER_SOFTWARE "Kagera uHTTP Daemon 1.42"
 
 struct mime_entry {
 	char* ext;