diff options
author | des <des@FreeBSD.org> | 2012-05-26 17:10:16 +0000 |
---|---|---|
committer | des <des@FreeBSD.org> | 2012-05-26 17:10:16 +0000 |
commit | e591108b4ff3b509a90d50646dac489bd3586c83 (patch) | |
tree | 8db8bd736c680a375326928576df3d5395b6a4f3 /contrib/openpam/include/security | |
parent | 14a6c41ca7a3722b33e2208c83fb8b4a009b0ecf (diff) | |
parent | 4d990f74cc8d1f6788d9e35ce8ada48cc0b5f41f (diff) | |
download | FreeBSD-src-e591108b4ff3b509a90d50646dac489bd3586c83.zip FreeBSD-src-e591108b4ff3b509a90d50646dac489bd3586c83.tar.gz |
Update to OpenPAM Micrampelis.
Diffstat (limited to 'contrib/openpam/include/security')
-rw-r--r-- | contrib/openpam/include/security/openpam.h | 43 | ||||
-rw-r--r-- | contrib/openpam/include/security/openpam_version.h | 6 |
2 files changed, 43 insertions, 6 deletions
diff --git a/contrib/openpam/include/security/openpam.h b/contrib/openpam/include/security/openpam.h index 0c896a4..4ba8b95 100644 --- a/contrib/openpam/include/security/openpam.h +++ b/contrib/openpam/include/security/openpam.h @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam.h 455 2011-10-29 18:31:11Z des $ + * $Id: openpam.h 605 2012-04-20 11:05:10Z des $ */ #ifndef SECURITY_OPENPAM_H_INCLUDED @@ -157,12 +157,49 @@ openpam_readline(FILE *_f, int *_lineno, size_t *_lenp) OPENPAM_NONNULL((1)); + +char ** +openpam_readlinev(FILE *_f, + int *_lineno, + int *_lenp) + OPENPAM_NONNULL((1)); + +char * +openpam_readword(FILE *_f, + int *_lineno, + size_t *_lenp) + OPENPAM_NONNULL((1)); #endif +int +openpam_straddch(char **_str, + size_t *_sizep, + size_t *_lenp, + int ch) + OPENPAM_NONNULL((1)); + +/* + * Enable / disable optional features + */ +enum { + OPENPAM_RESTRICT_SERVICE_NAME, + OPENPAM_VERIFY_POLICY_FILE, + OPENPAM_RESTRICT_MODULE_NAME, + OPENPAM_VERIFY_MODULE_FILE, + OPENPAM_NUM_FEATURES +}; + +int +openpam_set_feature(int _feature, int _onoff); + +int +openpam_get_feature(int _feature, int *_onoff); + /* * Log levels */ enum { + PAM_LOG_LIBDEBUG = -1, PAM_LOG_DEBUG, PAM_LOG_VERBOSE, PAM_LOG_NOTICE, @@ -196,8 +233,8 @@ _openpam_log(int _level, void openpam_log(int _level, const char *_format, - ...) - OPENPAM_FORMAT ((__printf__, 2, 3)) + ...) + OPENPAM_FORMAT ((__printf__, 2, 3)) OPENPAM_NONNULL((2)); #endif diff --git a/contrib/openpam/include/security/openpam_version.h b/contrib/openpam/include/security/openpam_version.h index ed1c1de..d50d913 100644 --- a/contrib/openpam/include/security/openpam_version.h +++ b/contrib/openpam/include/security/openpam_version.h @@ -32,14 +32,14 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam_version.h 505 2011-12-18 14:13:08Z des $ + * $Id: openpam_version.h 609 2012-05-26 13:57:45Z des $ */ #ifndef SECURITY_OPENPAM_VERSION_H_INCLUDED #define SECURITY_OPENPAM_VERSION_H_INCLUDED #define OPENPAM -#define OPENPAM_VERSION 20111218 -#define OPENPAM_RELEASE "Lycopsida" +#define OPENPAM_VERSION 20120526 +#define OPENPAM_RELEASE "Micrampelis" #endif /* !SECURITY_OPENPAM_VERSION_H_INCLUDED */ |