New upstream version 0.99.7.1

1 files changed, 34 insertions, 21 deletions

diff --git a/Linux-PAM/libpam/pam_start.c b/Linux-PAM/libpam/pam_start.c
index 5d6e066a..b2c62e54 100644
--- a/Linux-PAM/libpam/pam_start.c
+++ b/Linux-PAM/libpam/pam_start.c
@@ -3,7 +3,7 @@
 /* Creator Marc Ewing
  * Maintained by AGM
  *
- * $Id: pam_start.c,v 1.5 2004/09/14 13:48:41 kukuk Exp $
+ * $Id: pam_start.c,v 1.9 2006/07/24 15:47:40 kukuk Exp $
  *
  */
 
@@ -25,12 +25,25 @@ int pam_start (
        ,service_name, user, pam_conversation, pamh));
 
     if (pamh == NULL) {
-	_pam_system_log(LOG_CRIT, "pam_start: invalid argument: pamh == NULL");
-	return (PAM_BUF_ERR);
+	pam_syslog(NULL, LOG_CRIT,
+		   "pam_start: invalid argument: pamh == NULL");
+	return (PAM_SYSTEM_ERR);
+    }
+
+    if (service_name == NULL) {
+	pam_syslog(NULL, LOG_CRIT,
+		   "pam_start: invalid argument: service == NULL");
+	return (PAM_SYSTEM_ERR);
+    }
+
+    if (pam_conversation == NULL) {
+	pam_syslog(NULL, LOG_CRIT,
+		   "pam_start: invalid argument: conv == NULL");
+	return (PAM_SYSTEM_ERR);
     }
 
     if ((*pamh = calloc(1, sizeof(**pamh))) == NULL) {
-	_pam_system_log(LOG_CRIT, "pam_start: calloc failed for *pamh");
+	pam_syslog(NULL, LOG_CRIT, "pam_start: calloc failed for *pamh");
 	return (PAM_BUF_ERR);
     }
 
@@ -44,24 +57,22 @@ int pam_start (
 
     __PAM_TO_APP(*pamh);
 
-    if (service_name) {
+    if (((*pamh)->service_name = _pam_strdup(service_name)) == NULL) {
+	pam_syslog(*pamh, LOG_CRIT,
+		   "pam_start: _pam_strdup failed for service name");
+	_pam_drop(*pamh);
+	return (PAM_BUF_ERR);
+    } else {
 	char *tmp;
 
-	if (((*pamh)->service_name = _pam_strdup(service_name)) == NULL) {
-	    _pam_system_log(LOG_CRIT,
-			    "pam_start: _pam_strdup failed for service name");
-	    _pam_drop(*pamh);
-	    return (PAM_BUF_ERR);
-	}
 	for (tmp=(*pamh)->service_name; *tmp; ++tmp)
 	    *tmp = tolower(*tmp);                   /* require lower case */
-    } else
-       	(*pamh)->service_name = NULL;
+    }
 
     if (user) {
 	if (((*pamh)->user = _pam_strdup(user)) == NULL) {
-	    _pam_system_log(LOG_CRIT,
-			    "pam_start: _pam_strdup failed for user");
+	    pam_syslog(*pamh, LOG_CRIT,
+		       "pam_start: _pam_strdup failed for user");
 	    _pam_drop((*pamh)->service_name);
 	    _pam_drop(*pamh);
 	    return (PAM_BUF_ERR);
@@ -77,11 +88,13 @@ int pam_start (
     (*pamh)->oldauthtok = NULL;
     (*pamh)->fail_delay.delay_fn_ptr = NULL;
     (*pamh)->former.choice = PAM_NOT_STACKED;
+#ifdef HAVE_LIBAUDIT
+    (*pamh)->audit_state = 0;
+#endif
 
-    if (pam_conversation == NULL
-	|| ((*pamh)->pam_conversation = (struct pam_conv *)
-	    malloc(sizeof(struct pam_conv))) == NULL) {
-	_pam_system_log(LOG_CRIT, "pam_start: malloc failed for pam_conv");
+    if (((*pamh)->pam_conversation = (struct pam_conv *)
+	  malloc(sizeof(struct pam_conv))) == NULL) {
+	pam_syslog(*pamh, LOG_CRIT, "pam_start: malloc failed for pam_conv");
 	_pam_drop((*pamh)->service_name);
 	_pam_drop((*pamh)->user);
 	_pam_drop(*pamh);
@@ -93,7 +106,7 @@ int pam_start (
 
     (*pamh)->data = NULL;
     if ( _pam_make_env(*pamh) != PAM_SUCCESS ) {
-	_pam_system_log(LOG_ERR,"pam_start: failed to initialize environment");
+	pam_syslog(*pamh,LOG_ERR,"pam_start: failed to initialize environment");
 	_pam_drop((*pamh)->service_name);
 	_pam_drop((*pamh)->user);
 	_pam_drop(*pamh);
@@ -108,7 +121,7 @@ int pam_start (
      * symbols happens on the first call from the application. */
 
     if ( _pam_init_handlers(*pamh) != PAM_SUCCESS ) {
-	_pam_system_log(LOG_ERR, "pam_start: failed to initialize handlers");
+	pam_syslog(*pamh, LOG_ERR, "pam_start: failed to initialize handlers");
 	_pam_drop_env(*pamh);                 /* purge the environment */
 	_pam_drop((*pamh)->service_name);
 	_pam_drop((*pamh)->user);