aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/Makefile.am2
-rw-r--r--include/Makefile.in2
-rw-r--r--include/security/Makefile.am2
-rw-r--r--include/security/Makefile.in2
-rw-r--r--include/security/openpam.h2
-rw-r--r--include/security/openpam_attr.h2
-rw-r--r--include/security/openpam_version.h8
-rw-r--r--include/security/pam_appl.h7
-rw-r--r--include/security/pam_constants.h8
-rw-r--r--include/security/pam_modules.h2
-rw-r--r--include/security/pam_types.h2
11 files changed, 21 insertions, 18 deletions
diff --git a/include/Makefile.am b/include/Makefile.am
index 8a2755a7c88e..731c4a1ae1ff 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,3 +1,3 @@
-# $Id: Makefile.am 648 2013-03-05 17:54:27Z des $
+# $OpenPAM: Makefile.am 938 2017-04-30 21:34:42Z des $
SUBDIRS = security
diff --git a/include/Makefile.in b/include/Makefile.in
index a2464ca91140..3777407c6157 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -14,7 +14,7 @@
@SET_MAKE@
-# $Id: Makefile.am 648 2013-03-05 17:54:27Z 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/include/security/Makefile.am b/include/security/Makefile.am
index c3d10f32a08d..6f36694e02fe 100644
--- a/include/security/Makefile.am
+++ b/include/security/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 $
securitydir = $(includedir)/security
diff --git a/include/security/Makefile.in b/include/security/Makefile.in
index 93cd98873048..8c1405037989 100644
--- a/include/security/Makefile.in
+++ b/include/security/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 = { \
diff --git a/include/security/openpam.h b/include/security/openpam.h
index 77f0bb8eb719..1e7bc1ef44b2 100644
--- a/include/security/openpam.h
+++ b/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 890 2016-01-11 16:22:09Z des $
+ * $OpenPAM: openpam.h 938 2017-04-30 21:34:42Z des $
*/
#ifndef SECURITY_OPENPAM_H_INCLUDED
diff --git a/include/security/openpam_attr.h b/include/security/openpam_attr.h
index 2d88ae5f25a3..b07768139d4c 100644
--- a/include/security/openpam_attr.h
+++ b/include/security/openpam_attr.h
@@ -1,5 +1,5 @@
/*
- * $Id: openpam_attr.h 656 2013-03-06 22:58:45Z des $
+ * $OpenPAM: openpam_attr.h 938 2017-04-30 21:34:42Z des $
*/
#ifndef SECURITY_OPENPAM_ATTR_H_INCLUDED
diff --git a/include/security/openpam_version.h b/include/security/openpam_version.h
index f10b6a945dea..9a2e1cb17a6e 100644
--- a/include/security/openpam_version.h
+++ b/include/security/openpam_version.h
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2002-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2014 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,14 +32,14 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: openpam_version.h 923 2017-02-19 19:31:16Z des $
+ * $OpenPAM: openpam_version.h 938 2017-04-30 21:34:42Z des $
*/
#ifndef SECURITY_OPENPAM_VERSION_H_INCLUDED
#define SECURITY_OPENPAM_VERSION_H_INCLUDED
#define OPENPAM
-#define OPENPAM_VERSION 20170219
-#define OPENPAM_RELEASE "Radula"
+#define OPENPAM_VERSION 20170430
+#define OPENPAM_RELEASE "Resedacea"
#endif /* !SECURITY_OPENPAM_VERSION_H_INCLUDED */
diff --git a/include/security/pam_appl.h b/include/security/pam_appl.h
index 8edf897dfe7e..5f44d79555d9 100644
--- a/include/security/pam_appl.h
+++ b/include/security/pam_appl.h
@@ -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_appl.h 913 2017-01-21 15:11:12Z des $
+ * $OpenPAM: pam_appl.h 938 2017-04-30 21:34:42Z des $
*/
#ifndef SECURITY_PAM_APPL_H_INCLUDED
@@ -72,8 +72,7 @@ pam_close_session(pam_handle_t *_pamh,
int
pam_end(pam_handle_t *_pamh,
- int _status)
- OPENPAM_NONNULL((1));
+ int _status);
int
pam_get_data(const pam_handle_t *_pamh,
diff --git a/include/security/pam_constants.h b/include/security/pam_constants.h
index ddd87ade41f6..a76dfecd2406 100644
--- a/include/security/pam_constants.h
+++ b/include/security/pam_constants.h
@@ -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_constants.h 648 2013-03-05 17:54:27Z des $
+ * $OpenPAM: pam_constants.h 938 2017-04-30 21:34:42Z des $
*/
#ifndef SECURITY_PAM_CONSTANTS_H_INCLUDED
@@ -78,6 +78,10 @@ enum {
PAM_TRY_AGAIN = 27,
PAM_MODULE_UNKNOWN = 28,
PAM_DOMAIN_UNKNOWN = 29,
+ PAM_BAD_HANDLE = 30, /* OpenPAM extension */
+ PAM_BAD_ITEM = 31, /* OpenPAM extension */
+ PAM_BAD_FEATURE = 32, /* OpenPAM extension */
+ PAM_BAD_CONSTANT = 33, /* OpenPAM extension */
PAM_NUM_ERRORS /* OpenPAM extension */
};
diff --git a/include/security/pam_modules.h b/include/security/pam_modules.h
index 7f1db465f039..a1e574515b55 100644
--- a/include/security/pam_modules.h
+++ b/include/security/pam_modules.h
@@ -32,7 +32,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: pam_modules.h 648 2013-03-05 17:54:27Z des $
+ * $OpenPAM: pam_modules.h 938 2017-04-30 21:34:42Z des $
*/
#ifndef SECURITY_PAM_MODULES_H_INCLUDED
diff --git a/include/security/pam_types.h b/include/security/pam_types.h
index fc834682a70c..fc5a06d6a4df 100644
--- a/include/security/pam_types.h
+++ b/include/security/pam_types.h
@@ -32,7 +32,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: pam_types.h 648 2013-03-05 17:54:27Z des $
+ * $OpenPAM: pam_types.h 938 2017-04-30 21:34:42Z des $
*/
#ifndef SECURITY_PAM_TYPES_H_INCLUDED
generated by cgit v1.3 (git 2.53.0) at 2026-09-06 14:45:44 +0000