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

* src/chfn.c, src/chgpasswd.c, src/chpasswd.c, src/gpasswd.c,

Browse Source 
src/groupadd.c, src/groupdel.c, src/groupmems.c, src/groupmod.c,
	src/grpconv.c, src/grpunconv.c, src/newusers.c, src/pwconv.c,
	src/pwunconv.c, src/useradd.c, src/userdel.c: Harmonize the name
	of the variables keeping the lock status, to match the shadow
	library prefixes.
This commit is contained in:
nekral-guest
2008-08-22 02:22:34 +00:00
parent 82ed690817
commit 82779cd336
16 changed files with 151 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/pwconv.c
View File

@ -84,15 +84,15 @@
* Global variables
*/
static char *Prog;
static bool shadow_locked = false;
static bool passwd_locked = false;
static bool spw_locked = false;
static bool pw_locked = false;
/* local function prototypes */
static void fail_exit (int status);
static void fail_exit (int status)
{
if (passwd_locked) {
if (pw_locked) {
if (pw_unlock () == 0) {
fprintf (stderr, _("%s: failed to unlock %s\n"), Prog, pw_dbname ());
SYSLOG ((LOG_ERR, "failed to unlock %s", pw_dbname ()));
@ -100,7 +100,7 @@ static void fail_exit (int status)
}
}
if (shadow_locked) {
if (spw_locked) {
if (spw_unlock () == 0) {
fprintf (stderr, _("%s: failed to unlock %s\n"), Prog, spw_dbname ());
SYSLOG ((LOG_ERR, "failed to unlock %s", spw_dbname ()));
@ -131,7 +131,7 @@ int main (int argc, char **argv)
Prog, pw_dbname ());
fail_exit (E_PWDBUSY);
}
passwd_locked = true;
pw_locked = true;
if (pw_open (O_RDWR) == 0) {
fprintf (stderr,
_("%s: cannot open %s\n"), Prog, pw_dbname ());
@ -144,7 +144,7 @@ int main (int argc, char **argv)
Prog, spw_dbname ());
fail_exit (E_PWDBUSY);
}
shadow_locked = true;
spw_locked = true;
if (spw_open (O_CREAT | O_RDWR) == 0) {
fprintf (stderr,
_("%s: cannot open %s\n"), Prog, spw_dbname ());
@ -242,7 +242,7 @@ int main (int argc, char **argv)
/* continue */
}
if (passwd_locked) {
if (pw_locked) {
if (pw_unlock () == 0) {
fprintf (stderr, _("%s: failed to unlock %s\n"), Prog, pw_dbname ());
SYSLOG ((LOG_ERR, "failed to unlock %s", pw_dbname ()));
@ -250,7 +250,7 @@ int main (int argc, char **argv)
}
}
if (shadow_locked) {
if (spw_locked) {
if (spw_unlock () == 0) {
fprintf (stderr, _("%s: failed to unlock %s\n"), Prog, spw_dbname ());
SYSLOG ((LOG_ERR, "failed to unlock %s", spw_dbname ()));