New upstream version 0.99.7.1

1 files changed, 19 insertions, 29 deletions

diff --git a/Linux-PAM/modules/pam_debug/pam_debug.c b/Linux-PAM/modules/pam_debug/pam_debug.c
index 819cd651..b0f5bf59 100644
--- a/Linux-PAM/modules/pam_debug/pam_debug.c
+++ b/Linux-PAM/modules/pam_debug/pam_debug.c
@@ -1,7 +1,7 @@
 /* pam_permit module */
 
 /*
- * $Id: pam_debug.c,v 1.2 2004/09/15 12:06:17 kukuk Exp $
+ * $Id: pam_debug.c,v 1.5 2006/01/24 09:42:46 kukuk Exp $
  *
  * Written by Andrew Morgan <morgan@kernel.org> 2001/02/04
  *
@@ -9,6 +9,8 @@
 
 #define DEFAULT_USER "nobody"
 
+#include "config.h"
+
 #include <stdio.h>
 
 /*
@@ -28,6 +30,7 @@
 
 #include <security/pam_modules.h>
 #include <security/_pam_macros.h>
+#include <security/pam_ext.h>
 
 #define _PAM_ACTION_UNDEF (-10)
 #include "../../libpam/pam_tokens.h"
@@ -37,24 +40,11 @@
 static int state(pam_handle_t *pamh, const char *text)
 {
     int retval;
-    struct pam_conv *conv;
-    struct pam_message msg[1], *mesg[1];
-    struct pam_response *response;
-
-    retval = pam_get_item(pamh, PAM_CONV, (const void **)&conv);
-    if ((retval != PAM_SUCCESS) || (conv == NULL)) {
-	D(("failed to obtain conversation function"));
-	return PAM_ABORT;
-    }
 
-    msg[0].msg_style = PAM_TEXT_INFO;
-    msg[0].msg = text;
-    mesg[0] = &msg[0];
+    retval = pam_info (pamh, "%s", text);
 
-    retval = conv->conv(1, (const struct pam_message **) mesg,
-			&response, conv->appdata_ptr);
     if (retval != PAM_SUCCESS) {
-	D(("conversation failed"));
+	D(("pam_info failed"));
     }
 
     return retval;
@@ -86,8 +76,8 @@ static int parse_args(int retval, const char *event,
 }
 
 PAM_EXTERN
-int pam_sm_authenticate(pam_handle_t *pamh, int flags, int argc,
-			const char **argv)
+int pam_sm_authenticate(pam_handle_t *pamh, int flags UNUSED,
+			int argc, const char **argv)
 {
     int retval;
     const char *user=NULL;
@@ -114,8 +104,8 @@ int pam_sm_authenticate(pam_handle_t *pamh, int flags, int argc,
 }
 
 PAM_EXTERN
-int pam_sm_setcred(pam_handle_t *pamh, int flags, int argc, 
-		   const char **argv)
+int pam_sm_setcred(pam_handle_t *pamh, int flags UNUSED,
+		   int argc, const char **argv)
 {
     return parse_args(PAM_SUCCESS, "cred", pamh, argc, argv);
 }
@@ -123,8 +113,8 @@ int pam_sm_setcred(pam_handle_t *pamh, int flags, int argc,
 /* --- account management functions --- */
 
 PAM_EXTERN
-int pam_sm_acct_mgmt(pam_handle_t *pamh, int flags, int argc,
-		     const char **argv)
+int pam_sm_acct_mgmt(pam_handle_t *pamh, int flags UNUSED,
+		     int argc, const char **argv)
 {
     return parse_args(PAM_SUCCESS, "acct", pamh, argc, argv);
 }
@@ -132,8 +122,8 @@ int pam_sm_acct_mgmt(pam_handle_t *pamh, int flags, int argc,
 /* --- password management --- */
 
 PAM_EXTERN
-int pam_sm_chauthtok(pam_handle_t *pamh, int flags, int argc,
-		     const char **argv)
+int pam_sm_chauthtok(pam_handle_t *pamh, int flags UNUSED,
+		     int argc, const char **argv)
 {
     if (flags & PAM_PRELIM_CHECK) {
 	return parse_args(PAM_SUCCESS, "prechauthtok", pamh, argc, argv);
@@ -145,15 +135,15 @@ int pam_sm_chauthtok(pam_handle_t *pamh, int flags, int argc,
 /* --- session management --- */
 
 PAM_EXTERN
-int pam_sm_open_session(pam_handle_t *pamh,int flags,int argc,
-			const char **argv)
+int pam_sm_open_session(pam_handle_t *pamh, int flags UNUSED,
+			int argc, const char **argv)
 {
     return parse_args(PAM_SUCCESS, "open_session", pamh, argc, argv);
 }
 
 PAM_EXTERN
-int pam_sm_close_session(pam_handle_t *pamh,int flags,int argc
-			 ,const char **argv)
+int pam_sm_close_session(pam_handle_t *pamh, int flags UNUSED,
+			 int argc, const char **argv)
 {
     return parse_args(PAM_SUCCESS, "close_session", pamh, argc, argv);
 }
@@ -164,7 +154,7 @@ int pam_sm_close_session(pam_handle_t *pamh,int flags,int argc
 
 /* static module data */
 
-struct pam_module _pam_permit_modstruct = {
+struct pam_module _pam_debug_modstruct = {
     "pam_debug",
     pam_sm_authenticate,
     pam_sm_setcred,