emo/shadow
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

* libmisc/age.c, libmisc/yesno.c, src/lastlog.c, src/grpck.c,

Browse Source 
src/chfn.c, src/passwd.c, src/chage.c, src/login.c, src/sulogin.c,
   src/chsh.c: Fix call to puts (remove end of line, or use fputs).
 * po/*.po: Unfuzzy PO files according to above change.
This commit is contained in:
nekral-guest
2008-02-03 16:28:03 +00:00
parent 5672b53263
commit 57f713e426
49 changed files with 2128 additions and 2076 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/chage.c
View File

@@ -197,8 +197,8 @@ static int new_fields (void)
char buf[200];
char *cp;
puts (_("Enter the new value, or press ENTER for the default\n"));
puts ("\n");
puts (_("Enter the new value, or press ENTER for the default"));
puts ("");
snprintf (buf, sizeof buf, "%ld", mindays);
change_field (buf, sizeof buf, _("Minimum Password Age"));
@@ -297,11 +297,11 @@ static void list_fields (void)
* The "last change" date is either "never" or the date the password
* was last modified. The date is the number of days since 1/1/1970.
*/
puts (_("Last password change\t\t\t\t\t: "));
fputs (_("Last password change\t\t\t\t\t: "), stdout);
if (lastday < 0) {
puts (_("never\n"));
puts (_("never"));
} else if (lastday == 0) {
puts (_("password must be changed\n"));
puts (_("password must be changed"));
} else {
changed = lastday * SCALE;
print_date (changed);
@@ -311,10 +311,10 @@ static void list_fields (void)
* The password expiration date is determined from the last change
* date plus the number of days the password is valid for.
*/
puts (_("Password expires\t\t\t\t\t: "));
fputs (_("Password expires\t\t\t\t\t: "), stdout);
if ((lastday <= 0) || (maxdays >= (10000 * (DAY / SCALE)))
|| (maxdays < 0)) {
puts (_("never\n"));
puts (_("never"));
} else {
expires = changed + maxdays * SCALE;
print_date (expires);
@@ -326,10 +326,10 @@ static void list_fields (void)
* number of inactive days is added. The resulting date is when the
* active will be disabled.
*/
puts (_("Password inactive\t\t\t\t\t: "));
fputs (_("Password inactive\t\t\t\t\t: "), stdout);
if ((lastday <= 0) || (inactdays < 0) ||
(maxdays >= (10000 * (DAY / SCALE))) || (maxdays < 0)) {
puts (_("never\n"));
puts (_("never"));
} else {
expires = changed + (maxdays + inactdays) * SCALE;
print_date (expires);
@@ -339,9 +339,9 @@ static void list_fields (void)
* The account will expire on the given date regardless of the
* password expiring or not.
*/
puts (_("Account expires\t\t\t\t\t\t: "));
fputs (_("Account expires\t\t\t\t\t\t: "), stdout);
if (expdays < 0) {
puts (_("never\n"));
puts (_("never"));
} else {
expires = expdays * SCALE;
print_date (expires);

2
src/chfn.c
View File

@@ -161,7 +161,7 @@ static int may_change_field (int field)
*/
static void new_fields (void)
{
puts (_("Enter the new value, or press ENTER for the default\n"));
puts (_("Enter the new value, or press ENTER for the default"));
if (may_change_field ('f')) {
change_field (fullnm, sizeof fullnm, _("Full Name"));

2
src/chsh.c
View File

@@ -99,7 +99,7 @@ static void usage (void)
*/
static void new_fields (void)
{
puts (_("Enter the new value, or press ENTER for the default\n"));
puts (_("Enter the new value, or press ENTER for the default"));
change_field (loginsh, sizeof loginsh, _("Login Shell"));
}

8
src/grpck.c
View File

@@ -416,7 +416,7 @@ static void check_grp_file (int *errors, int *changed)
* Tell the user this entire line is bogus and ask
* them to delete it.
*/
puts (_("invalid group file entry\n"));
puts (_("invalid group file entry"));
printf (_("delete line '%s'? "), gre->line);
*errors += 1;
@@ -476,7 +476,7 @@ static void check_grp_file (int *errors, int *changed)
* Tell the user this entry is a duplicate of
* another and ask them to delete it.
*/
puts (_("duplicate group entry\n"));
puts (_("duplicate group entry"));
printf (_("delete line '%s'? "), gre->line);
*errors += 1;
@@ -604,7 +604,7 @@ static void check_sgr_file (int *errors, int *changed)
* Tell the user this entire line is bogus and ask
* them to delete it.
*/
puts (_("invalid shadow group file entry\n"));
puts (_("invalid shadow group file entry"));
printf (_("delete line '%s'? "), sge->line);
*errors += 1;
@@ -664,7 +664,7 @@ static void check_sgr_file (int *errors, int *changed)
* Tell the user this entry is a duplicate of
* another and ask them to delete it.
*/
puts (_("duplicate shadow group entry\n"));
puts (_("duplicate shadow group entry"));
printf (_("delete line '%s'? "), sge->line);
*errors += 1;

4
src/lastlog.c
View File

@@ -95,9 +95,9 @@ static void print_one (const struct passwd *pw)
if (!once) {
#ifdef HAVE_LL_HOST
puts (_("Username Port From Latest\n"));
puts (_("Username Port From Latest"));
#else
puts (_("Username Port Latest\n"));
puts (_("Username Port Latest"));
#endif
once++;
}

8
src/login.c
View File

@@ -189,7 +189,7 @@ static void setup_tty (void)
*/
static void bad_time_notify (void)
{
puts (_("Invalid login time\n"));
puts (_("Invalid login time"));
fflush (stdout);
}
@@ -223,7 +223,7 @@ static void check_nologin (void)
fflush (stdout);
fclose (nlfp);
} else
puts (_("\nSystem closed for routine maintenance\n"));
puts (_("\nSystem closed for routine maintenance"));
/*
* Non-root users must exit. Root gets the message, but
* gets to login.
@@ -233,7 +233,7 @@ static void check_nologin (void)
closelog ();
exit (0);
}
puts (_("\n[Disconnect bypassed -- root login allowed.]\n"));
puts (_("\n[Disconnect bypassed -- root login allowed.]"));
}
}
#endif /* !USE_PAM */
@@ -1084,7 +1084,7 @@ int main (int argc, char **argv)
if (faillog.fail_max &&
faillog.fail_cnt >= faillog.fail_max) {
puts (_
("Warning: login re-enabled after temporary lockout.\n"));
("Warning: login re-enabled after temporary lockout."));
SYSLOG ((LOG_WARN,
"login `%s' re-enabled after temporary lockout (%d failures)",
username, (int) faillog.fail_cnt));

8
src/passwd.c
View File

@@ -282,7 +282,7 @@ static int new_password (const struct passwd *pw)
strzero (cp);
if (!amroot && (!obscure (orig, pass, pw) || reuse (pass, pw))) {
puts (_("Try again.\n"));
puts (_("Try again."));
continue;
}
@@ -293,7 +293,7 @@ static int new_password (const struct passwd *pw)
*/
if (amroot && !warned && getdef_bool ("PASS_ALWAYS_WARN")
&& (!obscure (orig, pass, pw) || reuse (pass, pw))) {
puts (_("\nWarning: weak password (enter it again to use it anyway).\n"));
puts (_("\nWarning: weak password (enter it again to use it anyway)."));
warned++;
continue;
}
@@ -948,9 +948,9 @@ int main (int argc, char **argv)
closelog ();
if (!qflg) {
if (!eflg)
puts (_("Password changed.\n"));
puts (_("Password changed."));
else
puts (_("Password set to expire.\n"));
puts (_("Password set to expire."));
}
exit (E_SUCCESS);
/* NOT REACHED */

8
src/pwck.c
View File

@@ -276,7 +276,7 @@ static void check_pw_file (int *errors, int *changed)
* Tell the user this entire line is bogus and ask
* them to delete it.
*/
puts (_("invalid password file entry\n"));
puts (_("invalid password file entry"));
printf (_("delete line '%s'? "), pfe->line);
*errors += 1;
@@ -335,7 +335,7 @@ static void check_pw_file (int *errors, int *changed)
* Tell the user this entry is a duplicate of
* another and ask them to delete it.
*/
puts (_("duplicate password entry\n"));
puts (_("duplicate password entry"));
printf (_("delete line '%s'? "), pfe->line);
*errors += 1;
@@ -487,7 +487,7 @@ static void check_spw_file (int *errors, int *changed)
* Tell the user this entire line is bogus and ask
* them to delete it.
*/
puts (_("invalid shadow password file entry\n"));
puts (_("invalid shadow password file entry"));
printf (_("delete line '%s'? "), spe->line);
*errors += 1;
@@ -546,7 +546,7 @@ static void check_spw_file (int *errors, int *changed)
* Tell the user this entry is a duplicate of
* another and ask them to delete it.
*/
puts (_("duplicate shadow password entry\n"));
puts (_("duplicate shadow password entry"));
printf (_("delete line '%s'? "), spe->line);
*errors += 1;

8
src/sulogin.c
View File

@@ -121,7 +121,7 @@ static RETSIGTYPE catch_signals (unused int sig)
}
}
if (access (PASSWD_FILE, F_OK) == -1) { /* must be a password file! */
puts (_("No password file\n"));
puts (_("No password file"));
#ifdef USE_SYSLOG
SYSLOG (LOG_WARN, "No password file\n");
closelog ();
@@ -171,7 +171,7 @@ static RETSIGTYPE catch_signals (unused int sig)
/*
* Fail secure
*/
puts (_("No password entry for 'root'\n"));
puts (_("No password entry for 'root'"));
#ifdef USE_SYSLOG
SYSLOG (LOG_WARN, "No password entry for 'root'\n");
closelog ();
@@ -200,7 +200,7 @@ static RETSIGTYPE catch_signals (unused int sig)
SYSLOG (LOG_INFO, "Normal startup\n");
closelog ();
#endif
puts ("\n");
puts ("");
#ifdef TELINIT
execl (PATH_TELINIT, "telinit", RUNLEVEL, (char *) 0);
#endif
@@ -223,7 +223,7 @@ static RETSIGTYPE catch_signals (unused int sig)
signal (SIGALRM, SIG_DFL);
environ = newenvp; /* make new environment active */
puts (_("Entering System Maintenance Mode\n"));
puts (_("Entering System Maintenance Mode"));
#ifdef USE_SYSLOG
SYSLOG (LOG_INFO, "System Maintenance Mode\n");
#endif