Relevant BUGIDs:

Purpose of commit: cleanup

Commit summary:
---------------
2005-09-26  Tomas Mraz  <t8m@centrum.cz>

        * modules/pam_unix/pam_unix_acct.c (_unix_run_verify_binary):
        _log_err() -> pam_syslog()
        (pam_sm_acct_mgmt): _log_err() -> pam_syslog(), fix warning.
        * modules/pam_unix/pam_unix_auth.c (pam_sm_authenticate):
        _log_err() -> pam_syslog()
        * modules/pam_unix/pam_unix_passwd.c: removed obsolete ifdef
        (getNISserver, _unix_run_shadow_binary, _update_passwd,
        _update_shadow, _do_setpass, _pam_unix_approve_pass,
        pam_sm_chauthtok): _log_err() -> pam_syslog()
        * modules/pam_unix/pam_unix_sess.c: removed obsolete ifdef
        (pam_sm_open_session, pam_sm_close_session):
        _log_err() -> pam_syslog()
        * modules/pam_unix/support.c (_log_err, converse): removed
        (_make_remark): use pam_prompt() instead of converse()
        (_set_ctrl, _cleanup_failures, _unix_run_helper_binary,
        _unix_verify_password, _unix_read_password):
        _log_err() -> pam_syslog()
        _cleanup(), _unix_cleanup(): Silence unused param warnings.
        (_cleanup_failures, _unix_verify_password, _unix_getpwnam,
        _unix_run_helper_binary): Silence incorrect type warnings.
        (_unix_read_password): Use multiple pam_prompt() and pam_info() calls
        instead of converse().
        * modules/pam_unix/support.h (_log_err): removed
        * modules/pam_unix/unix_chkpwd.c (_log_err): LOG_AUTH -> LOG_AUTHPRIV

1 files changed, 8 insertions, 11 deletions

diff --git a/modules/pam_unix/pam_unix_sess.c b/modules/pam_unix/pam_unix_sess.c
index 49aa29aa..b0e40384 100644
--- a/modules/pam_unix/pam_unix_sess.c
+++ b/modules/pam_unix/pam_unix_sess.c
@@ -53,12 +53,9 @@
 
 #include <security/_pam_macros.h>
 #include <security/pam_modules.h>
+#include <security/pam_ext.h>
 #include <security/pam_modutil.h>
 
-#ifndef LINUX_PAM
-#include <security/pam_appl.h>
-#endif				/* LINUX_PAM */
-
 #include "support.h"
 
 /*
@@ -80,14 +77,14 @@ PAM_EXTERN int pam_sm_open_session(pam_handle_t * pamh, int flags,
 
 	retval = pam_get_item(pamh, PAM_USER, (void *) &user_name);
 	if (user_name == NULL || *user_name == '\0' || retval != PAM_SUCCESS) {
-		_log_err(LOG_CRIT, pamh,
+		pam_syslog(pamh, LOG_CRIT,
 		         "open_session - error recovering username");
 		return PAM_SESSION_ERR;		/* How did we get authenticated with
 						   no username?! */
 	}
 	retval = pam_get_item(pamh, PAM_SERVICE, (void *) &service);
 	if (service == NULL || *service == '\0' || retval != PAM_SUCCESS) {
-		_log_err(LOG_CRIT, pamh,
+		pam_syslog(pamh, LOG_CRIT,
 		         "open_session - error recovering service");
 		return PAM_SESSION_ERR;
 	}
@@ -95,7 +92,7 @@ PAM_EXTERN int pam_sm_open_session(pam_handle_t * pamh, int flags,
 	if (login_name == NULL) {
 	    login_name = "";
 	}
-	_log_err(LOG_INFO, pamh, "session opened for user %s by %s(uid=%d)",
+	pam_syslog(pamh, LOG_INFO, "session opened for user %s by %s(uid=%d)",
 		 user_name, login_name, getuid());
 
 	return PAM_SUCCESS;
@@ -114,19 +111,19 @@ PAM_EXTERN int pam_sm_close_session(pam_handle_t * pamh, int flags,
 
 	retval = pam_get_item(pamh, PAM_USER, (void *) &user_name);
 	if (user_name == NULL || *user_name == '\0' || retval != PAM_SUCCESS) {
-		_log_err(LOG_CRIT, pamh,
+		pam_syslog(pamh, LOG_CRIT,
 		         "close_session - error recovering username");
 		return PAM_SESSION_ERR;		/* How did we get authenticated with
 						   no username?! */
 	}
 	retval = pam_get_item(pamh, PAM_SERVICE, (void *) &service);
 	if (service == NULL || *service == '\0' || retval != PAM_SUCCESS) {
-		_log_err(LOG_CRIT, pamh,
+		pam_syslog(pamh, LOG_CRIT,
 		         "close_session - error recovering service");
 		return PAM_SESSION_ERR;
 	}
-	_log_err(LOG_INFO, pamh, "session closed for user %s"
-		 ,user_name);
+	pam_syslog(pamh, LOG_INFO, "session closed for user %s",
+		user_name);
 
 	return PAM_SUCCESS;
 }