From c573f432fe511847b5603148a155ae47f56b938a Mon Sep 17 00:00:00 2001 From: nekral-guest Date: Tue, 10 Jun 2008 21:52:34 +0000 Subject: [PATCH] * lib/prototypes.h, libmisc/valid.c: Change the prototype of valid() to return a bool. * libmisc/valid.c: Add parenthesis. --- ChangeLog | 6 ++++++ lib/prototypes.h | 2 +- libmisc/valid.c | 16 ++++++++-------- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index f32580fa..f73f3a3f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-06-10 Nicolas François + + * lib/prototypes.h, libmisc/valid.c: Change the prototype of + valid() to return a bool. + * libmisc/valid.c: Add parenthesis. + 2008-06-10 Nicolas François * lib/commonio.c: Add brackets and parenthesis. diff --git a/lib/prototypes.h b/lib/prototypes.h index f94c563f..c275ba41 100644 --- a/lib/prototypes.h +++ b/lib/prototypes.h @@ -97,7 +97,7 @@ extern void sanitize_env (void); /* fields.c */ extern void change_field (char *, size_t, const char *); -extern int valid_field (const char *, const char *); +extern bool valid_field (const char *, const char *); /* find_new_ids.c */ extern int find_new_uid (bool sys_user, uid_t *uid, uid_t const *preferred_uid); diff --git a/libmisc/valid.c b/libmisc/valid.c index 1c85ed2b..42c0dbc3 100644 --- a/libmisc/valid.c +++ b/libmisc/valid.c @@ -49,7 +49,7 @@ * is used to indicate that a dummy salt must be used to encrypt the * password anyway. */ -int valid (const char *password, const struct passwd *ent) +bool valid (const char *password, const struct passwd *ent) { const char *encrypted; const char *salt; @@ -63,9 +63,9 @@ int valid (const char *password, const struct passwd *ent) if ((NULL != ent->pw_name) && ('\0' == ent->pw_passwd[0])) { if ('\0' == password[0]) { - return (1); /* user entered nothing */ + return true; /* user entered nothing */ } else { - return (0); /* user entered something! */ + return false; /* user entered something! */ } } @@ -73,7 +73,7 @@ int valid (const char *password, const struct passwd *ent) * If there is no entry then we need a salt to use. */ - if (ent->pw_name == (char *) 0 || ent->pw_passwd[0] == '\0') { + if ((NULL == ent->pw_name) || ('\0' == ent->pw_passwd[0])) { salt = "xx"; } else { salt = ent->pw_passwd; @@ -94,11 +94,11 @@ int valid (const char *password, const struct passwd *ent) * cause non-existent users to not be validated. */ - if ((NULL != ent->pw_name) && - (strcmp (encrypted, ent->pw_passwd) == 0)) { - return (1); + if ( (NULL != ent->pw_name) + && (strcmp (encrypted, ent->pw_passwd) == 0)) { + return true; } else { - return (0); + return false; } }