diff options
Diffstat (limited to 'lib')
88 files changed, 257 insertions, 268 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am index 002d7bbddb1e..9f9fb5fa6212 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1,4 +1,4 @@ -# $Id: Makefile.am 907 2017-01-18 09:39:01Z des $ +# $OpenPAM: Makefile.am 938 2017-04-30 21:34:42Z des $ SUBDIRS = diff --git a/lib/Makefile.in b/lib/Makefile.in index 74bf0a7d932d..ed2ff0f44813 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -14,7 +14,7 @@ @SET_MAKE@ -# $Id: Makefile.am 907 2017-01-18 09:39:01Z des $ +# $OpenPAM: Makefile.am 938 2017-04-30 21:34:42Z des $ VPATH = @srcdir@ am__is_gnu_make = { \ if test -z '$(MAKELEVEL)'; then \ diff --git a/lib/libpam/Makefile.am b/lib/libpam/Makefile.am index faf0dd553f21..34d17d0cac68 100644 --- a/lib/libpam/Makefile.am +++ b/lib/libpam/Makefile.am @@ -1,4 +1,4 @@ -# $Id: Makefile.am 833 2014-10-28 09:03:41Z des $ +# $OpenPAM: Makefile.am 938 2017-04-30 21:34:42Z des $ NULL = diff --git a/lib/libpam/Makefile.in b/lib/libpam/Makefile.in index 7e73926685d4..c6e4b44f55c2 100644 --- a/lib/libpam/Makefile.in +++ b/lib/libpam/Makefile.in @@ -14,7 +14,7 @@ @SET_MAKE@ -# $Id: Makefile.am 833 2014-10-28 09:03:41Z des $ +# $OpenPAM: Makefile.am 938 2017-04-30 21:34:42Z des $ VPATH = @srcdir@ diff --git a/lib/libpam/openpam_asprintf.c b/lib/libpam/openpam_asprintf.c index 3169f4baa497..7b40aef28423 100644 --- a/lib/libpam/openpam_asprintf.c +++ b/lib/libpam/openpam_asprintf.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam_asprintf.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: openpam_asprintf.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/openpam_asprintf.h b/lib/libpam/openpam_asprintf.h index 6d9e4e39826b..79680ad6e1bf 100644 --- a/lib/libpam/openpam_asprintf.h +++ b/lib/libpam/openpam_asprintf.h @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam_asprintf.h 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: openpam_asprintf.h 938 2017-04-30 21:34:42Z des $ */ #ifndef OPENPAM_ASPRINTF_H_INCLUDED diff --git a/lib/libpam/openpam_borrow_cred.c b/lib/libpam/openpam_borrow_cred.c index 1b407bdfd27b..79299ac4f1bc 100644 --- a/lib/libpam/openpam_borrow_cred.c +++ b/lib/libpam/openpam_borrow_cred.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam_borrow_cred.c 649 2013-03-05 17:58:33Z des $ + * $OpenPAM: openpam_borrow_cred.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/openpam_check_owner_perms.c b/lib/libpam/openpam_check_owner_perms.c index c8a598a9d448..0f99b82d2087 100644 --- a/lib/libpam/openpam_check_owner_perms.c +++ b/lib/libpam/openpam_check_owner_perms.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam_check_owner_perms.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: openpam_check_owner_perms.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/openpam_configure.c b/lib/libpam/openpam_configure.c index e06eba2859dc..12f1a5163367 100644 --- a/lib/libpam/openpam_configure.c +++ b/lib/libpam/openpam_configure.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam_configure.c 890 2016-01-11 16:22:09Z des $ + * $OpenPAM: openpam_configure.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/openpam_constants.c b/lib/libpam/openpam_constants.c index 1cdd8101a88a..2b539e4fc765 100644 --- a/lib/libpam/openpam_constants.c +++ b/lib/libpam/openpam_constants.c @@ -1,6 +1,6 @@ /*- * Copyright (c) 2001-2003 Networks Associates Technology, Inc. - * Copyright (c) 2004-2011 Dag-Erling Smørgrav + * Copyright (c) 2004-2017 Dag-Erling Smørgrav * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam_constants.c 690 2013-08-15 13:22:51Z des $ + * $OpenPAM: openpam_constants.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H @@ -44,86 +44,126 @@ #include "openpam_impl.h" const char *pam_err_name[PAM_NUM_ERRORS] = { - "PAM_SUCCESS", - "PAM_OPEN_ERR", - "PAM_SYMBOL_ERR", - "PAM_SERVICE_ERR", - "PAM_SYSTEM_ERR", - "PAM_BUF_ERR", - "PAM_CONV_ERR", - "PAM_PERM_DENIED", - "PAM_MAXTRIES", - "PAM_AUTH_ERR", - "PAM_NEW_AUTHTOK_REQD", - "PAM_CRED_INSUFFICIENT", - "PAM_AUTHINFO_UNAVAIL", - "PAM_USER_UNKNOWN", - "PAM_CRED_UNAVAIL", - "PAM_CRED_EXPIRED", - "PAM_CRED_ERR", - "PAM_ACCT_EXPIRED", - "PAM_AUTHTOK_EXPIRED", - "PAM_SESSION_ERR", - "PAM_AUTHTOK_ERR", - "PAM_AUTHTOK_RECOVERY_ERR", - "PAM_AUTHTOK_LOCK_BUSY", - "PAM_AUTHTOK_DISABLE_AGING", - "PAM_NO_MODULE_DATA", - "PAM_IGNORE", - "PAM_ABORT", - "PAM_TRY_AGAIN", - "PAM_MODULE_UNKNOWN", - "PAM_DOMAIN_UNKNOWN" + [PAM_SUCCESS] = "PAM_SUCCESS", + [PAM_OPEN_ERR] = "PAM_OPEN_ERR", + [PAM_SYMBOL_ERR] = "PAM_SYMBOL_ERR", + [PAM_SERVICE_ERR] = "PAM_SERVICE_ERR", + [PAM_SYSTEM_ERR] = "PAM_SYSTEM_ERR", + [PAM_BUF_ERR] = "PAM_BUF_ERR", + [PAM_CONV_ERR] = "PAM_CONV_ERR", + [PAM_PERM_DENIED] = "PAM_PERM_DENIED", + [PAM_MAXTRIES] = "PAM_MAXTRIES", + [PAM_AUTH_ERR] = "PAM_AUTH_ERR", + [PAM_NEW_AUTHTOK_REQD] = "PAM_NEW_AUTHTOK_REQD", + [PAM_CRED_INSUFFICIENT] = "PAM_CRED_INSUFFICIENT", + [PAM_AUTHINFO_UNAVAIL] = "PAM_AUTHINFO_UNAVAIL", + [PAM_USER_UNKNOWN] = "PAM_USER_UNKNOWN", + [PAM_CRED_UNAVAIL] = "PAM_CRED_UNAVAIL", + [PAM_CRED_EXPIRED] = "PAM_CRED_EXPIRED", + [PAM_CRED_ERR] = "PAM_CRED_ERR", + [PAM_ACCT_EXPIRED] = "PAM_ACCT_EXPIRED", + [PAM_AUTHTOK_EXPIRED] = "PAM_AUTHTOK_EXPIRED", + [PAM_SESSION_ERR] = "PAM_SESSION_ERR", + [PAM_AUTHTOK_ERR] = "PAM_AUTHTOK_ERR", + [PAM_AUTHTOK_RECOVERY_ERR] = "PAM_AUTHTOK_RECOVERY_ERR", + [PAM_AUTHTOK_LOCK_BUSY] = "PAM_AUTHTOK_LOCK_BUSY", + [PAM_AUTHTOK_DISABLE_AGING] = "PAM_AUTHTOK_DISABLE_AGING", + [PAM_NO_MODULE_DATA] = "PAM_NO_MODULE_DATA", + [PAM_IGNORE] = "PAM_IGNORE", + [PAM_ABORT] = "PAM_ABORT", + [PAM_TRY_AGAIN] = "PAM_TRY_AGAIN", + [PAM_MODULE_UNKNOWN] = "PAM_MODULE_UNKNOWN", + [PAM_DOMAIN_UNKNOWN] = "PAM_DOMAIN_UNKNOWN", + [PAM_BAD_HANDLE] = "PAM_BAD_HANDLE", + [PAM_BAD_ITEM] = "PAM_BAD_ITEM", + [PAM_BAD_FEATURE] = "PAM_BAD_FEATURE", + [PAM_BAD_CONSTANT] = "PAM_BAD_CONSTANT", +}; + +const char *pam_err_text[PAM_NUM_ERRORS] = { + [PAM_SUCCESS] = "Success", + [PAM_OPEN_ERR] = "Failed to load module", + [PAM_SYMBOL_ERR] = "Invalid symbol", + [PAM_SERVICE_ERR] = "Error in service module", + [PAM_SYSTEM_ERR] = "System error", + [PAM_BUF_ERR] = "Memory buffer error", + [PAM_CONV_ERR] = "Conversation failure", + [PAM_PERM_DENIED] = "Permission denied", + [PAM_MAXTRIES] = "Maximum number of tries exceeded", + [PAM_AUTH_ERR] = "Authentication error", + [PAM_NEW_AUTHTOK_REQD] = "New authentication token required", + [PAM_CRED_INSUFFICIENT] = "Insufficient credentials", + [PAM_AUTHINFO_UNAVAIL] = "Authentication information is unavailable", + [PAM_USER_UNKNOWN] = "Unknown user", + [PAM_CRED_UNAVAIL] = "Failed to retrieve user credentials", + [PAM_CRED_EXPIRED] = "User credentials have expired", + [PAM_CRED_ERR] = "Failed to set user credentials", + [PAM_ACCT_EXPIRED] = "User account has expired", + [PAM_AUTHTOK_EXPIRED] = "Password has expired", + [PAM_SESSION_ERR] = "Session failure", + [PAM_AUTHTOK_ERR] = "Authentication token failure", + [PAM_AUTHTOK_RECOVERY_ERR] = "Failed to recover old authentication token", + [PAM_AUTHTOK_LOCK_BUSY] = "Authentication token lock busy", + [PAM_AUTHTOK_DISABLE_AGING] = "Authentication token aging disabled", + [PAM_NO_MODULE_DATA] = "Module data not found", + [PAM_IGNORE] = "Ignore this module", + [PAM_ABORT] = "General failure", + [PAM_TRY_AGAIN] = "Try again", + [PAM_MODULE_UNKNOWN] = "Unknown module type", + [PAM_DOMAIN_UNKNOWN] = "Unknown authentication domain", + [PAM_BAD_HANDLE] = "Invalid PAM handle", + [PAM_BAD_ITEM] = "Unrecognized or restricted item", + [PAM_BAD_FEATURE] = "Unrecognized or restricted feature", + [PAM_BAD_CONSTANT] = "Invalid constant", }; const char *pam_item_name[PAM_NUM_ITEMS] = { - "(NO ITEM)", - "PAM_SERVICE", - "PAM_USER", - "PAM_TTY", - "PAM_RHOST", - "PAM_CONV", - "PAM_AUTHTOK", - "PAM_OLDAUTHTOK", - "PAM_RUSER", - "PAM_USER_PROMPT", - "PAM_REPOSITORY", - "PAM_AUTHTOK_PROMPT", - "PAM_OLDAUTHTOK_PROMPT", - "PAM_HOST", + [PAM_SERVICE] = "PAM_SERVICE", + [PAM_USER] = "PAM_USER", + [PAM_TTY] = "PAM_TTY", + [PAM_RHOST] = "PAM_RHOST", + [PAM_CONV] = "PAM_CONV", + [PAM_AUTHTOK] = "PAM_AUTHTOK", + [PAM_OLDAUTHTOK] = "PAM_OLDAUTHTOK", + [PAM_RUSER] = "PAM_RUSER", + [PAM_USER_PROMPT] = "PAM_USER_PROMPT", + [PAM_REPOSITORY] = "PAM_REPOSITORY", + [PAM_AUTHTOK_PROMPT] = "PAM_AUTHTOK_PROMPT", + [PAM_OLDAUTHTOK_PROMPT] = "PAM_OLDAUTHTOK_PROMPT", + [PAM_HOST] = "PAM_HOST", }; const char *pam_facility_name[PAM_NUM_FACILITIES] = { - [PAM_ACCOUNT] = "account", - [PAM_AUTH] = "auth", - [PAM_PASSWORD] = "password", - [PAM_SESSION] = "session", + [PAM_ACCOUNT] = "account", + [PAM_AUTH] = "auth", + [PAM_PASSWORD] = "password", + [PAM_SESSION] = "session", }; const char *pam_control_flag_name[PAM_NUM_CONTROL_FLAGS] = { - [PAM_BINDING] = "binding", - [PAM_OPTIONAL] = "optional", - [PAM_REQUIRED] = "required", - [PAM_REQUISITE] = "requisite", - [PAM_SUFFICIENT] = "sufficient", + [PAM_BINDING] = "binding", + [PAM_OPTIONAL] = "optional", + [PAM_REQUIRED] = "required", + [PAM_REQUISITE] = "requisite", + [PAM_SUFFICIENT] = "sufficient", }; const char *pam_func_name[PAM_NUM_PRIMITIVES] = { - "pam_authenticate", - "pam_setcred", - "pam_acct_mgmt", - "pam_open_session", - "pam_close_session", - "pam_chauthtok" + [PAM_SM_AUTHENTICATE] = "pam_authenticate", + [PAM_SM_SETCRED] = "pam_setcred", + [PAM_SM_ACCT_MGMT] = "pam_acct_mgmt", + [PAM_SM_OPEN_SESSION] = "pam_open_session", + [PAM_SM_CLOSE_SESSION] = "pam_close_session", + [PAM_SM_CHAUTHTOK] = "pam_chauthtok" }; const char *pam_sm_func_name[PAM_NUM_PRIMITIVES] = { - "pam_sm_authenticate", - "pam_sm_setcred", - "pam_sm_acct_mgmt", - "pam_sm_open_session", - "pam_sm_close_session", - "pam_sm_chauthtok" + [PAM_SM_AUTHENTICATE] = "pam_sm_authenticate", + [PAM_SM_SETCRED] = "pam_sm_setcred", + [PAM_SM_ACCT_MGMT] = "pam_sm_acct_mgmt", + [PAM_SM_OPEN_SESSION] = "pam_sm_open_session", + [PAM_SM_CLOSE_SESSION] = "pam_sm_close_session", + [PAM_SM_CHAUTHTOK] = "pam_sm_chauthtok" }; const char *openpam_policy_path[] = { diff --git a/lib/libpam/openpam_constants.h b/lib/libpam/openpam_constants.h index a42b4fa76f5b..3ff3cd2a8b5f 100644 --- a/lib/libpam/openpam_constants.h +++ b/lib/libpam/openpam_constants.h @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2011 Dag-Erling Smørgrav + * Copyright (c) 2011-2017 Dag-Erling Smørgrav * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -26,13 +26,14 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam_constants.h 659 2013-03-11 14:10:13Z des $ + * $OpenPAM: openpam_constants.h 938 2017-04-30 21:34:42Z des $ */ #ifndef OPENPAM_CONSTANTS_H_INCLUDED #define OPENPAM_CONSTANTS_H_INCLUDED extern const char *pam_err_name[PAM_NUM_ERRORS]; +extern const char *pam_err_text[PAM_NUM_ERRORS]; extern const char *pam_item_name[PAM_NUM_ITEMS]; extern const char *pam_facility_name[PAM_NUM_FACILITIES]; extern const char *pam_control_flag_name[PAM_NUM_CONTROL_FLAGS]; diff --git a/lib/libpam/openpam_cred.h b/lib/libpam/openpam_cred.h index 68e2fd9d1c09..99d634630f0d 100644 --- a/lib/libpam/openpam_cred.h +++ b/lib/libpam/openpam_cred.h @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam_cred.h 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: openpam_cred.h 938 2017-04-30 21:34:42Z des $ */ #ifndef OPENPAM_CRED_H_INCLUDED diff --git a/lib/libpam/openpam_ctype.h b/lib/libpam/openpam_ctype.h index 671c2f5cf8c9..4920e4022c31 100644 --- a/lib/libpam/openpam_ctype.h +++ b/lib/libpam/openpam_ctype.h @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam_ctype.h 890 2016-01-11 16:22:09Z des $ + * $OpenPAM: openpam_ctype.h 938 2017-04-30 21:34:42Z des $ */ #ifndef OPENPAM_CTYPE_H_INCLUDED diff --git a/lib/libpam/openpam_debug.h b/lib/libpam/openpam_debug.h index 1fe8346cca8c..d980244444ef 100644 --- a/lib/libpam/openpam_debug.h +++ b/lib/libpam/openpam_debug.h @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam_debug.h 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: openpam_debug.h 938 2017-04-30 21:34:42Z des $ */ #ifndef OPENPAM_DEBUG_H_INCLUDED diff --git a/lib/libpam/openpam_dispatch.c b/lib/libpam/openpam_dispatch.c index 391ce8050d8f..ff4c66ac8b94 100644 --- a/lib/libpam/openpam_dispatch.c +++ b/lib/libpam/openpam_dispatch.c @@ -1,6 +1,6 @@ /*- * Copyright (c) 2002-2003 Networks Associates Technology, Inc. - * Copyright (c) 2004-2015 Dag-Erling Smørgrav + * Copyright (c) 2004-2017 Dag-Erling Smørgrav * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam_dispatch.c 913 2017-01-21 15:11:12Z des $ + * $OpenPAM: openpam_dispatch.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H @@ -107,7 +107,7 @@ openpam_dispatch(pam_handle_t *pamh, if (chain->module->func[primitive] == NULL) { openpam_log(PAM_LOG_ERROR, "%s: no %s()", chain->module->path, pam_sm_func_name[primitive]); - r = PAM_SYSTEM_ERR; + r = PAM_SYMBOL_ERR; } else { pamh->primitive = primitive; pamh->current = chain; diff --git a/lib/libpam/openpam_dlfunc.h b/lib/libpam/openpam_dlfunc.h index 6f8724a65d4f..a33de6bee48e 100644 --- a/lib/libpam/openpam_dlfunc.h +++ b/lib/libpam/openpam_dlfunc.h @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam_dlfunc.h 872 2015-12-01 19:25:07Z des $ + * $OpenPAM: openpam_dlfunc.h 938 2017-04-30 21:34:42Z des $ */ #ifndef OPENPAM_DLFCN_H_INCLUDED diff --git a/lib/libpam/openpam_dynamic.c b/lib/libpam/openpam_dynamic.c index 27cd4e6776da..6a0f006a6394 100644 --- a/lib/libpam/openpam_dynamic.c +++ b/lib/libpam/openpam_dynamic.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam_dynamic.c 683 2013-04-14 14:49:59Z des $ + * $OpenPAM: openpam_dynamic.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/openpam_features.c b/lib/libpam/openpam_features.c index 387d27bcd384..afffe643fcbc 100644 --- a/lib/libpam/openpam_features.c +++ b/lib/libpam/openpam_features.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam_features.c 890 2016-01-11 16:22:09Z des $ + * $OpenPAM: openpam_features.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/openpam_features.h b/lib/libpam/openpam_features.h index 00cac1c4b66f..30c0d1a82567 100644 --- a/lib/libpam/openpam_features.h +++ b/lib/libpam/openpam_features.h @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam_features.h 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: openpam_features.h 938 2017-04-30 21:34:42Z des $ */ #ifndef OPENPAM_FEATURES_H_INCLUDED diff --git a/lib/libpam/openpam_findenv.c b/lib/libpam/openpam_findenv.c index 3ad2c845794a..99cdcd134363 100644 --- a/lib/libpam/openpam_findenv.c +++ b/lib/libpam/openpam_findenv.c @@ -1,6 +1,6 @@ /*- * Copyright (c) 2002-2003 Networks Associates Technology, Inc. - * Copyright (c) 2004-2011 Dag-Erling Smørgrav + * Copyright (c) 2004-2017 Dag-Erling Smørgrav * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam_findenv.c 914 2017-01-21 15:15:29Z des $ + * $OpenPAM: openpam_findenv.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/openpam_free_data.c b/lib/libpam/openpam_free_data.c index 8f3d852b4905..c4be65cee569 100644 --- a/lib/libpam/openpam_free_data.c +++ b/lib/libpam/openpam_free_data.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam_free_data.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: openpam_free_data.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/openpam_free_envlist.c b/lib/libpam/openpam_free_envlist.c index dda06153205b..e91bc922fd52 100644 --- a/lib/libpam/openpam_free_envlist.c +++ b/lib/libpam/openpam_free_envlist.c @@ -24,7 +24,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: openpam_free_envlist.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: openpam_free_envlist.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/openpam_get_feature.c b/lib/libpam/openpam_get_feature.c index ad3d9b3ade0f..5f2b66df1541 100644 --- a/lib/libpam/openpam_get_feature.c +++ b/lib/libpam/openpam_get_feature.c @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2012 Dag-Erling Smørgrav + * Copyright (c) 2012-2017 Dag-Erling Smørgrav * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam_get_feature.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: openpam_get_feature.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H @@ -50,7 +50,7 @@ openpam_get_feature(int feature, int *onoff) ENTERF(feature); if (feature < 0 || feature >= OPENPAM_NUM_FEATURES) - RETURNC(PAM_SYMBOL_ERR); + RETURNC(PAM_BAD_FEATURE); *onoff = openpam_features[feature].onoff; RETURNC(PAM_SUCCESS); } @@ -58,7 +58,7 @@ openpam_get_feature(int feature, int *onoff) /* * Error codes: * - * PAM_SYMBOL_ERR + * PAM_BAD_FEATURE */ /** diff --git a/lib/libpam/openpam_get_option.c b/lib/libpam/openpam_get_option.c index 2cf5e87f3f40..3d158d2b1439 100644 --- a/lib/libpam/openpam_get_option.c +++ b/lib/libpam/openpam_get_option.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam_get_option.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: openpam_get_option.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/openpam_impl.h b/lib/libpam/openpam_impl.h index 589a3b325539..ad50bc14d360 100644 --- a/lib/libpam/openpam_impl.h +++ b/lib/libpam/openpam_impl.h @@ -1,6 +1,6 @@ /*- * Copyright (c) 2001-2003 Networks Associates Technology, Inc. - * Copyright (c) 2004-2011 Dag-Erling Smørgrav + * Copyright (c) 2004-2017 Dag-Erling Smørgrav * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam_impl.h 915 2017-02-07 12:03:19Z des $ + * $OpenPAM: openpam_impl.h 938 2017-04-30 21:34:42Z des $ */ #ifndef OPENPAM_IMPL_H_INCLUDED diff --git a/lib/libpam/openpam_load.c b/lib/libpam/openpam_load.c index 614c6fb40938..2edd5efb720f 100644 --- a/lib/libpam/openpam_load.c +++ b/lib/libpam/openpam_load.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam_load.c 890 2016-01-11 16:22:09Z des $ + * $OpenPAM: openpam_load.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/openpam_log.c b/lib/libpam/openpam_log.c index e52ca95b210c..ecb6758847db 100644 --- a/lib/libpam/openpam_log.c +++ b/lib/libpam/openpam_log.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam_log.c 686 2013-07-11 16:36:02Z des $ + * $OpenPAM: openpam_log.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/openpam_nullconv.c b/lib/libpam/openpam_nullconv.c index 49c71ba22d82..720b533b6db3 100644 --- a/lib/libpam/openpam_nullconv.c +++ b/lib/libpam/openpam_nullconv.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam_nullconv.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: openpam_nullconv.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/openpam_readline.c b/lib/libpam/openpam_readline.c index e3ed9b0a4f01..e43291fbddc6 100644 --- a/lib/libpam/openpam_readline.c +++ b/lib/libpam/openpam_readline.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam_readline.c 703 2013-08-16 11:57:54Z des $ + * $OpenPAM: openpam_readline.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/openpam_readlinev.c b/lib/libpam/openpam_readlinev.c index d73fc5580e8f..a0df81f7cd0e 100644 --- a/lib/libpam/openpam_readlinev.c +++ b/lib/libpam/openpam_readlinev.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam_readlinev.c 890 2016-01-11 16:22:09Z des $ + * $OpenPAM: openpam_readlinev.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/openpam_readword.c b/lib/libpam/openpam_readword.c index a73b900cbacd..4a58a819ea5a 100644 --- a/lib/libpam/openpam_readword.c +++ b/lib/libpam/openpam_readword.c @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2012-2014 Dag-Erling Smørgrav + * Copyright (c) 2012-2017 Dag-Erling Smørgrav * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam_readword.c 916 2017-02-07 12:25:58Z des $ + * $OpenPAM: openpam_readword.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/openpam_restore_cred.c b/lib/libpam/openpam_restore_cred.c index 8a150cc604e8..59f808b02373 100644 --- a/lib/libpam/openpam_restore_cred.c +++ b/lib/libpam/openpam_restore_cred.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam_restore_cred.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: openpam_restore_cred.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/openpam_set_feature.c b/lib/libpam/openpam_set_feature.c index 8e95f3eb057d..f588b179ff27 100644 --- a/lib/libpam/openpam_set_feature.c +++ b/lib/libpam/openpam_set_feature.c @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2012 Dag-Erling Smørgrav + * Copyright (c) 2012-2017 Dag-Erling Smørgrav * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam_set_feature.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: openpam_set_feature.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H @@ -50,7 +50,7 @@ openpam_set_feature(int feature, int onoff) ENTERF(feature); if (feature < 0 || feature >= OPENPAM_NUM_FEATURES) - RETURNC(PAM_SYMBOL_ERR); + RETURNC(PAM_BAD_FEATURE); openpam_features[feature].onoff = onoff; RETURNC(PAM_SUCCESS); } @@ -58,7 +58,7 @@ openpam_set_feature(int feature, int onoff) /* * Error codes: * - * PAM_SYMBOL_ERR + * PAM_BAD_FEATURE */ /** diff --git a/lib/libpam/openpam_set_option.c b/lib/libpam/openpam_set_option.c index 1c06d61d3cc9..e22fb3b492e5 100644 --- a/lib/libpam/openpam_set_option.c +++ b/lib/libpam/openpam_set_option.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam_set_option.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: openpam_set_option.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/openpam_static.c b/lib/libpam/openpam_static.c index 302b3f4c4a86..0816b4cc4a0a 100644 --- a/lib/libpam/openpam_static.c +++ b/lib/libpam/openpam_static.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam_static.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: openpam_static.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/openpam_straddch.c b/lib/libpam/openpam_straddch.c index 522405c0e23b..0bb32d266adf 100644 --- a/lib/libpam/openpam_straddch.c +++ b/lib/libpam/openpam_straddch.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam_straddch.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: openpam_straddch.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/openpam_strlcat.c b/lib/libpam/openpam_strlcat.c index 64ba9ab00986..0d2fd0989c49 100644 --- a/lib/libpam/openpam_strlcat.c +++ b/lib/libpam/openpam_strlcat.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam_strlcat.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: openpam_strlcat.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/openpam_strlcat.h b/lib/libpam/openpam_strlcat.h index d09934687970..f561283afd96 100644 --- a/lib/libpam/openpam_strlcat.h +++ b/lib/libpam/openpam_strlcat.h @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam_strlcat.h 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: openpam_strlcat.h 938 2017-04-30 21:34:42Z des $ */ #ifndef OPENPAM_STRLCAT_H_INCLUDED diff --git a/lib/libpam/openpam_strlcmp.h b/lib/libpam/openpam_strlcmp.h index d00383870e2c..2b343b40a138 100644 --- a/lib/libpam/openpam_strlcmp.h +++ b/lib/libpam/openpam_strlcmp.h @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam_strlcmp.h 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: openpam_strlcmp.h 938 2017-04-30 21:34:42Z des $ */ #ifndef OPENPAM_STRLCMP_H_INCLUDED diff --git a/lib/libpam/openpam_strlcpy.c b/lib/libpam/openpam_strlcpy.c index 7a3d142bbcd1..e4c66aefc4c8 100644 --- a/lib/libpam/openpam_strlcpy.c +++ b/lib/libpam/openpam_strlcpy.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam_strlcpy.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: openpam_strlcpy.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/openpam_strlcpy.h b/lib/libpam/openpam_strlcpy.h index 8260c5627e0d..40d300fb4901 100644 --- a/lib/libpam/openpam_strlcpy.h +++ b/lib/libpam/openpam_strlcpy.h @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam_strlcpy.h 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: openpam_strlcpy.h 938 2017-04-30 21:34:42Z des $ */ #ifndef OPENPAM_STRLCPY_H_INCLUDED diff --git a/lib/libpam/openpam_strlset.c b/lib/libpam/openpam_strlset.c index febdb5c4ebc8..e3a32dbc033d 100644 --- a/lib/libpam/openpam_strlset.c +++ b/lib/libpam/openpam_strlset.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam_strlset.c 890 2016-01-11 16:22:09Z des $ + * $OpenPAM: openpam_strlset.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/openpam_strlset.h b/lib/libpam/openpam_strlset.h index 282a26bdbde2..73bfb61c78db 100644 --- a/lib/libpam/openpam_strlset.h +++ b/lib/libpam/openpam_strlset.h @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam_strlset.h 890 2016-01-11 16:22:09Z des $ + * $OpenPAM: openpam_strlset.h 938 2017-04-30 21:34:42Z des $ */ #ifndef OPENPAM_STRLSET_H_INCLUDED diff --git a/lib/libpam/openpam_subst.c b/lib/libpam/openpam_subst.c index 1a4973477dfb..6456aee1442b 100644 --- a/lib/libpam/openpam_subst.c +++ b/lib/libpam/openpam_subst.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam_subst.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: openpam_subst.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/openpam_ttyconv.c b/lib/libpam/openpam_ttyconv.c index 7591eed682bc..8066b3b67298 100644 --- a/lib/libpam/openpam_ttyconv.c +++ b/lib/libpam/openpam_ttyconv.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam_ttyconv.c 890 2016-01-11 16:22:09Z des $ + * $OpenPAM: openpam_ttyconv.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/openpam_vasprintf.c b/lib/libpam/openpam_vasprintf.c index bedabf4fbd3d..dbdc5c6b1593 100644 --- a/lib/libpam/openpam_vasprintf.c +++ b/lib/libpam/openpam_vasprintf.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam_vasprintf.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: openpam_vasprintf.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/openpam_vasprintf.h b/lib/libpam/openpam_vasprintf.h index e92ad0d2ce6f..f78b6653167a 100644 --- a/lib/libpam/openpam_vasprintf.h +++ b/lib/libpam/openpam_vasprintf.h @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam_vasprintf.h 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: openpam_vasprintf.h 938 2017-04-30 21:34:42Z des $ */ #ifndef OPENPAM_VASPRINTF_H_INCLUDED diff --git a/lib/libpam/pam_acct_mgmt.c b/lib/libpam/pam_acct_mgmt.c index 87337a80ae6f..8f6426d20bf1 100644 --- a/lib/libpam/pam_acct_mgmt.c +++ b/lib/libpam/pam_acct_mgmt.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pam_acct_mgmt.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: pam_acct_mgmt.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/pam_authenticate.c b/lib/libpam/pam_authenticate.c index b24e39685d7e..44cb4c86c4a7 100644 --- a/lib/libpam/pam_authenticate.c +++ b/lib/libpam/pam_authenticate.c @@ -1,6 +1,6 @@ /*- * Copyright (c) 2002-2003 Networks Associates Technology, Inc. - * Copyright (c) 2004-2011 Dag-Erling Smørgrav + * Copyright (c) 2004-2017 Dag-Erling Smørgrav * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pam_authenticate.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: pam_authenticate.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H @@ -60,7 +60,7 @@ pam_authenticate(pam_handle_t *pamh, ENTER(); if (flags & ~(PAM_SILENT|PAM_DISALLOW_NULL_AUTHTOK)) - RETURNC(PAM_SYMBOL_ERR); + RETURNC(PAM_BAD_CONSTANT); r = openpam_dispatch(pamh, PAM_SM_AUTHENTICATE, flags); pam_set_item(pamh, PAM_AUTHTOK, NULL); RETURNC(r); @@ -72,7 +72,7 @@ pam_authenticate(pam_handle_t *pamh, * =openpam_dispatch * =pam_sm_authenticate * !PAM_IGNORE - * PAM_SYMBOL_ERR + * PAM_BAD_CONSTANT */ /** @@ -92,5 +92,5 @@ pam_authenticate(pam_handle_t *pamh, * Fail if the user's authentication token is null. * * If any other bits are set, =pam_authenticate will return - * =PAM_SYMBOL_ERR. + * =PAM_BAD_CONSTANT. */ diff --git a/lib/libpam/pam_authenticate_secondary.c b/lib/libpam/pam_authenticate_secondary.c index 9167867833de..02623382f85d 100644 --- a/lib/libpam/pam_authenticate_secondary.c +++ b/lib/libpam/pam_authenticate_secondary.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pam_authenticate_secondary.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: pam_authenticate_secondary.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/pam_chauthtok.c b/lib/libpam/pam_chauthtok.c index 163fec7cf42f..68790b694dfc 100644 --- a/lib/libpam/pam_chauthtok.c +++ b/lib/libpam/pam_chauthtok.c @@ -1,6 +1,6 @@ /*- * Copyright (c) 2002-2003 Networks Associates Technology, Inc. - * Copyright (c) 2004-2011 Dag-Erling Smørgrav + * Copyright (c) 2004-2017 Dag-Erling Smørgrav * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pam_chauthtok.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: pam_chauthtok.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H @@ -60,7 +60,7 @@ pam_chauthtok(pam_handle_t *pamh, ENTER(); if (flags & ~(PAM_SILENT|PAM_CHANGE_EXPIRED_AUTHTOK)) - RETURNC(PAM_SYMBOL_ERR); + RETURNC(PAM_BAD_CONSTANT); r = openpam_dispatch(pamh, PAM_SM_CHAUTHTOK, flags | PAM_PRELIM_CHECK); if (r == PAM_SUCCESS) @@ -77,7 +77,7 @@ pam_chauthtok(pam_handle_t *pamh, * =openpam_dispatch * =pam_sm_chauthtok * !PAM_IGNORE - * PAM_SYMBOL_ERR + * PAM_BAD_CONSTANT */ /** @@ -93,5 +93,5 @@ pam_chauthtok(pam_handle_t *pamh, * =PAM_CHANGE_EXPIRED_AUTHTOK: * Change only those authentication tokens that have expired. * - * If any other bits are set, =pam_chauthtok will return =PAM_SYMBOL_ERR. + * If any other bits are set, =pam_chauthtok will return =PAM_BAD_CONSTANT. */ diff --git a/lib/libpam/pam_close_session.c b/lib/libpam/pam_close_session.c index 8bc1efaebaae..8181c829c224 100644 --- a/lib/libpam/pam_close_session.c +++ b/lib/libpam/pam_close_session.c @@ -1,6 +1,6 @@ /*- * Copyright (c) 2002-2003 Networks Associates Technology, Inc. - * Copyright (c) 2004-2011 Dag-Erling Smørgrav + * Copyright (c) 2004-2017 Dag-Erling Smørgrav * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pam_close_session.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: pam_close_session.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H @@ -60,7 +60,7 @@ pam_close_session(pam_handle_t *pamh, ENTER(); if (flags & ~(PAM_SILENT)) - RETURNC(PAM_SYMBOL_ERR); + RETURNC(PAM_BAD_CONSTANT); r = openpam_dispatch(pamh, PAM_SM_CLOSE_SESSION, flags); RETURNC(r); } @@ -71,7 +71,7 @@ pam_close_session(pam_handle_t *pamh, * =openpam_dispatch * =pam_sm_close_session * !PAM_IGNORE - * PAM_SYMBOL_ERR + * PAM_BAD_CONSTANT */ /** @@ -85,5 +85,5 @@ pam_close_session(pam_handle_t *pamh, * Do not emit any messages. * * If any other bits are set, =pam_close_session will return - * =PAM_SYMBOL_ERR. + * =PAM_BAD_CONSTANT. */ diff --git a/lib/libpam/pam_end.c b/lib/libpam/pam_end.c index c855b59c4885..04541297d8a6 100644 --- a/lib/libpam/pam_end.c +++ b/lib/libpam/pam_end.c @@ -1,6 +1,6 @@ /*- * Copyright (c) 2002-2003 Networks Associates Technology, Inc. - * Copyright (c) 2004-2011 Dag-Erling Smørgrav + * Copyright (c) 2004-2017 Dag-Erling Smørgrav * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pam_end.c 913 2017-01-21 15:11:12Z des $ + * $OpenPAM: pam_end.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H @@ -60,6 +60,8 @@ pam_end(pam_handle_t *pamh, int i; ENTER(); + if (pamh == NULL) + RETURNC(PAM_BAD_HANDLE); /* clear module data */ while ((dp = pamh->module_data) != NULL) { @@ -89,6 +91,12 @@ pam_end(pam_handle_t *pamh, RETURNC(PAM_SUCCESS); } +/* + * Error codes: + * + * PAM_BAD_HANDLE + */ + /** * The =pam_end function terminates a PAM transaction and destroys the * corresponding PAM context, releasing all resources allocated to it. diff --git a/lib/libpam/pam_error.c b/lib/libpam/pam_error.c index cd018f5389e5..cba902a819f1 100644 --- a/lib/libpam/pam_error.c +++ b/lib/libpam/pam_error.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pam_error.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: pam_error.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/pam_get_authtok.c b/lib/libpam/pam_get_authtok.c index 83c6b7053fac..6d3dc9c8fa6f 100644 --- a/lib/libpam/pam_get_authtok.c +++ b/lib/libpam/pam_get_authtok.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pam_get_authtok.c 913 2017-01-21 15:11:12Z des $ + * $OpenPAM: pam_get_authtok.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H @@ -104,7 +104,7 @@ pam_get_authtok(pam_handle_t *pamh, twice = 0; break; default: - RETURNC(PAM_SYMBOL_ERR); + RETURNC(PAM_BAD_CONSTANT); } if (openpam_get_option(pamh, "try_first_pass") || openpam_get_option(pamh, "use_first_pass")) { @@ -170,6 +170,7 @@ pam_get_authtok(pam_handle_t *pamh, * =pam_prompt * =pam_set_item * !PAM_SYMBOL_ERR + * PAM_BAD_CONSTANT * PAM_TRY_AGAIN */ diff --git a/lib/libpam/pam_get_data.c b/lib/libpam/pam_get_data.c index a2f5072cb374..1db50c071ca4 100644 --- a/lib/libpam/pam_get_data.c +++ b/lib/libpam/pam_get_data.c @@ -1,6 +1,6 @@ /*- * Copyright (c) 2002-2003 Networks Associates Technology, Inc. - * Copyright (c) 2004-2011 Dag-Erling Smørgrav + * Copyright (c) 2004-2017 Dag-Erling Smørgrav * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pam_get_data.c 913 2017-01-21 15:11:12Z des $ + * $OpenPAM: pam_get_data.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/pam_get_item.c b/lib/libpam/pam_get_item.c index e28012ea2672..6babd0fc7aa8 100644 --- a/lib/libpam/pam_get_item.c +++ b/lib/libpam/pam_get_item.c @@ -1,6 +1,6 @@ /*- * Copyright (c) 2002-2003 Networks Associates Technology, Inc. - * Copyright (c) 2004-2011 Dag-Erling Smørgrav + * Copyright (c) 2004-2017 Dag-Erling Smørgrav * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pam_get_item.c 913 2017-01-21 15:11:12Z des $ + * $OpenPAM: pam_get_item.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H @@ -76,14 +76,14 @@ pam_get_item(const pam_handle_t *pamh, *item = pamh->item[item_type]; RETURNC(PAM_SUCCESS); default: - RETURNC(PAM_SYMBOL_ERR); + RETURNC(PAM_BAD_ITEM); } } /* * Error codes: * - * PAM_SYMBOL_ERR + * PAM_BAD_ITEM */ /** diff --git a/lib/libpam/pam_get_mapped_authtok.c b/lib/libpam/pam_get_mapped_authtok.c index 871405efb5dc..01c283f32cbe 100644 --- a/lib/libpam/pam_get_mapped_authtok.c +++ b/lib/libpam/pam_get_mapped_authtok.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pam_get_mapped_authtok.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: pam_get_mapped_authtok.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/pam_get_mapped_username.c b/lib/libpam/pam_get_mapped_username.c index 25305d2ac55c..05a9a4c4337d 100644 --- a/lib/libpam/pam_get_mapped_username.c +++ b/lib/libpam/pam_get_mapped_username.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pam_get_mapped_username.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: pam_get_mapped_username.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/pam_get_user.c b/lib/libpam/pam_get_user.c index f3fc4b60b8f2..7b1bd66b5316 100644 --- a/lib/libpam/pam_get_user.c +++ b/lib/libpam/pam_get_user.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pam_get_user.c 913 2017-01-21 15:11:12Z des $ + * $OpenPAM: pam_get_user.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/pam_getenv.c b/lib/libpam/pam_getenv.c index 1e034468fbc2..c3bbcd8eac2f 100644 --- a/lib/libpam/pam_getenv.c +++ b/lib/libpam/pam_getenv.c @@ -1,6 +1,6 @@ /*- * Copyright (c) 2002-2003 Networks Associates Technology, Inc. - * Copyright (c) 2004-2011 Dag-Erling Smørgrav + * Copyright (c) 2004-2017 Dag-Erling Smørgrav * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pam_getenv.c 914 2017-01-21 15:15:29Z des $ + * $OpenPAM: pam_getenv.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/pam_getenvlist.c b/lib/libpam/pam_getenvlist.c index 4139c2fb4d31..5b660e6b2bd3 100644 --- a/lib/libpam/pam_getenvlist.c +++ b/lib/libpam/pam_getenvlist.c @@ -1,6 +1,6 @@ /*- * Copyright (c) 2002-2003 Networks Associates Technology, Inc. - * Copyright (c) 2004-2011 Dag-Erling Smørgrav + * Copyright (c) 2004-2017 Dag-Erling Smørgrav * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pam_getenvlist.c 913 2017-01-21 15:11:12Z des $ + * $OpenPAM: pam_getenvlist.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H @@ -63,7 +63,7 @@ pam_getenvlist(pam_handle_t *pamh) envlist = malloc(sizeof(char *) * (pamh->env_count + 1)); if (envlist == NULL) { openpam_log(PAM_LOG_ERROR, "%s", - pam_strerror(pamh, PAM_BUF_ERR)); + pam_err_text[PAM_BUF_ERR]); RETURNP(NULL); } for (i = 0; i < pamh->env_count; ++i) { @@ -74,7 +74,7 @@ pam_getenvlist(pam_handle_t *pamh) } FREE(envlist); openpam_log(PAM_LOG_ERROR, "%s", - pam_strerror(pamh, PAM_BUF_ERR)); + pam_err_text[PAM_BUF_ERR]); RETURNP(NULL); } } diff --git a/lib/libpam/pam_info.c b/lib/libpam/pam_info.c index 550bb76c9594..d417c6864ba9 100644 --- a/lib/libpam/pam_info.c +++ b/lib/libpam/pam_info.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pam_info.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: pam_info.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/pam_open_session.c b/lib/libpam/pam_open_session.c index de12705088eb..43da3ffe44c5 100644 --- a/lib/libpam/pam_open_session.c +++ b/lib/libpam/pam_open_session.c @@ -1,6 +1,6 @@ /*- * Copyright (c) 2002-2003 Networks Associates Technology, Inc. - * Copyright (c) 2004-2011 Dag-Erling Smørgrav + * Copyright (c) 2004-2017 Dag-Erling Smørgrav * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pam_open_session.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: pam_open_session.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H @@ -60,7 +60,7 @@ pam_open_session(pam_handle_t *pamh, ENTER(); if (flags & ~(PAM_SILENT)) - RETURNC(PAM_SYMBOL_ERR); + RETURNC(PAM_BAD_CONSTANT); r = openpam_dispatch(pamh, PAM_SM_OPEN_SESSION, flags); RETURNC(r); } @@ -71,7 +71,7 @@ pam_open_session(pam_handle_t *pamh, * =openpam_dispatch * =pam_sm_open_session * !PAM_IGNORE - * PAM_SYMBOL_ERR + * PAM_BAD_CONSTANT */ /** @@ -86,5 +86,5 @@ pam_open_session(pam_handle_t *pamh, * Do not emit any messages. * * If any other bits are set, =pam_open_session will return - * =PAM_SYMBOL_ERR. + * =PAM_BAD_CONSTANT. */ diff --git a/lib/libpam/pam_prompt.c b/lib/libpam/pam_prompt.c index e3ba0f2b90e7..78b93402ce2a 100644 --- a/lib/libpam/pam_prompt.c +++ b/lib/libpam/pam_prompt.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pam_prompt.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: pam_prompt.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/pam_putenv.c b/lib/libpam/pam_putenv.c index 605277fda6f4..2f3c936e1af8 100644 --- a/lib/libpam/pam_putenv.c +++ b/lib/libpam/pam_putenv.c @@ -1,6 +1,6 @@ /*- * Copyright (c) 2002-2003 Networks Associates Technology, Inc. - * Copyright (c) 2004-2011 Dag-Erling Smørgrav + * Copyright (c) 2004-2017 Dag-Erling Smørgrav * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pam_putenv.c 914 2017-01-21 15:15:29Z des $ + * $OpenPAM: pam_putenv.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/pam_set_data.c b/lib/libpam/pam_set_data.c index 6a26b6fb02e0..84871c17ccc0 100644 --- a/lib/libpam/pam_set_data.c +++ b/lib/libpam/pam_set_data.c @@ -1,6 +1,6 @@ /*- * Copyright (c) 2002-2003 Networks Associates Technology, Inc. - * Copyright (c) 2004-2011 Dag-Erling Smørgrav + * Copyright (c) 2004-2017 Dag-Erling Smørgrav * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pam_set_data.c 913 2017-01-21 15:11:12Z des $ + * $OpenPAM: pam_set_data.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/pam_set_item.c b/lib/libpam/pam_set_item.c index 0e8f76f7fa6b..02c6b49b3d27 100644 --- a/lib/libpam/pam_set_item.c +++ b/lib/libpam/pam_set_item.c @@ -1,6 +1,6 @@ /*- * Copyright (c) 2002-2003 Networks Associates Technology, Inc. - * Copyright (c) 2004-2011 Dag-Erling Smørgrav + * Copyright (c) 2004-2017 Dag-Erling Smørgrav * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pam_set_item.c 918 2017-02-19 17:46:22Z des $ + * $OpenPAM: pam_set_item.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H @@ -70,7 +70,7 @@ pam_set_item(pam_handle_t *pamh, case PAM_SERVICE: /* set once only, by pam_start() */ if (*slot != NULL && item != NULL) - RETURNC(PAM_SYSTEM_ERR); + RETURNC(PAM_BAD_ITEM); /* fall through */ case PAM_USER: case PAM_AUTHTOK: @@ -94,7 +94,7 @@ pam_set_item(pam_handle_t *pamh, osize = nsize = sizeof(struct pam_conv); break; default: - RETURNC(PAM_SYMBOL_ERR); + RETURNC(PAM_BAD_ITEM); } if (*slot != NULL) { memset(*slot, 0xd0, osize); @@ -113,8 +113,7 @@ pam_set_item(pam_handle_t *pamh, /* * Error codes: * - * PAM_SYMBOL_ERR - * PAM_SYSTEM_ERR + * PAM_BAD_ITEM * PAM_BUF_ERR */ diff --git a/lib/libpam/pam_set_mapped_authtok.c b/lib/libpam/pam_set_mapped_authtok.c index c8fbd91b4aac..fa3d2fa4fdf4 100644 --- a/lib/libpam/pam_set_mapped_authtok.c +++ b/lib/libpam/pam_set_mapped_authtok.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pam_set_mapped_authtok.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: pam_set_mapped_authtok.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/pam_set_mapped_username.c b/lib/libpam/pam_set_mapped_username.c index 8f62f53d235d..ee8813b1e973 100644 --- a/lib/libpam/pam_set_mapped_username.c +++ b/lib/libpam/pam_set_mapped_username.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pam_set_mapped_username.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: pam_set_mapped_username.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/pam_setcred.c b/lib/libpam/pam_setcred.c index 7a691765573b..eb71ba808a84 100644 --- a/lib/libpam/pam_setcred.c +++ b/lib/libpam/pam_setcred.c @@ -1,6 +1,6 @@ /*- * Copyright (c) 2002-2003 Networks Associates Technology, Inc. - * Copyright (c) 2004-2011 Dag-Erling Smørgrav + * Copyright (c) 2004-2017 Dag-Erling Smørgrav * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pam_setcred.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: pam_setcred.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H @@ -61,7 +61,7 @@ pam_setcred(pam_handle_t *pamh, ENTER(); if (flags & ~(PAM_SILENT|PAM_ESTABLISH_CRED|PAM_DELETE_CRED| PAM_REINITIALIZE_CRED|PAM_REFRESH_CRED)) - RETURNC(PAM_SYMBOL_ERR); + RETURNC(PAM_BAD_CONSTANT); /* XXX enforce exclusivity */ r = openpam_dispatch(pamh, PAM_SM_SETCRED, flags); RETURNC(r); @@ -73,7 +73,7 @@ pam_setcred(pam_handle_t *pamh, * =openpam_dispatch * =pam_sm_setcred * !PAM_IGNORE - * PAM_SYMBOL_ERR + * PAM_BAD_CONSTANT */ /** @@ -95,5 +95,5 @@ pam_setcred(pam_handle_t *pamh, * * The latter four are mutually exclusive. * - * If any other bits are set, =pam_setcred will return =PAM_SYMBOL_ERR. + * If any other bits are set, =pam_setcred will return =PAM_BAD_CONSTANT. */ diff --git a/lib/libpam/pam_setenv.c b/lib/libpam/pam_setenv.c index 3c2209c1c0dd..f05faf236608 100644 --- a/lib/libpam/pam_setenv.c +++ b/lib/libpam/pam_setenv.c @@ -1,6 +1,6 @@ /*- * Copyright (c) 2002-2003 Networks Associates Technology, Inc. - * Copyright (c) 2004-2011 Dag-Erling Smørgrav + * Copyright (c) 2004-2017 Dag-Erling Smørgrav * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pam_setenv.c 914 2017-01-21 15:15:29Z des $ + * $OpenPAM: pam_setenv.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/pam_sm_acct_mgmt.c b/lib/libpam/pam_sm_acct_mgmt.c index 6420fbac0fb2..0919c26bd54d 100644 --- a/lib/libpam/pam_sm_acct_mgmt.c +++ b/lib/libpam/pam_sm_acct_mgmt.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pam_sm_acct_mgmt.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: pam_sm_acct_mgmt.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/pam_sm_authenticate.c b/lib/libpam/pam_sm_authenticate.c index f31b6ac2db24..79c134866d87 100644 --- a/lib/libpam/pam_sm_authenticate.c +++ b/lib/libpam/pam_sm_authenticate.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pam_sm_authenticate.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: pam_sm_authenticate.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/pam_sm_authenticate_secondary.c b/lib/libpam/pam_sm_authenticate_secondary.c index 4a232fbd0fcb..295614296571 100644 --- a/lib/libpam/pam_sm_authenticate_secondary.c +++ b/lib/libpam/pam_sm_authenticate_secondary.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pam_sm_authenticate_secondary.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: pam_sm_authenticate_secondary.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/pam_sm_chauthtok.c b/lib/libpam/pam_sm_chauthtok.c index 4f17562af288..fcf6542628b3 100644 --- a/lib/libpam/pam_sm_chauthtok.c +++ b/lib/libpam/pam_sm_chauthtok.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pam_sm_chauthtok.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: pam_sm_chauthtok.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/pam_sm_close_session.c b/lib/libpam/pam_sm_close_session.c index 9247d8f5b1fc..ffd78fc2abaa 100644 --- a/lib/libpam/pam_sm_close_session.c +++ b/lib/libpam/pam_sm_close_session.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pam_sm_close_session.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: pam_sm_close_session.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/pam_sm_get_mapped_authtok.c b/lib/libpam/pam_sm_get_mapped_authtok.c index 473a52e7742e..f5fba4ec6770 100644 --- a/lib/libpam/pam_sm_get_mapped_authtok.c +++ b/lib/libpam/pam_sm_get_mapped_authtok.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pam_sm_get_mapped_authtok.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: pam_sm_get_mapped_authtok.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/pam_sm_get_mapped_username.c b/lib/libpam/pam_sm_get_mapped_username.c index 6de9fdb46437..286f6e4a444d 100644 --- a/lib/libpam/pam_sm_get_mapped_username.c +++ b/lib/libpam/pam_sm_get_mapped_username.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pam_sm_get_mapped_username.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: pam_sm_get_mapped_username.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/pam_sm_open_session.c b/lib/libpam/pam_sm_open_session.c index a576a00b1af9..293d40aadef2 100644 --- a/lib/libpam/pam_sm_open_session.c +++ b/lib/libpam/pam_sm_open_session.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pam_sm_open_session.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: pam_sm_open_session.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/pam_sm_set_mapped_authtok.c b/lib/libpam/pam_sm_set_mapped_authtok.c index de0e91f86e5d..afcb55928198 100644 --- a/lib/libpam/pam_sm_set_mapped_authtok.c +++ b/lib/libpam/pam_sm_set_mapped_authtok.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pam_sm_set_mapped_authtok.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: pam_sm_set_mapped_authtok.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/pam_sm_set_mapped_username.c b/lib/libpam/pam_sm_set_mapped_username.c index 2696d3e182ec..ed844c3385a8 100644 --- a/lib/libpam/pam_sm_set_mapped_username.c +++ b/lib/libpam/pam_sm_set_mapped_username.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pam_sm_set_mapped_username.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: pam_sm_set_mapped_username.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/pam_sm_setcred.c b/lib/libpam/pam_sm_setcred.c index 0836adc54f8e..1926c5664031 100644 --- a/lib/libpam/pam_sm_setcred.c +++ b/lib/libpam/pam_sm_setcred.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pam_sm_setcred.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: pam_sm_setcred.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/pam_start.c b/lib/libpam/pam_start.c index 03fae416cad6..6605d9179ce2 100644 --- a/lib/libpam/pam_start.c +++ b/lib/libpam/pam_start.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pam_start.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: pam_start.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/pam_strerror.c b/lib/libpam/pam_strerror.c index 8621ad6c3dd4..2f6fd70a25ba 100644 --- a/lib/libpam/pam_strerror.c +++ b/lib/libpam/pam_strerror.c @@ -1,6 +1,6 @@ /*- * Copyright (c) 2002-2003 Networks Associates Technology, Inc. - * Copyright (c) 2004-2011 Dag-Erling Smørgrav + * Copyright (c) 2004-2017 Dag-Erling Smørgrav * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pam_strerror.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: pam_strerror.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H @@ -59,69 +59,9 @@ pam_strerror(const pam_handle_t *pamh, static char unknown[16]; (void)pamh; - - switch (error_number) { - case PAM_SUCCESS: - return ("success"); - case PAM_OPEN_ERR: - return ("failed to load module"); - case PAM_SYMBOL_ERR: - return ("invalid symbol"); - case PAM_SERVICE_ERR: - return ("error in service module"); - case PAM_SYSTEM_ERR: - return ("system error"); - case PAM_BUF_ERR: - return ("memory buffer error"); - case PAM_CONV_ERR: - return ("conversation failure"); - case PAM_PERM_DENIED: - return ("permission denied"); - case PAM_MAXTRIES: - return ("maximum number of tries exceeded"); - case PAM_AUTH_ERR: - return ("authentication error"); - case PAM_NEW_AUTHTOK_REQD: - return ("new authentication token required"); - case PAM_CRED_INSUFFICIENT: - return ("insufficient credentials"); - case PAM_AUTHINFO_UNAVAIL: - return ("authentication information is unavailable"); - case PAM_USER_UNKNOWN: - return ("unknown user"); - case PAM_CRED_UNAVAIL: - return ("failed to retrieve user credentials"); - case PAM_CRED_EXPIRED: - return ("user credentials have expired"); - case PAM_CRED_ERR: - return ("failed to set user credentials"); - case PAM_ACCT_EXPIRED: - return ("user account has expired"); - case PAM_AUTHTOK_EXPIRED: - return ("password has expired"); - case PAM_SESSION_ERR: - return ("session failure"); - case PAM_AUTHTOK_ERR: - return ("authentication token failure"); - case PAM_AUTHTOK_RECOVERY_ERR: - return ("failed to recover old authentication token"); - case PAM_AUTHTOK_LOCK_BUSY: - return ("authentication token lock busy"); - case PAM_AUTHTOK_DISABLE_AGING: - return ("authentication token aging disabled"); - case PAM_NO_MODULE_DATA: - return ("module data not found"); - case PAM_IGNORE: - return ("ignore this module"); - case PAM_ABORT: - return ("general failure"); - case PAM_TRY_AGAIN: - return ("try again"); - case PAM_MODULE_UNKNOWN: - return ("unknown module type"); - case PAM_DOMAIN_UNKNOWN: - return ("unknown authentication domain"); - default: + if (error_number >= 0 && error_number < PAM_NUM_ERRORS) { + return (pam_err_text[error_number]); + } else { snprintf(unknown, sizeof unknown, "#%d", error_number); return (unknown); } diff --git a/lib/libpam/pam_verror.c b/lib/libpam/pam_verror.c index 683abbc0b2fb..67950cf71159 100644 --- a/lib/libpam/pam_verror.c +++ b/lib/libpam/pam_verror.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pam_verror.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: pam_verror.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/pam_vinfo.c b/lib/libpam/pam_vinfo.c index 3ae2c7faa19a..3e027914630a 100644 --- a/lib/libpam/pam_vinfo.c +++ b/lib/libpam/pam_vinfo.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pam_vinfo.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: pam_vinfo.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/pam_vprompt.c b/lib/libpam/pam_vprompt.c index eb337af0dc06..982e6ae5a5ce 100644 --- a/lib/libpam/pam_vprompt.c +++ b/lib/libpam/pam_vprompt.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pam_vprompt.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: pam_vprompt.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H |