diff options
| author | Yuri Pankov <yuripv@FreeBSD.org> | 2018-10-21 14:23:56 +0000 |
|---|---|---|
| committer | Yuri Pankov <yuripv@FreeBSD.org> | 2018-10-21 14:23:56 +0000 |
| commit | 68d1891dcd9562dd914b16bfb34223c430b16b3f (patch) | |
| tree | 07eafb5df450a00006db46ca1c247a1ebddf24ae /pw/pw_conf.c | |
| parent | ccc84708d81c35b2f56e57c1818bdebd12426d3c (diff) | |
| download | pw-darwin-68d1891dcd9562dd914b16bfb34223c430b16b3f.tar.gz pw-darwin-68d1891dcd9562dd914b16bfb34223c430b16b3f.zip | |
pw: fix the checks in boolean_str() after r326738. Add related test
cases for `pw useradd -D -w`.
PR: 231649
Reviewed by: eugen
Approved by: kib (mentor)
Differential Revision: https://reviews.freebsd.org/D17299
Diffstat (limited to 'pw/pw_conf.c')
| -rw-r--r-- | pw/pw_conf.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/pw/pw_conf.c b/pw/pw_conf.c index 9dff3fe..c446a66 100644 --- a/pw/pw_conf.c +++ b/pw/pw_conf.c @@ -221,12 +221,14 @@ passwd_val(char const * str, int dflt) char const * boolean_str(int val) { - if (val == -1) - return "random"; - else if (val == -2) - return "none"; + if (val == P_NO) + return (boolfalse[0]); + else if (val == P_RANDOM) + return ("random"); + else if (val == P_NONE) + return ("none"); else - return val ? booltrue[0] : boolfalse[0]; + return (booltrue[0]); } char * |