Relevant BUGIDs:

Purpose of commit: cleanup

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

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

        * modules/pam_cracklib/pam_cracklib.c: Use PAM_AUTHTOK_RECOVERY_ERR
        instead of PAM_AUTHTOK_RECOVER_ERR.
        * modules/pam_pwdb/support.-c: Likewise.
        * modules/pam_unix/support.c: Likewise.
        * modules/pam_userdb/pam_userdb.c (pam_sm_authenticate): Likewise.
        * libpam/pam_strerror.c (pam_strerror): Likewise.

        * libpam/include/security/_pam_compat.h: Define
        PAM_AUTHTOK_RECOVER_ERR for backward compatibility.

        * libpam/include/security/_pam_types.h: Rename
        PAM_AUTHTOK_RECOVER_ERR to PAM_AUTHTOK_RECOVERY_ERR.

4 files changed, 27 insertions, 34 deletions

diff --git a/modules/pam_cracklib/pam_cracklib.c b/modules/pam_cracklib/pam_cracklib.c
index aa55afd4..091a56f5 100644
--- a/modules/pam_cracklib/pam_cracklib.c
+++ b/modules/pam_cracklib/pam_cracklib.c
@@ -1,6 +1,5 @@
 /*
  * pam_cracklib module
- * $Id$
  */
 
 /*
@@ -572,7 +571,7 @@ PAM_EXTERN int pam_sm_chauthtok(pam_handle_t *pamh, int flags,
 		token1 = x_strdup(item);
 		item = NULL;
 	    } else {
-		retval = PAM_AUTHTOK_RECOVER_ERR;         /* didn't work */
+		retval = PAM_AUTHTOK_RECOVERY_ERR;         /* didn't work */
 	    }
 
 	} else {
@@ -587,7 +586,7 @@ PAM_EXTERN int pam_sm_chauthtok(pam_handle_t *pamh, int flags,
                 if (token1 == NULL) {
 		    pam_syslog(pamh, LOG_NOTICE,
                                "could not recover authentication token 1");
-		    retval = PAM_AUTHTOK_RECOVER_ERR;
+		    retval = PAM_AUTHTOK_RECOVERY_ERR;
 		}
                 /*
                  * tidy up the conversation (resp_retcode) is ignored
@@ -595,7 +594,7 @@ PAM_EXTERN int pam_sm_chauthtok(pam_handle_t *pamh, int flags,
                 _pam_drop(resp);
             } else {
                 retval = (retval == PAM_SUCCESS) ?
-                         PAM_AUTHTOK_RECOVER_ERR:retval ;
+                         PAM_AUTHTOK_RECOVERY_ERR:retval ;
             }
 	}
 
@@ -657,7 +656,7 @@ PAM_EXTERN int pam_sm_chauthtok(pam_handle_t *pamh, int flags,
 	        if (token2 == NULL) {
 		    pam_syslog(pamh,LOG_NOTICE,
 			       "could not recover authentication token 2");
-		    retval = PAM_AUTHTOK_RECOVER_ERR;
+		    retval = PAM_AUTHTOK_RECOVERY_ERR;
 		}
                 /*
                  * tidy up the conversation (resp_retcode) is ignored
@@ -665,7 +664,7 @@ PAM_EXTERN int pam_sm_chauthtok(pam_handle_t *pamh, int flags,
 	        _pam_drop(resp);
             } else {
                 retval = (retval == PAM_SUCCESS) ?
-                         PAM_AUTHTOK_RECOVER_ERR:retval ;
+                         PAM_AUTHTOK_RECOVERY_ERR:retval ;
             }
 
             if (retval != PAM_SUCCESS) {
@@ -684,7 +683,7 @@ PAM_EXTERN int pam_sm_chauthtok(pam_handle_t *pamh, int flags,
                 pam_set_item(pamh, PAM_AUTHTOK, NULL);
                 if (ctrl & PAM_DEBUG_ARG)
                     pam_syslog(pamh,LOG_NOTICE,"Password mistyped");
-                retval = PAM_AUTHTOK_RECOVER_ERR;
+                retval = PAM_AUTHTOK_RECOVERY_ERR;
                 continue;
             }
 
diff --git a/modules/pam_pwdb/support.-c b/modules/pam_pwdb/support.-c
index 45867ce8..6ba831e2 100644
--- a/modules/pam_pwdb/support.-c
+++ b/modules/pam_pwdb/support.-c
@@ -1,6 +1,4 @@
-/* 
- * $Id$
- *
+/*
  * Copyright information at end of file.
  */
 
@@ -139,7 +137,7 @@ static int converse(pam_handle_t *pamh, int ctrl, int nargs
 
     D(("begin to converse"));
 
-    retval = pam_get_item( pamh, PAM_CONV, (const void **) &conv ) ; 
+    retval = pam_get_item( pamh, PAM_CONV, (const void **) &conv ) ;
     if ( retval == PAM_SUCCESS ) {
 
 	retval = conv->conv(nargs, ( const struct pam_message ** ) message
@@ -767,10 +765,10 @@ static int _unix_read_password( pam_handle_t *pamh
 	    item = NULL;
 	    return PAM_SUCCESS;
 	} else if (on(UNIX_USE_FIRST_PASS,ctrl)) {
-	    return PAM_AUTHTOK_RECOVER_ERR;       /* didn't work */
+	    return PAM_AUTHTOK_RECOVERY_ERR;       /* didn't work */
 	} else if (on(UNIX_USE_AUTHTOK, ctrl)
 		   && off(UNIX__OLD_PASSWD, ctrl)) {
-	    return PAM_AUTHTOK_RECOVER_ERR;
+	    return PAM_AUTHTOK_RECOVERY_ERR;
 	}
     }
 
@@ -825,7 +823,7 @@ static int _unix_read_password( pam_handle_t *pamh
 			if (!resp[i-1].resp
 			    || strcmp(token,resp[i-1].resp)) {
 			    token = _pam_delete(token); /* mistyped */
-			    retval = PAM_AUTHTOK_RECOVER_ERR;
+			    retval = PAM_AUTHTOK_RECOVERY_ERR;
 			    make_remark(pamh, ctrl
 					, PAM_ERROR_MSG, MISTYPED_PASS);
 			}
@@ -847,7 +845,7 @@ static int _unix_read_password( pam_handle_t *pamh
 
 	} else {
 	    retval = (retval == PAM_SUCCESS)
-		? PAM_AUTHTOK_RECOVER_ERR:retval ;
+		? PAM_AUTHTOK_RECOVERY_ERR:retval ;
 	}
     }
 
@@ -941,13 +939,13 @@ static int _pam_unix_approve_pass(pam_handle_t *pamh
  * 3. The name of the author may not be used to endorse or promote
  *    products derived from this software without specific prior
  *    written permission.
- * 
+ *
  * ALTERNATIVELY, this product may be distributed under the terms of
  * the GNU Public License, in which case the provisions of the GPL are
  * required INSTEAD OF the above restrictions.  (This clause is
  * necessary due to a potential bad interaction between the GPL and
  * the restrictions contained in a BSD-style copyright.)
- * 
+ *
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
  * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -960,4 +958,3 @@ static int _pam_unix_approve_pass(pam_handle_t *pamh
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
diff --git a/modules/pam_unix/support.c b/modules/pam_unix/support.c
index 733c25c2..cb89eb31 100644
--- a/modules/pam_unix/support.c
+++ b/modules/pam_unix/support.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Copyright information at end of file.
  */
 
@@ -527,7 +525,7 @@ static int _unix_run_helper_binary(pam_handle_t *pamh, const char *passwd,
 	     out if pam is called from setuid binary (su, sudo...) */
 	  setuid(0);
 	}
-	
+
 	/* exec binary helper */
 	args[0] = x_strdup(CHKPWD_HELPER);
 	args[1] = x_strdup(user);
@@ -865,7 +863,7 @@ int _unix_read_password(pam_handle_t * pamh
 		} else if (*pass != NULL) {	/* we have a password! */
 			return PAM_SUCCESS;
 		} else if (on(UNIX_USE_FIRST_PASS, ctrl)) {
-			return PAM_AUTHTOK_RECOVER_ERR;		/* didn't work */
+			return PAM_AUTHTOK_RECOVERY_ERR;	  /* didn't work */
 		} else if (on(UNIX_USE_AUTHTOK, ctrl)
 			   && off(UNIX__OLD_PASSWD, ctrl)) {
 			return PAM_AUTHTOK_ERR;
@@ -883,11 +881,11 @@ int _unix_read_password(pam_handle_t * pamh
 		if (comment != NULL && off(UNIX__QUIET, ctrl)) {
 			retval = pam_info(pamh, "%s", comment);
 		}
-		
+
 		if (retval == PAM_SUCCESS) {
 			retval = pam_prompt(pamh, PAM_PROMPT_ECHO_OFF,
 			    &resp[0], "%s", prompt1);
-			
+
 			if (retval == PAM_SUCCESS && prompt2 != NULL) {
 				retval = pam_prompt(pamh, PAM_PROMPT_ECHO_OFF,
 				    &resp[1], "%s", prompt2);
@@ -906,7 +904,7 @@ int _unix_read_password(pam_handle_t * pamh
 						/* verify that password entered correctly */
 						if (strcmp(token, resp[replies - 1])) {
 							/* mistyped */
-							retval = PAM_AUTHTOK_RECOVER_ERR;
+							retval = PAM_AUTHTOK_RECOVERY_ERR;
 							_make_remark(pamh, ctrl,
 							    PAM_ERROR_MSG, MISTYPED_PASS);
 						}
@@ -920,9 +918,9 @@ int _unix_read_password(pam_handle_t * pamh
 
 		} else {
 			retval = (retval == PAM_SUCCESS)
-			    ? PAM_AUTHTOK_RECOVER_ERR : retval;
+			    ? PAM_AUTHTOK_RECOVERY_ERR : retval;
 		}
-		
+
 		resp[0] = NULL;
 		if (replies > 1)
 			_pam_delete(resp[1]);
@@ -930,7 +928,7 @@ int _unix_read_password(pam_handle_t * pamh
 
 	if (retval != PAM_SUCCESS) {
 		_pam_delete(token);
-	
+
 		if (on(UNIX_DEBUG, ctrl))
 			pam_syslog(pamh, LOG_DEBUG,
 			         "unable to obtain a password");
diff --git a/modules/pam_userdb/pam_userdb.c b/modules/pam_userdb/pam_userdb.c
index d47d58eb..fce5f3dd 100644
--- a/modules/pam_userdb/pam_userdb.c
+++ b/modules/pam_userdb/pam_userdb.c
@@ -1,7 +1,6 @@
 /* pam_userdb module */
 
 /*
- * $Id$
  * Written by Cristian Gafton <gafton@redhat.com> 1996/09/10
  * See the end of the file for Copyright Information
  */
@@ -249,7 +248,7 @@ user_lookup (pam_handle_t *pamh, const char *database, const char *cryptmode,
 	    compare = strncmp(data.dptr, pass, data.dsize);
 	  }
 
-	  if (cryptmode && strncasecmp(cryptmode, "none", 4) 
+	  if (cryptmode && strncasecmp(cryptmode, "none", 4)
 		&& (ctrl & PAM_DEBUG_ARG)) {
 	    pam_syslog(pamh, LOG_INFO, "invalid value for crypt parameter: %s",
 		       cryptmode);
@@ -355,7 +354,7 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags UNUSED,
 	    return retval;
         }
      }
-     
+
      /* Check if we got a password */
      retval = pam_get_item(pamh, PAM_AUTHTOK, &password);
      if (retval != PAM_SUCCESS || password == NULL) {
@@ -370,10 +369,10 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags UNUSED,
 	}
 	if (retval != PAM_SUCCESS || password == NULL) {
 	    pam_syslog(pamh, LOG_ERR, "can not recover user password");
-	    return PAM_AUTHTOK_RECOVER_ERR;
-	} 
+	    return PAM_AUTHTOK_RECOVERY_ERR;
+	}
      }
-     
+
      if (ctrl & PAM_DEBUG_ARG)
 	 pam_syslog(pamh, LOG_INFO, "Verify user `%s' with a password",
 		    username);