diff options
Diffstat (limited to 'include')
| -rwxr-xr-x | include/pam_mod_misc.h~ | 56 | ||||
| -rwxr-xr-x | include/security/pam_mod_misc.h (renamed from include/pam_mod_misc.h) | 3 |
2 files changed, 3 insertions, 56 deletions
diff --git a/include/pam_mod_misc.h~ b/include/pam_mod_misc.h~ deleted file mode 100755 index 7576989..0000000 --- a/include/pam_mod_misc.h~ +++ /dev/null @@ -1,56 +0,0 @@ -/*- - * Copyright 1998 Juniper Networks, Inc. - * All rights reserved. - * - * 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, this list of conditions and the following disclaimer. - * 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. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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. - * - * $FreeBSD: src/lib/libpam/libpam/security/pam_mod_misc.h,v 1.12 2003/05/31 16:56:35 des Exp $ - */ - -#ifndef PAM_MOD_MISC_H -#define PAM_MOD_MISC_H - -#include <sys/cdefs.h> - -/* - * Common option names - */ -#define PAM_OPT_NULLOK "nullok" -#define PAM_OPT_AUTH_AS_SELF "auth_as_self" -#define PAM_OPT_ECHO_PASS "echo_pass" -#define PAM_OPT_DEBUG "debug" - -__BEGIN_DECLS -void _pam_verbose_error(pam_handle_t *, int, const char *, - const char *, const char *, ...); -__END_DECLS - -#define PAM_LOG(...) \ - openpam_log(PAM_LOG_DEBUG, __VA_ARGS__) - -#define PAM_RETURN(arg) \ - return (arg) - -#define PAM_VERBOSE_ERROR(...) \ - _pam_verbose_error(pamh, flags, __FILE__, __FUNCTION__, __VA_ARGS__) - -#endif diff --git a/include/pam_mod_misc.h b/include/security/pam_mod_misc.h index b1609fc..829dece 100755 --- a/include/pam_mod_misc.h +++ b/include/security/pam_mod_misc.h @@ -24,6 +24,9 @@ #define PAM_LOG(...) \ openpam_log(PAM_LOG_DEBUG, __VA_ARGS__) +#define PAM_ERROR(...) \ + openpam_log(PAM_LOG_ERROR, __VA_ARGS__) + #define PAM_RETURN(arg) \ return (arg) |