diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2006-09-06 19:02:46 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2006-09-06 19:02:46 +0000 |
commit | 6d655be5df5a559253a3769f294a6255535ad3fd (patch) | |
tree | 4342fd4f88b84459ef5c2c2c2c6fb86863a7112f /loginutils | |
parent | 3538b9a8822421b7c8596a33a917dcf2f99c92b7 (diff) | |
download | busybox-w32-6d655be5df5a559253a3769f294a6255535ad3fd.tar.gz busybox-w32-6d655be5df5a559253a3769f294a6255535ad3fd.tar.bz2 busybox-w32-6d655be5df5a559253a3769f294a6255535ad3fd.zip |
removed a lot of trailing \n in bb_msg() calls. It is added
automatically by function itself.
Diffstat (limited to 'loginutils')
-rw-r--r-- | loginutils/passwd.c | 10 | ||||
-rw-r--r-- | loginutils/sulogin.c | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/loginutils/passwd.c b/loginutils/passwd.c index aa75dd260..b0770e65c 100644 --- a/loginutils/passwd.c +++ b/loginutils/passwd.c | |||
@@ -170,11 +170,11 @@ int passwd_main(int argc, char **argv) | |||
170 | } | 170 | } |
171 | pw = getpwnam(name); | 171 | pw = getpwnam(name); |
172 | if (!pw) { | 172 | if (!pw) { |
173 | bb_error_msg_and_die("Unknown user %s\n", name); | 173 | bb_error_msg_and_die("Unknown user %s", name); |
174 | } | 174 | } |
175 | if (!amroot && pw->pw_uid != getuid()) { | 175 | if (!amroot && pw->pw_uid != getuid()) { |
176 | syslog(LOG_WARNING, "can't change pwd for `%s'", name); | 176 | syslog(LOG_WARNING, "can't change pwd for `%s'", name); |
177 | bb_error_msg_and_die("Permission denied.\n"); | 177 | bb_error_msg_and_die("Permission denied."); |
178 | } | 178 | } |
179 | if (ENABLE_FEATURE_SHADOWPASSWDS) { | 179 | if (ENABLE_FEATURE_SHADOWPASSWDS) { |
180 | struct spwd *sp = getspnam(name); | 180 | struct spwd *sp = getspnam(name); |
@@ -188,12 +188,12 @@ int passwd_main(int argc, char **argv) | |||
188 | if (!amroot) { | 188 | if (!amroot) { |
189 | if (cp[0] == '!') { | 189 | if (cp[0] == '!') { |
190 | syslog(LOG_WARNING, "password locked for `%s'", np); | 190 | syslog(LOG_WARNING, "password locked for `%s'", np); |
191 | bb_error_msg_and_die( "The password for `%s' cannot be changed.\n", np); | 191 | bb_error_msg_and_die( "The password for `%s' cannot be changed.", np); |
192 | } | 192 | } |
193 | } | 193 | } |
194 | printf("Changing password for %s\n", name); | 194 | printf("Changing password for %s\n", name); |
195 | if (new_password(pw, amroot, algo)) { | 195 | if (new_password(pw, amroot, algo)) { |
196 | bb_error_msg_and_die( "The password for %s is unchanged.\n", name); | 196 | bb_error_msg_and_die( "The password for %s is unchanged.", name); |
197 | } | 197 | } |
198 | } else if (lflg) { | 198 | } else if (lflg) { |
199 | if (crypt_passwd[0] != '!') { | 199 | if (crypt_passwd[0] != '!') { |
@@ -222,7 +222,7 @@ int passwd_main(int argc, char **argv) | |||
222 | printf("Password changed.\n"); | 222 | printf("Password changed.\n"); |
223 | } else { | 223 | } else { |
224 | syslog(LOG_WARNING, "an error occurred updating the password file"); | 224 | syslog(LOG_WARNING, "an error occurred updating the password file"); |
225 | bb_error_msg_and_die("An error occurred updating the password file.\n"); | 225 | bb_error_msg_and_die("An error occurred updating the password file."); |
226 | } | 226 | } |
227 | if (ENABLE_FEATURE_CLEAN_UP) free(myname); | 227 | if (ENABLE_FEATURE_CLEAN_UP) free(myname); |
228 | return (0); | 228 | return (0); |
diff --git a/loginutils/sulogin.c b/loginutils/sulogin.c index b7e3f6fbf..1c49d324d 100644 --- a/loginutils/sulogin.c +++ b/loginutils/sulogin.c | |||
@@ -99,7 +99,7 @@ int sulogin_main(int argc, char **argv) | |||
99 | } | 99 | } |
100 | if (access(bb_path_passwd_file, 0) == -1) { | 100 | if (access(bb_path_passwd_file, 0) == -1) { |
101 | syslog(LOG_WARNING, "No password file\n"); | 101 | syslog(LOG_WARNING, "No password file\n"); |
102 | bb_error_msg_and_die("No password file\n"); | 102 | bb_error_msg_and_die("No password file"); |
103 | } | 103 | } |
104 | if (!isatty(0) || !isatty(1) || !isatty(2)) { | 104 | if (!isatty(0) || !isatty(1) || !isatty(2)) { |
105 | exit(EXIT_FAILURE); | 105 | exit(EXIT_FAILURE); |
@@ -113,8 +113,8 @@ int sulogin_main(int argc, char **argv) | |||
113 | 113 | ||
114 | signal(SIGALRM, catchalarm); | 114 | signal(SIGALRM, catchalarm); |
115 | if (!(pwd = getpwnam(name))) { | 115 | if (!(pwd = getpwnam(name))) { |
116 | syslog(LOG_WARNING, "No password entry for `root'\n"); | 116 | syslog(LOG_WARNING, "No password entry for `root'"); |
117 | bb_error_msg_and_die("No password entry for `root'\n"); | 117 | bb_error_msg_and_die("No password entry for `root'"); |
118 | } | 118 | } |
119 | pwent = *pwd; | 119 | pwent = *pwd; |
120 | #if ENABLE_FEATURE_SHADOWPASSWDS | 120 | #if ENABLE_FEATURE_SHADOWPASSWDS |