diff options
| author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2006-12-19 08:55:38 +0000 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2006-12-19 08:55:38 +0000 |
| commit | 359d7ca0e70d4acfc3b7e792bf28f5b5581af8ff (patch) | |
| tree | f38a322dcf259e50d1f422bef41c23c2fd8f7ba5 /loginutils/su.c | |
| parent | 7f1dc21a5df2aecd58c57e9fb59797401eea7270 (diff) | |
| download | busybox-w32-359d7ca0e70d4acfc3b7e792bf28f5b5581af8ff.tar.gz busybox-w32-359d7ca0e70d4acfc3b7e792bf28f5b5581af8ff.tar.bz2 busybox-w32-359d7ca0e70d4acfc3b7e792bf28f5b5581af8ff.zip | |
- rename SU_SYSLOG to FEATURE_SU_SYSLOG
Diffstat (limited to 'loginutils/su.c')
| -rw-r--r-- | loginutils/su.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/loginutils/su.c b/loginutils/su.c index 25b85920a..133f6ed63 100644 --- a/loginutils/su.c +++ b/loginutils/su.c | |||
| @@ -8,6 +8,9 @@ | |||
| 8 | #include "busybox.h" | 8 | #include "busybox.h" |
| 9 | #include <syslog.h> | 9 | #include <syslog.h> |
| 10 | 10 | ||
| 11 | #define SU_OPT_mp (3) | ||
| 12 | #define SU_OPT_l (4) | ||
| 13 | |||
| 11 | int su_main(int argc, char **argv) | 14 | int su_main(int argc, char **argv) |
| 12 | { | 15 | { |
| 13 | unsigned flags; | 16 | unsigned flags; |
| @@ -22,8 +25,6 @@ int su_main(int argc, char **argv) | |||
| 22 | flags = getopt32(argc, argv, "mplc:s:", &opt_command, &opt_shell); | 25 | flags = getopt32(argc, argv, "mplc:s:", &opt_command, &opt_shell); |
| 23 | argc -= optind; | 26 | argc -= optind; |
| 24 | argv -= optind; | 27 | argv -= optind; |
| 25 | #define SU_OPT_mp (3) | ||
| 26 | #define SU_OPT_l (4) | ||
| 27 | 28 | ||
| 28 | if (argc && LONE_DASH(argv[0])) { | 29 | if (argc && LONE_DASH(argv[0])) { |
| 29 | flags |= SU_OPT_l; | 30 | flags |= SU_OPT_l; |
| @@ -38,7 +39,7 @@ int su_main(int argc, char **argv) | |||
| 38 | argv++; | 39 | argv++; |
| 39 | } | 40 | } |
| 40 | 41 | ||
| 41 | if (ENABLE_SU_SYSLOG) { | 42 | if (ENABLE_FEATURE_SU_SYSLOG) { |
| 42 | /* The utmp entry (via getlogin) is probably the best way to identify | 43 | /* The utmp entry (via getlogin) is probably the best way to identify |
| 43 | the user, especially if someone su's from a su-shell. | 44 | the user, especially if someone su's from a su-shell. |
| 44 | But getlogin can fail -- usually due to lack of utmp entry. | 45 | But getlogin can fail -- usually due to lack of utmp entry. |
| @@ -49,7 +50,7 @@ int su_main(int argc, char **argv) | |||
| 49 | } | 50 | } |
| 50 | 51 | ||
| 51 | pw = getpwnam(opt_username); | 52 | pw = getpwnam(opt_username); |
| 52 | if (!pw) | 53 | if (!pw) |
| 53 | bb_error_msg_and_die("unknown id: %s", opt_username); | 54 | bb_error_msg_and_die("unknown id: %s", opt_username); |
| 54 | 55 | ||
| 55 | /* Make sure pw->pw_shell is non-NULL. It may be NULL when NEW_USER | 56 | /* Make sure pw->pw_shell is non-NULL. It may be NULL when NEW_USER |
| @@ -59,17 +60,17 @@ int su_main(int argc, char **argv) | |||
| 59 | pw->pw_shell = (char *)DEFAULT_SHELL; | 60 | pw->pw_shell = (char *)DEFAULT_SHELL; |
| 60 | 61 | ||
| 61 | if ((cur_uid == 0) || correct_password(pw)) { | 62 | if ((cur_uid == 0) || correct_password(pw)) { |
| 62 | if (ENABLE_SU_SYSLOG) | 63 | if (ENABLE_FEATURE_SU_SYSLOG) |
| 63 | syslog(LOG_NOTICE, "%c %s %s:%s", | 64 | syslog(LOG_NOTICE, "%c %s %s:%s", |
| 64 | '+', tty, old_user, opt_username); | 65 | '+', tty, old_user, opt_username); |
| 65 | } else { | 66 | } else { |
| 66 | if (ENABLE_SU_SYSLOG) | 67 | if (ENABLE_FEATURE_SU_SYSLOG) |
| 67 | syslog(LOG_NOTICE, "%c %s %s:%s", | 68 | syslog(LOG_NOTICE, "%c %s %s:%s", |
| 68 | '-', tty, old_user, opt_username); | 69 | '-', tty, old_user, opt_username); |
| 69 | bb_error_msg_and_die("incorrect password"); | 70 | bb_error_msg_and_die("incorrect password"); |
| 70 | } | 71 | } |
| 71 | 72 | ||
| 72 | if (ENABLE_FEATURE_CLEAN_UP && ENABLE_SU_SYSLOG) { | 73 | if (ENABLE_FEATURE_CLEAN_UP && ENABLE_FEATURE_SU_SYSLOG) { |
| 73 | closelog(); | 74 | closelog(); |
| 74 | free(old_user); | 75 | free(old_user); |
| 75 | } | 76 | } |