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

* lib/groupio.c, lib/groupio.h, lib/pwio.c, lib/pwio.h,

Browse Source 
lib/sgroupio.c, lib/sgroupio.h, lib/shadowio.c, lib/shadowio.h:
	Added *_dbname() functions to retrieve the name of the databases.
	* lib/groupio.c, lib/groupio.h, lib/pwio.c, lib/pwio.h,
	lib/sgroupio.c, lib/sgroupio.h, lib/shadowio.c, lib/shadowio.h:
	*_name() functions renamed *setname().
	* src/grpck.c, src/pwck.c: Likewise.
	* lib/groupio.h, lib/pwio.h, lib/sgroupio.h, lib/shadowio.h: Added
	the name of the arguments to the prototypes.
	* src/chage, src/chfn.c, src/chgpasswd.c, src/chpasswd.c,
	src/chsh.c, src/gpasswd.c, src/groupadd.c, src/groupdel.c,
	src/groupmod.c, src/grpck.c, src/grpconv.c, src/grpunconv.c,
	src/newusers.c, src/passwd.c, src/pwck.c, src/pwconv.c,
	src/pwunconv.c, src/useradd.c, src/userdel.c, src/usermod.c:
	Harmonize the erro & syslog messages in case of failure of the
	*_lock(), *_open(), *_close(), *_unlock(), *_remove() functions.
	* src/chgpasswd.c, src/chpasswd.c, src/usermod.c: Avoid
	capitalized messages.
	* src/chpasswd.c, src/useradd.c, src/usermod.c: Harmonize messages
	in case of inexistent entries.
	* src/usermod.c:  Harmonize messages in case of already existing
	entries.
	* src/newusers.c, src/useradd.c: Simplify PAM error handling.
	* src/useradd.c: Report failures to unlock files (stderr, syslog,
	and audit). But do not fail (continue).
	* src/useradd.c (open_files): Do not report to syslog & audit
	failures to lock or open the databases. This might be harmless,
	and the logs were not already informed that a change was
	requested.
	* src/usermod.c: It's not the account which is unlocked, but its
	password.
This commit is contained in:
nekral-guest
2008-08-06 15:57:31 +00:00
parent b0fe7d3a0b
commit 7fc596fb8a
29 changed files with 703 additions and 528 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/chage.c
View File

@@ -555,16 +555,16 @@ static void open_files (bool readonly)
*/
if (!readonly && (pw_lock () == 0)) {
fprintf (stderr,
_("%s: can't lock password file\n"), Prog);
SYSLOG ((LOG_ERR, "failed locking %s", PASSWD_FILE));
_("%s: cannot lock %s\n"), Prog, pw_dbname ());
SYSLOG ((LOG_ERR, "cannot lock %s", pw_dbname ()));
fail_exit (E_NOPERM);
}
if (!readonly) {
pw_locked = true;
}
if (pw_open (readonly ? O_RDONLY: O_RDWR) == 0) {
fprintf (stderr, _("%s: can't open password file\n"), Prog);
SYSLOG ((LOG_ERR, "failed opening %s", PASSWD_FILE));
fprintf (stderr, _("%s: cannot open %s\n"), Prog, pw_dbname ());
SYSLOG ((LOG_ERR, "cannot open %s", pw_dbname ()));
fail_exit (E_NOPERM);
}
@@ -576,8 +576,8 @@ static void open_files (bool readonly)
*/
if (!readonly && (spw_lock () == 0)) {
fprintf (stderr,
_("%s: can't lock shadow password file\n"), Prog);
SYSLOG ((LOG_ERR, "failed locking %s", SHADOW_FILE));
_("%s: cannot lock %s\n"), Prog, spw_dbname ());
SYSLOG ((LOG_ERR, "cannot lock %s", spw_dbname ()));
fail_exit (E_NOPERM);
}
if (!readonly) {
@@ -585,8 +585,8 @@ static void open_files (bool readonly)
}
if (spw_open (readonly ? O_RDONLY: O_RDWR) == 0) {
fprintf (stderr,
_("%s: can't open shadow password file\n"), Prog);
SYSLOG ((LOG_ERR, "failed opening %s", SHADOW_FILE));
_("%s: cannot open %s\n"), Prog, spw_dbname ());
SYSLOG ((LOG_ERR, "cannot open %s", spw_dbname ()));
fail_exit (E_NOPERM);
}
}
@@ -602,8 +602,8 @@ static void close_files (void)
*/
if (spw_close () == 0) {
fprintf (stderr,
_("%s: can't rewrite shadow password file\n"), Prog);
SYSLOG ((LOG_ERR, "failed rewriting %s", SHADOW_FILE));
_("%s: failure while writing changes to %s\n"), Prog, spw_dbname ());
SYSLOG ((LOG_ERR, "failure while writing changes to %s", spw_dbname ()));
fail_exit (E_NOPERM);
}
@@ -612,8 +612,8 @@ static void close_files (void)
* will be re-written.
*/
if (pw_close () == 0) {
fprintf (stderr, _("%s: can't rewrite password file\n"), Prog);
SYSLOG ((LOG_ERR, "failed rewriting %s", PASSWD_FILE));
fprintf (stderr, _("%s: failure while writing changes to %s\n"), Prog, pw_dbname ());
SYSLOG ((LOG_ERR, "failure while writing changes to %s", pw_dbname ()));
fail_exit (E_NOPERM);
}
spw_unlock ();
@@ -647,8 +647,8 @@ static void update_age (const struct spwd *sp, const struct passwd *pw)
pwent.pw_passwd = SHADOW_PASSWD_STRING; /* XXX warning: const */
if (pw_update (&pwent) == 0) {
fprintf (stderr,
_("%s: can't update password file\n"), Prog);
SYSLOG ((LOG_ERR, "failed updating %s", PASSWD_FILE));
_("%s: cannot update %s\n"), Prog, pw_dbname ());
SYSLOG ((LOG_ERR, "cannot update %s", pw_dbname ()));
fail_exit (E_NOPERM);
}
} else {
@@ -671,8 +671,8 @@ static void update_age (const struct spwd *sp, const struct passwd *pw)
if (spw_update (&spwent) == 0) {
fprintf (stderr,
_("%s: can't update shadow password file\n"), Prog);
SYSLOG ((LOG_ERR, "failed updating %s", SHADOW_FILE));
_("%s: cannot update %s\n"), Prog, spw_dbname ());
SYSLOG ((LOG_ERR, "cannot update %s", spw_dbname ()));
fail_exit (E_NOPERM);
}
@@ -808,8 +808,8 @@ int main (int argc, char **argv)
pw = pw_locate (argv[optind]);
if (NULL == pw) {
fprintf (stderr, _("%s: unknown user %s\n"), Prog,
argv[optind]);
fprintf (stderr, _("%s: user '%s' does not exist in %s\n"),
Prog, argv[optind], pw_dbname ());
closelog ();
exit (E_NOPERM);
}