1 files changed, 15 insertions, 69 deletions

diff --git a/lib/libpam/modules/pam_opie/pam_opie.c b/lib/libpam/modules/pam_opie/pam_opie.c
index b4bafc9..e5c1488 100644
--- a/lib/libpam/modules/pam_opie/pam_opie.c
+++ b/lib/libpam/modules/pam_opie/pam_opie.c
@@ -1,7 +1,7 @@
 /*-
  * Copyright 2000 James Bloom
  * All rights reserved.
- * Based upon code Copyright 1998 Juniper Networks, Inc. 
+ * Based upon code Copyright 1998 Juniper Networks, Inc.
  * Copyright (c) 2001,2002 Networks Associates Technology, Inc.
  * All rights reserved.
  *
@@ -46,16 +46,13 @@ __FBSDID("$FreeBSD$");
 #include <unistd.h>
 
 #define PAM_SM_AUTH
-#define PAM_SM_ACCOUNT
-#define PAM_SM_SESSION
-#define PAM_SM_PASSWORD
 
 #include <security/pam_appl.h>
 #include <security/pam_modules.h>
 #include <security/pam_mod_misc.h>
 
 enum {
-	PAM_OPT_AUTH_AS_SELF	= PAM_OPT_STD_MAX,
+	PAM_OPT_AUTH_AS_SELF = PAM_OPT_STD_MAX,
 	PAM_OPT_NO_FAKE_PROMPTS
 };
 
@@ -66,7 +63,8 @@ static struct opttab other_options[] = {
 };
 
 PAM_EXTERN int
-pam_sm_authenticate(pam_handle_t *pamh, int flags __unused, int argc, const char **argv)
+pam_sm_authenticate(pam_handle_t *pamh, int flags __unused,
+    int argc, const char *argv[])
 {
 	struct opie opie;
 	struct options options;
@@ -86,13 +84,13 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags __unused, int argc, const char
 	user = NULL;
 	if (pam_test_option(&options, PAM_OPT_AUTH_AS_SELF, NULL)) {
 		if ((pwd = getpwnam(getlogin())) == NULL)
-			PAM_RETURN(PAM_AUTH_ERR);
+			return (PAM_AUTH_ERR);
 		user = pwd->pw_name;
 	}
 	else {
 		retval = pam_get_user(pamh, (const char **)&user, NULL);
 		if (retval != PAM_SUCCESS)
-			PAM_RETURN(retval);
+			return (retval);
 	}
 
 	PAM_LOG("Got user: %s", user);
@@ -110,22 +108,22 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags __unused, int argc, const char
 	 */
 	/* XXX generates a const warning because of incorrect prototype */
 	if (opiechallenge(&opie, (char *)user, challenge) != 0 &&
-	    pam_test_option(&options, PAM_OPT_NO_FAKE_PROMPTS, NULL)) 
-		PAM_RETURN(PAM_AUTH_ERR);
-	
+	    pam_test_option(&options, PAM_OPT_NO_FAKE_PROMPTS, NULL))
+		return (PAM_AUTH_ERR);
+
 	/*
 	 * It doesn't make sense to use a password that has already been
 	 * typed in, since we haven't presented the challenge to the user
 	 * yet, so clear the stored password.
 	 */
 	pam_set_item(pamh, PAM_AUTHTOK, NULL);
-	
+
 	for (i = 0; i < 2; i++) {
 		snprintf(prompt, sizeof prompt, promptstr[i], challenge);
 		retval = pam_get_authtok(pamh, PAM_AUTHTOK, &response, prompt);
 		if (retval != PAM_SUCCESS) {
 			opieunlock();
-			PAM_RETURN(retval);
+			return (retval);
 		}
 
 		PAM_LOG("Completed challenge %d: %s", i, response);
@@ -147,67 +145,15 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags __unused, int argc, const char
 	 * success or lack thereof.
 	 */
 	retval = opieverify(&opie, resp) == 0 ? PAM_SUCCESS : PAM_AUTH_ERR;
-	PAM_RETURN(retval);
-}
-
-PAM_EXTERN int
-pam_sm_setcred(pam_handle_t *pamh __unused, int flags __unused, int argc, const char **argv)
-{
-	struct options options;
-
-	pam_std_option(&options, other_options, argc, argv);
-
-	PAM_LOG("Options processed");
-
-	PAM_RETURN(PAM_SUCCESS);
+	return (retval);
 }
 
 PAM_EXTERN int
-pam_sm_acct_mgmt(pam_handle_t *pamh __unused, int flags __unused, int argc ,const char **argv)
+pam_sm_setcred(pam_handle_t *pamh __unused, int flags __unused,
+    int argc __unused, const char *argv[] __unused)
 {
-	struct options options;
-
-	pam_std_option(&options, NULL, argc, argv);
-
-	PAM_LOG("Options processed");
-
-	PAM_RETURN(PAM_IGNORE);
-}
-
-PAM_EXTERN int
-pam_sm_chauthtok(pam_handle_t *pamh __unused, int flags __unused, int argc, const char **argv)
-{
-	struct options options;
-
-	pam_std_option(&options, NULL, argc, argv);
-
-	PAM_LOG("Options processed");
-
-	PAM_RETURN(PAM_IGNORE);
-}
-
-PAM_EXTERN int
-pam_sm_open_session(pam_handle_t *pamh __unused, int flags __unused, int argc, const char **argv)
-{
-	struct options options;
-
-	pam_std_option(&options, NULL, argc, argv);
-
-	PAM_LOG("Options processed");
-
-	PAM_RETURN(PAM_IGNORE);
-}
-
-PAM_EXTERN int
-pam_sm_close_session(pam_handle_t *pamh __unused, int flags __unused, int argc, const char **argv)
-{
-	struct options options;
-
-	pam_std_option(&options, NULL, argc, argv);
-
-	PAM_LOG("Options processed");
 
-	PAM_RETURN(PAM_IGNORE);
+	return (PAM_SUCCESS);
 }
 
 PAM_MODULE_ENTRY("pam_opie");