From 0fa107a3cbc35b7304c35b484b7192a3f6d19f96 Mon Sep 17 00:00:00 2001 From: Mark Murray Date: Fri, 10 Aug 2001 19:15:48 +0000 Subject: [PATCH] Simplify code. Also verbose logging, verbose overridable error reporting. --- lib/libpam/modules/pam_rootok/pam_rootok.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/lib/libpam/modules/pam_rootok/pam_rootok.c b/lib/libpam/modules/pam_rootok/pam_rootok.c index 71478a1b3db..0759a26f714 100644 --- a/lib/libpam/modules/pam_rootok/pam_rootok.c +++ b/lib/libpam/modules/pam_rootok/pam_rootok.c @@ -40,17 +40,16 @@ PAM_EXTERN int pam_sm_authenticate(pam_handle_t *pamh, int flags, int argc, const char **argv) { struct options options; - uid_t uid; pam_std_option(&options, NULL, argc, argv); PAM_LOG("Options processed"); - uid = getuid(); - if (uid == 0) + if (getuid() == 0) PAM_RETURN(PAM_SUCCESS); - PAM_LOG("User is not root"); + PAM_VERBOSE_ERROR("Refused; not superuser"); + PAM_LOG("User is not superuser"); PAM_RETURN(PAM_AUTH_ERR); } @@ -58,7 +57,13 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags, int argc, const char **argv) PAM_EXTERN int pam_sm_setcred(pam_handle_t *pamh, int flags, int argc, const char **argv) { - return PAM_SUCCESS; + struct options options; + + pam_std_option(&options, NULL, argc, argv); + + PAM_LOG("Options processed"); + + PAM_RETURN(PAM_SUCCESS); } PAM_MODULE_ENTRY("pam_rootok");