--- suX/src/sux.c	2011/05/20 16:02:05	1.1.1.1
+++ suX/src/sux.c	2011/05/20 17:56:49	1.1.1.1.2.7
@@ -3,7 +3,7 @@
  *  by Michael Pounov <misho@aitbg.com>
  *
  * $Author: misho $
- * $Id: sux.c,v 1.1.1.1 2011/05/20 16:02:05 misho Exp $
+ * $Id: sux.c,v 1.1.1.1.2.7 2011/05/20 17:56:49 misho Exp $
  *
  *************************************************************************/
 #include "global.h"
@@ -12,28 +12,37 @@
 sl_config cfg;
 int Verbose;
 struct tagProc proc;
+FILE *lf;
 
 
 static inline void
 Log(int lvl, const char *fmt, ...)
 {
-	va_list lst;
+	va_list lst, cp;
 
 	if (lvl <= Verbose) {
 		va_start(lst, fmt);
-		vsyslog(LOG_WARNING, fmt, lst);
+		va_copy(cp, lst);
+		vfprintf(lf, fmt, lst);
 		va_end(lst);
+		fprintf(lf, "\n");
+		vsyslog(LOG_WARNING, fmt, cp);
+		va_end(cp);
 	}
 }
 
 static inline void
 Err(const char *fmt, ...)
 {
-	va_list lst;
+	va_list lst, cp;
 
 	va_start(lst, fmt);
-	vsyslog(LOG_ERR, fmt, lst);
+	va_copy(cp, lst);
+	vfprintf(lf, fmt, lst);
 	va_end(lst);
+	fprintf(lf, "\n");
+	vsyslog(LOG_ERR, fmt, cp);
+	va_end(cp);
 }
 
 static void
@@ -44,7 +53,13 @@ initProg()
 	proc.proc_prio = getpriority(PRIO_PROCESS, 0);
 	getcwd(proc.proc_dir, sizeof proc.proc_dir);
 
-	openlog(PACKAGE_NAME, LOG_CONS | LOG_PID | LOG_NDELAY | LOG_PERROR, LOG_USER);
+#if 0
+	lf = fopen(DEFAULT_LOG, "a");
+	if (!lf)
+#endif
+		lf = stdout;
+
+	openlog(PACKAGE_NAME, LOG_CONS | LOG_PID | LOG_NDELAY, LOG_USER);
 }
 
 static void
@@ -57,6 +72,7 @@ Usage()
 		"\t-g <group>\t\t\tGroup for suID\n"
 		"\t-p <priority (-20..20)>\t\tExecute with priority\n"
 		"\t-d <directory>\t\t\tDirectory for suID\n"
+		"\t-l <logfile>\t\t\tLog file path (default:/var/log/suX.log)\n"
 		"\t-v\t\t\t\tVerbose, (more -v, more verbosity)\n"
 		"\t-h\t\t\t\tThis help screen!\n\n", PACKAGE_NAME);
 }
@@ -212,6 +228,7 @@ Run(char **argv)
 		return -1;
 	}
 
+	/*
 	if (setgid(proc.proc_gid) == -1) {
 		Err("Error:: setgid #%d - %s\n", errno, strerror(errno));
 		if (args)
@@ -230,13 +247,19 @@ Run(char **argv)
 			free(args);
 		return -1;
 	}
+	*/
 
+	Log(0, "UID:GID=%d:%d Prio=%d Class=%s Name=%s Dir=%s Cmd=%s", proc.proc_uid, proc.proc_gid, 
+			proc.proc_prio, proc.proc_class, proc.proc_name, proc.proc_dir, proc.proc_cmd);
+
 	if (3 <= Verbose) {
 		char **el = args - 1;
 		while (*++el)
 			Log(3, "args: %s", *el);
 	}
 
+	fflush(lf);
+
 	execve(cmd, args, environ);
 	if (args)
 		free(args);
@@ -251,12 +274,23 @@ main(int argc, char **argv)
 	char ch, *str, szCfg[MAXPATHLEN], flg = 0;
 	struct passwd *pass;
 	struct group *grp;
+	FILE *f;
 
-	initProg(*argv);
+	initProg();
 	strlcpy(szCfg, DEFAULT_CONFIG, sizeof szCfg);
 
-	while ((ch = getopt(argc, argv, "hvc:u:g:p:d:")) != -1)
+	while ((ch = getopt(argc, argv, "hvc:u:g:p:d:l:")) != -1)
 		switch (ch) {
+			case 'l':
+				f = fopen(optarg, "a");
+				if (!f) {
+					Err("Error:: logfile #%d - %s", errno, strerror(errno));
+					return 1;
+				} else
+					if (fileno(lf) > 2)
+						fclose(lf);
+				lf = f;
+				break;
 			case 'd':
 				strlcpy(proc.proc_dir, optarg, sizeof proc.proc_dir);
 				flg |= 8;
@@ -287,7 +321,6 @@ main(int argc, char **argv)
 				break;
 			case 'c':
 				strlcpy(szCfg, optarg, sizeof szCfg);
-				flg++;
 				break;
 			case 'v':
 				Verbose++;
@@ -295,6 +328,8 @@ main(int argc, char **argv)
 			case 'h':
 			default:
 				Usage();
+				if (fileno(lf) > 2)
+					fclose(lf);
 				return 1;
 		}
 	argc -= optind;
@@ -302,6 +337,8 @@ main(int argc, char **argv)
 	if (!argc) {
 		if (!(str = getenv("PATH_TRANSLATED"))) {
 			Usage();
+			if (fileno(lf) > 2)
+				fclose(lf);
 			return 1;
 		} else
 			strlcpy(proc.proc_name, str, sizeof proc.proc_name);
@@ -310,23 +347,28 @@ main(int argc, char **argv)
 	Log(2, "Try to load config %s", szCfg);
 	if (LoadConfig(szCfg, &cfg)) {
 		Err("Error:: can`t load config #%d - %s\n", cfg_GetErrno(), cfg_GetError());
+		if (fileno(lf) > 2)
+			fclose(lf);
 		return 2;
 	} else
 		if (LoadCfgData(flg) == -1) {
 			UnloadConfig(&cfg);
+			if (fileno(lf) > 2)
+				fclose(lf);
 			closelog();
 			return 3;
 		}
 	UnloadConfig(&cfg);
 
-	Log(1, "UID:GID=%d:%d Prio=%d Class=%s Name=%s Dir=%s Cmd=%s\n", proc.proc_uid, proc.proc_gid, 
-			proc.proc_prio, proc.proc_class, proc.proc_name, proc.proc_dir, proc.proc_cmd);
-
 	if (Run(argv) == -1) {
+		if (fileno(lf) > 2)
+			fclose(lf);
 		closelog();
 		return 4;
 	}
 
+	if (fileno(lf) > 2)
+		fclose(lf);
 	closelog();
 	return 0;
 }