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.

3 files changed, 38 insertions, 12 deletions

diff --git a/libpam/include/security/_pam_compat.h b/libpam/include/security/_pam_compat.h
index 1bfec42c..a5f58e42 100644
--- a/libpam/include/security/_pam_compat.h
+++ b/libpam/include/security/_pam_compat.h
@@ -2,8 +2,6 @@
 #define _PAM_COMPAT_H
 
 /*
- * $Id$
- *
  * This file was contributed by Derrick J Brashear <shadow@dementia.org>
  * slight modification by Brad M. Garcia <bgarcia@fore.com>
  *
@@ -118,6 +116,11 @@
 
 #endif /* _SECURITY__PAM_TYPES_H */
 
+#else
+
+/* For compatibility with old Linux-PAM implementations. */
+#define PAM_AUTHTOK_RECOVER_ERR PAM_AUTHTOK_RECOVERY_ERR
+
 #endif /* defined(solaris) || (defined(__SVR4) && defined(sun)) */
 
 #endif /* _PAM_COMPAT_H */
diff --git a/libpam/include/security/_pam_types.h b/libpam/include/security/_pam_types.h
index a55dba9c..18f222db 100644
--- a/libpam/include/security/_pam_types.h
+++ b/libpam/include/security/_pam_types.h
@@ -1,14 +1,10 @@
 /*
  * <security/_pam_types.h>
  *
- * $Id$
- *
  * This file defines all of the types common to the Linux-PAM library
  * applications and modules.
  *
  * Note, the copyright+license information is at end of file.
- *
- * Created: 1996/3/5 by AGM
  */
 
 #ifndef _SECURITY__PAM_TYPES_H
@@ -67,8 +63,8 @@ typedef struct pam_handle pam_handle_t;
 #define PAM_NO_MODULE_DATA 18	/* No module specific data is present */
 #define PAM_CONV_ERR 19		/* Conversation error */
 #define PAM_AUTHTOK_ERR 20	/* Authentication token manipulation error */
-#define PAM_AUTHTOK_RECOVER_ERR 21 /* Authentication information */
-				   /* cannot be recovered */
+#define PAM_AUTHTOK_RECOVERY_ERR 21 /* Authentication information */
+				    /* cannot be recovered */
 #define PAM_AUTHTOK_LOCK_BUSY 22   /* Authentication token lock busy */
 #define PAM_AUTHTOK_DISABLE_AGING 23 /* Authentication token aging disabled */
 #define PAM_TRY_AGAIN 24	/* Preliminary check by password service */
diff --git a/libpam/pam_strerror.c b/libpam/pam_strerror.c
index ca7bde83..f7923314 100644
--- a/libpam/pam_strerror.c
+++ b/libpam/pam_strerror.c
@@ -1,7 +1,34 @@
-/* pam_strerror.c */
-
 /*
- * $Id$
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, and the entire permission notice in its entirety,
+ *    including the disclaimer of warranties.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 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
+ * DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "pam_private.h"
@@ -55,7 +82,7 @@ const char *pam_strerror(pam_handle_t *pamh UNUSED, int errnum)
       return _("Conversation error");
     case PAM_AUTHTOK_ERR:
       return _("Authentication token manipulation error");
-    case PAM_AUTHTOK_RECOVER_ERR:
+    case PAM_AUTHTOK_RECOVERY_ERR:
       return _("Authentication information cannot be recovered");
     case PAM_AUTHTOK_LOCK_BUSY:
       return _("Authentication token lock busy");