Merge upstream version 1.4.0

1 files changed, 6 insertions, 43 deletions

diff --git a/modules/pam_debug/pam_debug.c b/modules/pam_debug/pam_debug.c
index 9b68d382..414806b2 100644
--- a/modules/pam_debug/pam_debug.c
+++ b/modules/pam_debug/pam_debug.c
@@ -1,32 +1,14 @@
-/* pam_permit module */
-
 /*
- * $Id$
+ * pam_debug module
  *
  * Written by Andrew Morgan <morgan@kernel.org> 2001/02/04
  *
- */
-
-#define DEFAULT_USER "nobody"
-
-#include "config.h"
-
-#include <stdio.h>
-
-/*
  * This module is intended as a debugging aide for determining how
  * the PAM stack is operating.
- *
- * here, we make definitions for the externally accessible functions
- * in this file (these definitions are required for static modules
- * but strongly encouraged generally) they are used to instruct the
- * modules include file to define their prototypes.
  */
 
-#define PAM_SM_AUTH
-#define PAM_SM_ACCOUNT
-#define PAM_SM_SESSION
-#define PAM_SM_PASSWORD
+#include "config.h"
+#include <stdio.h>
 
 #include <security/pam_modules.h>
 #include <security/_pam_macros.h>
@@ -35,6 +17,8 @@
 #define _PAM_ACTION_UNDEF (-10)
 #include "../../libpam/pam_tokens.h"
 
+#define DEFAULT_USER "nobody"
+
 /* --- authentication management functions --- */
 
 static int state(pam_handle_t *pamh, const char *text)
@@ -78,28 +62,7 @@ static int parse_args(int retval, const char *event,
 int pam_sm_authenticate(pam_handle_t *pamh, int flags UNUSED,
 			int argc, const char **argv)
 {
-    int retval;
-    const char *user=NULL;
-
-    /*
-     * authentication requires we know who the user wants to be
-     */
-    retval = pam_get_user(pamh, &user, NULL);
-    if (retval != PAM_SUCCESS) {
-	D(("get user returned error: %s", pam_strerror(pamh,retval)));
-	return retval;
-    }
-    if (user == NULL || *user == '\0') {
-	D(("username not known"));
-	retval = pam_set_item(pamh, PAM_USER, (const void *) DEFAULT_USER);
-	if (retval != PAM_SUCCESS)
-	    return retval;
-    }
-    user = NULL;                                            /* clean up */
-
-    retval = parse_args(PAM_SUCCESS, "auth", pamh, argc, argv);
-
-    return retval;
+    return parse_args(PAM_SUCCESS, "auth", pamh, argc, argv);
 }
 
 int pam_sm_setcred(pam_handle_t *pamh, int flags UNUSED,