From: Thorsten Kukuk <kukuk@thkukuk.de>
Date: Mon, 23 Jan 2006 12:36:32 +0000 (+0000)
Subject: Relevant BUGIDs: none
X-Git-Tag: Linux-PAM-0_99_4_0~41
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9ed169585185307e13dec9c20c944de191bb6df6;p=linux-pam

Relevant BUGIDs: none

Purpose of commit: new feature

Commit summary:
---------------

2006-01-21  Thorsten Kukuk  <kukuk@thkukuk.de>

        * modules/pam_listfile/pam_listfile.c: Add support for session
        and password management.
---

diff --git a/ChangeLog b/ChangeLog
index 34a3d53a..2ad9e222 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,15 +1,14 @@
 2006-01-22  Thorsten Kukuk  <kukuk@thkukuk.de>
 
-	* modules/pam_succeed_if/pam_succeed_if.c (pam_sm_acct_mgmt):
-	Add support for static modules.
+	* modules/pam_succeed_if/pam_succeed_if.c: Add support for
+	static modules.
 	* modules/pam_xauth/pam_xauth.c: Likewise.
 
-	* libpam/pam_handlers.c (_pam_add_handler): Add pamh to
-	_pam_open_static_handler call.
-
 	* libpam/pam_static.c (_pam_open_static_handler): Add pamh
 	as argument.
 	* libpam/pam_private.h: Adjust prototype.
+	* libpam/pam_handlers.c (_pam_add_handler): Add pamh to
+	_pam_open_static_handler call.
 
 	* configure.in: Don't define PAM_DYNAMIC.
 	* libpam/pam_handlers.c: Get ride of PAM_DYNAMIC, don't
@@ -21,6 +20,11 @@
 	* libpam/Makefile.am: Bump version number of libpam, remove
 	pam_dynamic.h.
 
+2006-01-21  Thorsten Kukuk  <kukuk@thkukuk.de>
+
+	* modules/pam_listfile/pam_listfile.c: Add support for session
+	and password management.
+
 2006-01-19  Thorsten Kukuk  <kukuk@suse.de>
 
 	* doc/specs/Makefile.am (spec): Add padout to fix parallel
diff --git a/NEWS b/NEWS
index 4dc517e9..2a00c4ae 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
 Linux-PAM NEWS -- history of user-visible changes.
 
 * Fix building of static variants of libpam, libpamc and libpam_misc
+* pam_listfile: Add support for password and session management
 
 Release 0.99.3.0
 
diff --git a/modules/pam_listfile/pam_listfile.c b/modules/pam_listfile/pam_listfile.c
index c19cfc1a..69384be6 100644
--- a/modules/pam_listfile/pam_listfile.c
+++ b/modules/pam_listfile/pam_listfile.c
@@ -1,8 +1,3 @@
-/*
- * $Id$
- *
- */
-
 /*
  * by Elliot Lee <sopwith@redhat.com>, Red Hat Software. July 25, 1996.
  * log refused access error christopher mccrory <chrismcc@netus.com> 1998/7/11
@@ -36,14 +31,14 @@
 
 #define PAM_SM_AUTH
 #define PAM_SM_ACCOUNT
+#define PAM_SM_PASSWORD
+#define PAM_SM_SESSION
 
 #include <security/pam_modules.h>
 #include <security/_pam_macros.h>
 #include <security/pam_modutil.h>
 #include <security/pam_ext.h>
 
-/* some syslogging */
-
 /* checks if a user is on a list of members */
 static int is_on_list(char * const *list, const char *member)
 {
@@ -222,7 +217,7 @@ pam_sm_authenticate (pam_handle_t *pamh, int flags UNUSED,
 		    /* Not a member of apply= group */
 #ifdef DEBUG
 		    pam_syslog(pamh,LOG_DEBUG,
-			     
+
 			     "don't apply: %s not a member of group %s",
 			     user_name,apply_val);
 #endif /* DEBUG */
@@ -301,7 +296,7 @@ pam_sm_authenticate (pam_handle_t *pamh, int flags UNUSED,
 		break;
 	    default:
 		pam_syslog(pamh,LOG_ERR,
-			 
+
 			 "Internal weirdness, unknown extended item %d",
 			 extitem);
 		free(ifname);
@@ -310,7 +305,7 @@ pam_sm_authenticate (pam_handle_t *pamh, int flags UNUSED,
     }
 #ifdef DEBUG
     pam_syslog(pamh,LOG_INFO,
-	     
+
 	     "Got file = %s, item = %d, value = %s, sense = %d",
 	     ifname, citem, citemp, sense);
 #endif
@@ -384,7 +379,7 @@ pam_sm_authenticate (pam_handle_t *pamh, int flags UNUSED,
     free(ifname);
     if ((sense && retval) || (!sense && !retval)) {
 #ifdef DEBUG
-	pam_syslog(pamh,LOG_INFO, 
+	pam_syslog(pamh,LOG_INFO,
 		 "Returning PAM_SUCCESS, retval = %d", retval);
 #endif
 	return PAM_SUCCESS;
@@ -412,10 +407,31 @@ pam_sm_setcred (pam_handle_t *pamh UNUSED, int flags UNUSED,
 }
 
 PAM_EXTERN int
-pam_sm_acct_mgmt (pam_handle_t *pamh, int flags UNUSED,
+pam_sm_acct_mgmt (pam_handle_t *pamh, int flags,
+		  int argc, const char **argv)
+{
+    return pam_sm_authenticate(pamh, flags, argc, argv);
+}
+
+PAM_EXTERN int
+pam_sm_open_session (pam_handle_t *pamh, int flags,
+		     int argc, const char **argv)
+{
+    return pam_sm_authenticate(pamh, flags, argc, argv);
+}
+
+PAM_EXTERN int
+pam_sm_close_session (pam_handle_t *pamh, int flags,
+		      int argc, const char **argv)
+{
+    return pam_sm_authenticate(pamh, flags, argc, argv);
+}
+
+PAM_EXTERN int
+pam_sm_chauthtok (pam_handle_t *pamh, int flags,
 		  int argc, const char **argv)
 {
-    return pam_sm_authenticate(pamh, 0, argc, argv);
+    return pam_sm_authenticate(pamh, flags, argc, argv);
 }
 
 #ifdef PAM_STATIC
@@ -427,9 +443,9 @@ struct pam_module _pam_listfile_modstruct = {
     pam_sm_authenticate,
     pam_sm_setcred,
     pam_sm_acct_mgmt,
-    NULL,
-    NULL,
-    NULL,
+    pam_sm_open_session,
+    pam_sm_close_session,
+    pam_sm_chauthtok,
 };
 
 #endif /* PAM_STATIC */