VesperOS/shadow
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

src/vipw.c: Reverse logic and variable name

Browse Source 
Since we're checking for "vigr", it makes more sense to name the
variable accordingly.

Signed-off-by: Alejandro Colomar <alx@kernel.org>
This commit is contained in:
Alejandro Colomar
2024-03-07 23:34:31 +01:00
committed by Serge Hallyn
parent e6c2e43937
commit 0ab893a734
1 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vipw.c
+27 -27
View File
@@ -468,8 +468,8 @@ vipwedit (const char *file, int (*file_lock) (void), int (*file_unlock) (void))
int main (int argc, char **argv) int main (int argc, char **argv)
{ {
bool editshadow = false; bool editshadow = false;
bool do_vipw; bool do_vigr;
Prog = Basename (argv[0]); Prog = Basename (argv[0]);
log_set_progname(Prog); log_set_progname(Prog);
@@ -481,9 +481,9 @@ int main (int argc, char **argv)
process_root_flag ("-R", argc, argv); process_root_flag ("-R", argc, argv);
do_vipw = (strcmp (Prog, "vigr") != 0); do_vigr = (strcmp(Prog, "vigr") == 0);
OPENLOG (do_vipw ? "vipw" : "vigr"); OPENLOG(do_vigr ? "vigr" : "vipw");
{ {
/* /*
@@ -511,13 +511,13 @@ int main (int argc, char **argv)
long_options, NULL)) != -1) { long_options, NULL)) != -1) {
switch (c) { switch (c) {
case 'g': case 'g':
do_vipw = false; do_vigr = true;
break; break;
case 'h': case 'h':
usage (E_SUCCESS); usage (E_SUCCESS);
break; break;
case 'p': case 'p':
do_vipw = true; do_vigr = false;
break; break;
case 'q': case 'q':
quiet = true; quiet = true;
@@ -542,7 +542,27 @@ int main (int argc, char **argv)
} }
} }
if (do_vipw) { if (do_vigr) {
#ifdef SHADOWGRP
if (editshadow) {
vipwedit (sgr_dbname (), sgr_lock, sgr_unlock);
printf (MSG_WARN_EDIT_OTHER_FILE,
sgr_dbname (),
gr_dbname (),
"vigr");
} else {
#endif /* SHADOWGRP */
vipwedit (gr_dbname (), gr_lock, gr_unlock);
#ifdef SHADOWGRP
if (sgr_file_present ()) {
printf (MSG_WARN_EDIT_OTHER_FILE,
gr_dbname (),
sgr_dbname (),
"vigr -s");
}
}
#endif /* SHADOWGRP */
} else {
if (editshadow) { if (editshadow) {
#ifdef WITH_TCB #ifdef WITH_TCB
if (getdef_bool ("USE_TCB") && (NULL != user)) { if (getdef_bool ("USE_TCB") && (NULL != user)) {
@@ -569,26 +589,6 @@ int main (int argc, char **argv)
"vipw -s"); "vipw -s");
} }
} }
} else {
#ifdef SHADOWGRP
if (editshadow) {
vipwedit (sgr_dbname (), sgr_lock, sgr_unlock);
printf (MSG_WARN_EDIT_OTHER_FILE,
sgr_dbname (),
gr_dbname (),
"vigr");
} else {
#endif /* SHADOWGRP */
vipwedit (gr_dbname (), gr_lock, gr_unlock);
#ifdef SHADOWGRP
if (sgr_file_present ()) {
printf (MSG_WARN_EDIT_OTHER_FILE,
gr_dbname (),
sgr_dbname (),
"vigr -s");
}
}
#endif /* SHADOWGRP */
} }
nscd_flush_cache ("passwd"); nscd_flush_cache ("passwd");