From d144a8e142a926ef42e0793ec726e086567337f8 Mon Sep 17 00:00:00 2001 From: Yuri Pankov Date: Sun, 21 Oct 2018 14:23:56 +0000 Subject: 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 --- pw/pw_conf.c | 12 +++++++----- 1 file 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 * -- cgit v1.2.3-56-ge451