OpenPAM: headers diff between 20071221 and 20111218 versions

	openpam.h	openpam.h
	/*-	/*-
	* Copyright (c) 2002-2003 Networks Associates Technology, Inc.	* Copyright (c) 2002-2003 Networks Associates Technology, Inc.

	* Copyright (c) 2004-2007 Dag-Erling Smørgrav	* Copyright (c) 2004-2011 Dag-Erling Smørgrav
	* All rights reserved.	* All rights reserved.
	*	*
	* This software was developed for the FreeBSD Project by ThinkSec AS and	* This software was developed for the FreeBSD Project by ThinkSec AS and
	* Network Associates Laboratories, the Security Research Division of	* Network Associates Laboratories, the Security Research Division of
	* Network Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035	* Network Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035
	* ("CBOSS"), as part of the DARPA CHATS research program.	* ("CBOSS"), as part of the DARPA CHATS research program.
	*	*
	* Redistribution and use in source and binary forms, with or without	* Redistribution and use in source and binary forms, with or without
	* modification, are permitted provided that the following conditions	* modification, are permitted provided that the following conditions
	* are met:	* are met:

	skipping to change at line 35	skipping to change at line 35
	* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPO SE	* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPO SE
	* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE	* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
	* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTI AL	* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTI AL
	* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS	* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
	* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)	* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
	* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRI CT	* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRI CT
	* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WA Y	* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WA Y
	* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF	* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
	* SUCH DAMAGE.	* SUCH DAMAGE.
	*	*

	* $Id: openpam.h 408 2007-12-21 11:36:24Z des $	* $Id: openpam.h 455 2011-10-29 18:31:11Z des $
	*/	*/

	#ifndef SECURITY_OPENPAM_H_INCLUDED	#ifndef SECURITY_OPENPAM_H_INCLUDED
	#define SECURITY_OPENPAM_H_INCLUDED	#define SECURITY_OPENPAM_H_INCLUDED

	/*	/*
	* Annoying but necessary header pollution	* Annoying but necessary header pollution
	*/	*/
	#include <stdarg.h>	#include <stdarg.h>


	skipping to change at line 62	skipping to change at line 62
	struct passwd;	struct passwd;

	/*	/*
	* API extensions	* API extensions
	*/	*/
	int	int
	openpam_borrow_cred(pam_handle_t *_pamh,	openpam_borrow_cred(pam_handle_t *_pamh,
	const struct passwd *_pwd)	const struct passwd *_pwd)
	OPENPAM_NONNULL((1,2));	OPENPAM_NONNULL((1,2));


		int
		openpam_subst(const pam_handle_t *_pamh,
		char *_buf,
		size_t *_bufsize,
		const char *_template);

	void	void
	openpam_free_data(pam_handle_t *_pamh,	openpam_free_data(pam_handle_t *_pamh,
	void *_data,	void *_data,
	int _status);	int _status);

	void	void
	openpam_free_envlist(char **_envlist);	openpam_free_envlist(char **_envlist);

	const char *	const char *
	openpam_get_option(pam_handle_t *_pamh,	openpam_get_option(pam_handle_t *_pamh,

	skipping to change at line 312	skipping to change at line 318
	#else	#else
	# undef PAM_SM_PASSWORD	# undef PAM_SM_PASSWORD
	# define PAM_SM_PASSWORD	# define PAM_SM_PASSWORD
	# define _PAM_SM_CHAUTHTOK pam_sm_chauthtok	# define _PAM_SM_CHAUTHTOK pam_sm_chauthtok
	#endif	#endif

	/*	/*
	* Infrastructure for static modules using GCC linker sets.	* Infrastructure for static modules using GCC linker sets.
	* You are not expected to understand this.	* You are not expected to understand this.
	*/	*/

	#if defined(__FreeBSD__)	#if !defined(PAM_SOEXT)
	# define PAM_SOEXT ".so"	# define PAM_SOEXT ".so"

	#else
	# undef NO_STATIC_MODULES
	# define NO_STATIC_MODULES
	#endif	#endif


	#if defined(__GNUC__) && !defined(__PIC__) && !defined(NO_STATIC_MODULES)	#if defined(OPENPAM_STATIC_MODULES)
		# if !defined(__GNUC__)
		# error "Don't know how to build static modules on non-GNU compilers"
		# endif
	/* gcc, static linking */	/* gcc, static linking */
	# include <sys/cdefs.h>	# include <sys/cdefs.h>
	# include <linker_set.h>	# include <linker_set.h>

	# define OPENPAM_STATIC_MODULES
	# define PAM_EXTERN static	# define PAM_EXTERN static
	# define PAM_MODULE_ENTRY(name) \	# define PAM_MODULE_ENTRY(name) \
	static char _pam_name[] = name PAM_SOEXT; \	static char _pam_name[] = name PAM_SOEXT; \
	static struct pam_module _pam_module = { \	static struct pam_module _pam_module = { \
	.path = _pam_name, \	.path = _pam_name, \
	.func = { \	.func = { \
	[PAM_SM_AUTHENTICATE] = _PAM_SM_AUTHENTICATE, \	[PAM_SM_AUTHENTICATE] = _PAM_SM_AUTHENTICATE, \
	[PAM_SM_SETCRED] = _PAM_SM_SETCRED, \	[PAM_SM_SETCRED] = _PAM_SM_SETCRED, \
	[PAM_SM_ACCT_MGMT] = _PAM_SM_ACCT_MGMT, \	[PAM_SM_ACCT_MGMT] = _PAM_SM_ACCT_MGMT, \
	[PAM_SM_OPEN_SESSION] = _PAM_SM_OPEN_SESSION, \	[PAM_SM_OPEN_SESSION] = _PAM_SM_OPEN_SESSION, \

End of changes. 7 change blocks.
	8 lines changed or deleted	13 lines changed or added

	pam_appl.h	pam_appl.h
	/*-	/*-
	* Copyright (c) 2002-2003 Networks Associates Technology, Inc.	* Copyright (c) 2002-2003 Networks Associates Technology, Inc.

	* Copyright (c) 2004-2007 Dag-Erling Smørgrav	* Copyright (c) 2004-2011 Dag-Erling Smørgrav
	* All rights reserved.	* All rights reserved.
	*	*
	* This software was developed for the FreeBSD Project by ThinkSec AS and	* This software was developed for the FreeBSD Project by ThinkSec AS and
	* Network Associates Laboratories, the Security Research Division of	* Network Associates Laboratories, the Security Research Division of
	* Network Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035	* Network Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035
	* ("CBOSS"), as part of the DARPA CHATS research program.	* ("CBOSS"), as part of the DARPA CHATS research program.
	*	*
	* Redistribution and use in source and binary forms, with or without	* Redistribution and use in source and binary forms, with or without
	* modification, are permitted provided that the following conditions	* modification, are permitted provided that the following conditions
	* are met:	* are met:

	skipping to change at line 35	skipping to change at line 35
	* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPO SE	* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPO SE
	* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE	* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
	* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTI AL	* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTI AL
	* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS	* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
	* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)	* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
	* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRI CT	* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRI CT
	* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WA Y	* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WA Y
	* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF	* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
	* SUCH DAMAGE.	* SUCH DAMAGE.
	*	*

	* $Id: pam_appl.h 408 2007-12-21 11:36:24Z des $	* $Id: pam_appl.h 437 2011-09-13 12:00:13Z des $
	*/	*/

	#ifndef SECURITY_PAM_APPL_H_INCLUDED	#ifndef SECURITY_PAM_APPL_H_INCLUDED
	#define SECURITY_PAM_APPL_H_INCLUDED	#define SECURITY_PAM_APPL_H_INCLUDED

	#include <security/pam_types.h>	#include <security/pam_types.h>
	#include <security/pam_constants.h>	#include <security/pam_constants.h>
	#include <security/openpam_attr.h>	#include <security/openpam_attr.h>

	#ifdef __cplusplus	#ifdef __cplusplus

	skipping to change at line 75	skipping to change at line 75
	int _flags)	int _flags)
	OPENPAM_NONNULL((1));	OPENPAM_NONNULL((1));

	int	int
	pam_close_session(pam_handle_t *_pamh,	pam_close_session(pam_handle_t *_pamh,
	int _flags)	int _flags)
	OPENPAM_NONNULL((1));	OPENPAM_NONNULL((1));

	int	int
	pam_end(pam_handle_t *_pamh,	pam_end(pam_handle_t *_pamh,

	int _status)	int _status);
	OPENPAM_NONNULL((1));

	int	int
	pam_get_data(const pam_handle_t *_pamh,	pam_get_data(const pam_handle_t *_pamh,
	const char *_module_data_name,	const char *_module_data_name,
	const void **_data)	const void **_data)
	OPENPAM_NONNULL((1,2,3));	OPENPAM_NONNULL((1,2,3));

	int	int
	pam_get_item(const pam_handle_t *_pamh,	pam_get_item(const pam_handle_t *_pamh,
	int _item_type,	int _item_type,

End of changes. 3 change blocks.
	4 lines changed or deleted	3 lines changed or added

	pam_constants.h	pam_constants.h
	/*-	/*-
	* Copyright (c) 2002-2003 Networks Associates Technology, Inc.	* Copyright (c) 2002-2003 Networks Associates Technology, Inc.

	* Copyright (c) 2004-2007 Dag-Erling Smørgrav	* Copyright (c) 2004-2011 Dag-Erling Smørgrav
	* All rights reserved.	* All rights reserved.
	*	*
	* This software was developed for the FreeBSD Project by ThinkSec AS and	* This software was developed for the FreeBSD Project by ThinkSec AS and
	* Network Associates Laboratories, the Security Research Division of	* Network Associates Laboratories, the Security Research Division of
	* Network Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035	* Network Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035
	* ("CBOSS"), as part of the DARPA CHATS research program.	* ("CBOSS"), as part of the DARPA CHATS research program.
	*	*
	* Redistribution and use in source and binary forms, with or without	* Redistribution and use in source and binary forms, with or without
	* modification, are permitted provided that the following conditions	* modification, are permitted provided that the following conditions
	* are met:	* are met:

	skipping to change at line 35	skipping to change at line 35
	* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPO SE	* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPO SE
	* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE	* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
	* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTI AL	* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTI AL
	* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS	* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
	* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)	* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
	* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRI CT	* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRI CT
	* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WA Y	* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WA Y
	* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF	* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
	* SUCH DAMAGE.	* SUCH DAMAGE.
	*	*

	* $Id: pam_constants.h 408 2007-12-21 11:36:24Z des $	* $Id: pam_constants.h 443 2011-10-22 01:01:39Z des $
	*/	*/

	#ifndef SECURITY_PAM_CONSTANTS_H_INCLUDED	#ifndef SECURITY_PAM_CONSTANTS_H_INCLUDED
	#define SECURITY_PAM_CONSTANTS_H_INCLUDED	#define SECURITY_PAM_CONSTANTS_H_INCLUDED

	#include <security/openpam_version.h>	#include <security/openpam_version.h>

	#ifdef __cplusplus	#ifdef __cplusplus
	extern "C" {	extern "C" {
	#endif	#endif

	skipping to change at line 129	skipping to change at line 129
	PAM_TTY = 3,	PAM_TTY = 3,
	PAM_RHOST = 4,	PAM_RHOST = 4,
	PAM_CONV = 5,	PAM_CONV = 5,
	PAM_AUTHTOK = 6,	PAM_AUTHTOK = 6,
	PAM_OLDAUTHTOK = 7,	PAM_OLDAUTHTOK = 7,
	PAM_RUSER = 8,	PAM_RUSER = 8,
	PAM_USER_PROMPT = 9,	PAM_USER_PROMPT = 9,
	PAM_REPOSITORY = 10,	PAM_REPOSITORY = 10,
	PAM_AUTHTOK_PROMPT = 11, /* OpenPAM extension */	PAM_AUTHTOK_PROMPT = 11, /* OpenPAM extension */
	PAM_OLDAUTHTOK_PROMPT = 12, /* OpenPAM extension */	PAM_OLDAUTHTOK_PROMPT = 12, /* OpenPAM extension */

		PAM_HOST = 13, /* OpenPAM extension */
	PAM_NUM_ITEMS /* OpenPAM extension */	PAM_NUM_ITEMS /* OpenPAM extension */
	};	};

	#ifdef __cplusplus	#ifdef __cplusplus
	}	}
	#endif	#endif

	#endif /* !SECURITY_PAM_CONSTANTS_H_INCLUDED */	#endif /* !SECURITY_PAM_CONSTANTS_H_INCLUDED */

End of changes. 3 change blocks.
	2 lines changed or deleted	3 lines changed or added

	pam_types.h	pam_types.h
	/*-	/*-
	* Copyright (c) 2002-2003 Networks Associates Technology, Inc.	* Copyright (c) 2002-2003 Networks Associates Technology, Inc.

	* Copyright (c) 2004-2007 Dag-Erling Smørgrav	* Copyright (c) 2004-2011 Dag-Erling Smørgrav
	* All rights reserved.	* All rights reserved.
	*	*
	* This software was developed for the FreeBSD Project by ThinkSec AS and	* This software was developed for the FreeBSD Project by ThinkSec AS and
	* Network Associates Laboratories, the Security Research Division of	* Network Associates Laboratories, the Security Research Division of
	* Network Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035	* Network Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035
	* ("CBOSS"), as part of the DARPA CHATS research program.	* ("CBOSS"), as part of the DARPA CHATS research program.
	*	*
	* Redistribution and use in source and binary forms, with or without	* Redistribution and use in source and binary forms, with or without
	* modification, are permitted provided that the following conditions	* modification, are permitted provided that the following conditions
	* are met:	* are met:

	skipping to change at line 35	skipping to change at line 35
	* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPO SE	* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPO SE
	* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE	* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
	* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTI AL	* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTI AL
	* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS	* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
	* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)	* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
	* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRI CT	* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRI CT
	* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WA Y	* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WA Y
	* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF	* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
	* SUCH DAMAGE.	* SUCH DAMAGE.
	*	*

	* $Id: pam_types.h 408 2007-12-21 11:36:24Z des $	* $Id: pam_types.h 437 2011-09-13 12:00:13Z des $
	*/	*/

	#ifndef SECURITY_PAM_TYPES_H_INCLUDED	#ifndef SECURITY_PAM_TYPES_H_INCLUDED
	#define SECURITY_PAM_TYPES_H_INCLUDED	#define SECURITY_PAM_TYPES_H_INCLUDED

	#include <stddef.h>	#include <stddef.h>

	#ifdef __cplusplus	#ifdef __cplusplus
	extern "C" {	extern "C" {
	#endif	#endif

End of changes. 2 change blocks.
	2 lines changed or deleted	2 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/