svn commit: trunk/busybox: loginutils scripts

[aldot at busybox.net]

Author: aldot
Date: 2006-12-19 00:55:38 -0800 (Tue, 19 Dec 2006)
New Revision: 17004

Log:
- rename SU_SYSLOG to FEATURE_SU_SYSLOG


Modified:
   trunk/busybox/loginutils/Config.in
   trunk/busybox/loginutils/su.c
   trunk/busybox/scripts/defconfig


Changeset:
Modified: trunk/busybox/loginutils/Config.in
===================================================================
--- trunk/busybox/loginutils/Config.in	2006-12-19 01:10:25 UTC (rev 17003)
+++ trunk/busybox/loginutils/Config.in	2006-12-19 08:55:38 UTC (rev 17004)
@@ -161,7 +161,7 @@
 	  Note that Busybox binary must be setuid root for this applet to
 	  work properly.
 
-config SU_SYSLOG
+config FEATURE_SU_SYSLOG
 	bool "Enable su to write to syslog"
 	default y
 	depends on SU

Modified: trunk/busybox/loginutils/su.c
===================================================================
--- trunk/busybox/loginutils/su.c	2006-12-19 01:10:25 UTC (rev 17003)
+++ trunk/busybox/loginutils/su.c	2006-12-19 08:55:38 UTC (rev 17004)
@@ -8,6 +8,9 @@
 #include "busybox.h"
 #include <syslog.h>
 
+#define SU_OPT_mp (3)
+#define SU_OPT_l (4)
+
 int su_main(int argc, char **argv)
 {
 	unsigned flags;
@@ -22,8 +25,6 @@
 	flags = getopt32(argc, argv, "mplc:s:", &opt_command, &opt_shell);
 	argc -= optind;
 	argv -= optind;
-#define SU_OPT_mp (3)
-#define SU_OPT_l (4)
 
 	if (argc && LONE_DASH(argv[0])) {
 		flags |= SU_OPT_l;
@@ -38,7 +39,7 @@
 		argv++;
 	}
 
-	if (ENABLE_SU_SYSLOG) {
+	if (ENABLE_FEATURE_SU_SYSLOG) {
 		/* The utmp entry (via getlogin) is probably the best way to identify
 		the user, especially if someone su's from a su-shell.
 		But getlogin can fail -- usually due to lack of utmp entry.
@@ -49,7 +50,7 @@
 	}
 
 	pw = getpwnam(opt_username);
-	if (!pw)	
+	if (!pw)
 		bb_error_msg_and_die("unknown id: %s", opt_username);
 
 	/* Make sure pw->pw_shell is non-NULL.  It may be NULL when NEW_USER
@@ -59,17 +60,17 @@
 		pw->pw_shell = (char *)DEFAULT_SHELL;
 
 	if ((cur_uid == 0) || correct_password(pw)) {
-		if (ENABLE_SU_SYSLOG)
+		if (ENABLE_FEATURE_SU_SYSLOG)
 			syslog(LOG_NOTICE, "%c %s %s:%s",
 				'+', tty, old_user, opt_username);
 	} else {
-		if (ENABLE_SU_SYSLOG)
+		if (ENABLE_FEATURE_SU_SYSLOG)
 			syslog(LOG_NOTICE, "%c %s %s:%s",
 				'-', tty, old_user, opt_username);
 		bb_error_msg_and_die("incorrect password");
 	}
 
-	if (ENABLE_FEATURE_CLEAN_UP && ENABLE_SU_SYSLOG) {
+	if (ENABLE_FEATURE_CLEAN_UP && ENABLE_FEATURE_SU_SYSLOG) {
 		closelog();
 		free(old_user);
 	}

Modified: trunk/busybox/scripts/defconfig
===================================================================
--- trunk/busybox/scripts/defconfig	2006-12-19 01:10:25 UTC (rev 17003)
+++ trunk/busybox/scripts/defconfig	2006-12-19 08:55:38 UTC (rev 17004)
@@ -340,7 +340,7 @@
 CONFIG_FEATURE_SECURETTY=y
 CONFIG_PASSWD=y
 CONFIG_SU=y
-CONFIG_SU_SYSLOG=y
+CONFIG_FEATURE_SU_SYSLOG=y
 CONFIG_SULOGIN=y
 CONFIG_VLOCK=y