X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=daemon%2Fmain.c;h=58d1c6c21721e3088c5838808ad652d8390ac142;hb=refs%2Fheads%2Fjava;hp=4bded58a17e426031bad5659f962bc71110c302a;hpb=1001e9965d257861e5ee75b62c59cc42659b0671;p=doldaconnect.git

diff --git a/daemon/main.c b/daemon/main.c
index 4bded58..58d1c6c 100644
--- a/daemon/main.c
+++ b/daemon/main.c
@@ -1,6 +1,6 @@
 /*
  *  Dolda Connect - Modular multiuser Direct Connect-style client
- *  Copyright (C) 2004 Fredrik Tolf (fredrik@dolda2000.com)
+ *  Copyright (C) 2004 Fredrik Tolf <fredrik@dolda2000.com>
  *  
  *  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
@@ -30,6 +30,7 @@
 #include <sys/wait.h>
 #include <stdarg.h>
 #include <fcntl.h>
+#include <sys/select.h>
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
@@ -340,12 +341,12 @@ pid_t forksess(uid_t user, struct authhandle *auth, void (*ccbfunc)(pid_t, int,
 		    flog(LOG_WARNING, "could not setuid: %s", strerror(errno));
 		    exit(127);
 		}
+		putenv(sprintf2("HOME=%s", pwent->pw_dir));
+		putenv(sprintf2("SHELL=%s", pwent->pw_shell));
+		putenv(sprintf2("PATH=%s/bin:/usr/local/bin:/bin:/usr/bin", pwent->pw_dir));
 	    }
-	    putenv(sprintf2("HOME=%s", pwent->pw_dir));
-	    putenv(sprintf2("SHELL=%s", pwent->pw_shell));
 	    putenv(sprintf2("USER=%s", pwent->pw_name));
 	    putenv(sprintf2("LOGNAME=%s", pwent->pw_name));
-	    putenv(sprintf2("PATH=%s/bin:/usr/local/bin:/bin:/usr/bin", pwent->pw_dir));
 	    chdir(pwent->pw_dir);
 	    return(0);
 	}
@@ -390,7 +391,7 @@ int main(int argc, char **argv)
     syslogfac = LOG_DAEMON;
     configfile = NULL;
     pidfile = NULL;
-    while((c = getopt(argc, argv, "p:C:f:hns")) != -1)
+    while((c = getopt(argc, argv, "p:C:f:hnsV")) != -1)
     {
 	switch(c)
 	{
@@ -436,11 +437,14 @@ int main(int argc, char **argv)
 	case 's':
 	    immsyslog = 1;
 	    break;
+	case 'V':
+	    printf("%s", RELEASEINFO);
+	    exit(0);
 	case 'h':
 	case ':':
 	case '?':
 	default:
-	    printf("usage: doldacond [-hns] [-C configfile] [-p pidfile] [-f facility]\n");
+	    printf("usage: doldacond [-hnsV] [-C configfile] [-p pidfile] [-f facility]\n");
 	    exit(c != 'h');
 	}
     }