X-Git-Url: http://www.dolda2000.com/gitweb/?p=ashd.git;a=blobdiff_plain;f=src%2Fuserplex.c;h=d6c978c0dec3d40cf347092bf9ba2fd166346e14;hp=cfd313cbb9ed650f8996f319ee815adddebd3aec;hb=d341283f757e188a52aedae7d715e201f2a430c2;hpb=d185ffb9d36ed23e28b632b7a17a24e323343c6b

diff --git a/src/userplex.c b/src/userplex.c
index cfd313c..d6c978c 100644
--- a/src/userplex.c
+++ b/src/userplex.c
@@ -46,6 +46,7 @@ static char *mgroup = NULL;
 static char *dirname = NULL;
 static char **childspec;
 static uid_t minuid = 0;
+static int usesyslog = 0;
 static struct user *users = NULL;
 
 static void login(struct passwd *pwd)
@@ -73,6 +74,10 @@ static void login(struct passwd *pwd)
 	flog(LOG_ERR, "could not change to home directory for %s: %s", pwd->pw_name, strerror(errno));
 	exit(1);
     }
+    if(usesyslog)
+	putenv("ASHD_USESYSLOG=1");
+    else
+	unsetenv("ASHD_USESYSLOG");
     putenv(sprintf2("HOME=%s", pwd->pw_dir));
     putenv(sprintf2("SHELL=%s", pwd->pw_shell));
     putenv(sprintf2("USER=%s", pwd->pw_name));
@@ -236,7 +241,7 @@ static void sighandler(int sig)
 
 static void usage(FILE *out)
 {
-    fprintf(out, "usage: userplex [-hI] [-g GROUP] [-m MIN-UID] [-d PUB-DIR] [PROGRAM ARGS...]\n");
+    fprintf(out, "usage: userplex [-hIs] [-g GROUP] [-m MIN-UID] [-d PUB-DIR] [PROGRAM ARGS...]\n");
 }
 
 int main(int argc, char **argv)
@@ -246,11 +251,14 @@ int main(int argc, char **argv)
     int fd;
     struct charvbuf csbuf;
     
-    while((c = getopt(argc, argv, "+hIg:m:d:")) >= 0) {
+    while((c = getopt(argc, argv, "+hIsg:m:d:")) >= 0) {
 	switch(c) {
 	case 'I':
 	    ignore = 1;
 	    break;
+	case 's':
+	    usesyslog = 1;
+	    break;
 	case 'm':
 	    if((minuid = atoi(optarg)) < 1) {
 		fprintf(stderr, "userplex: argument to -m must be greater than 0\n");