diff options
author | Andrew G. Morgan <morgan@kernel.org> | 2000-11-19 23:54:01 +0000 |
---|---|---|
committer | Andrew G. Morgan <morgan@kernel.org> | 2000-11-19 23:54:01 +0000 |
commit | 73346dba777b023e46830a973148eb0ddbf8f8b4 (patch) | |
tree | 3ac12799a597cb2004f8ebf5b18a4469ccee9a44 /libpam/pam_private.h | |
parent | 47575925596c2af2a78c009fcdd14de72fc82d3e (diff) | |
download | pam-73346dba777b023e46830a973148eb0ddbf8f8b4.tar.gz pam-73346dba777b023e46830a973148eb0ddbf8f8b4.tar.bz2 pam-73346dba777b023e46830a973148eb0ddbf8f8b4.zip |
Relevant BUGIDs: task 15788, bugs 108297, 117476, 117474
Purpose of commit: autoconf support for Linux-PAM
Commit summary:
---------------
This is a merge of the autoconf support that was developed against
a 0-72 branch.
[Note, because CVS has some issues, this is actually only 95% of
the actual commit. The other files were actually committed when
the preparation branch Linux-PAM-0-73pre-autoconf was updated.
Hopefully, this will complete the merge.]
Diffstat (limited to 'libpam/pam_private.h')
-rw-r--r-- | libpam/pam_private.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/libpam/pam_private.h b/libpam/pam_private.h index 51660fd1..7b36fb02 100644 --- a/libpam/pam_private.h +++ b/libpam/pam_private.h @@ -10,14 +10,16 @@ * Please see end of file for copyright. * * Creator: Marc Ewing. - * Maintained: AGM + * Maintained: CVS */ #ifndef _PAM_PRIVATE_H #define _PAM_PRIVATE_H +#include <security/_pam_aconf.h> + /* this is not used at the moment --- AGM */ -#define LIBPAM_VERSION 67 +#define LIBPAM_VERSION (LIBPAM_VERSION_MAJOR*0x100 + LIBPAM_VERSION_MINOR) #include <security/pam_appl.h> #include <security/pam_modules.h> @@ -188,8 +190,6 @@ int _pam_make_env(pam_handle_t *pamh); /* delete the environment structure */ void _pam_drop_env(pam_handle_t *pamh); -#ifdef LINUX_PAM - /* these functions deal with failure delays as required by the authentication modules and application. Their *interface* is likely to remain the same although their function is hopefully going to @@ -204,9 +204,6 @@ void _pam_start_timer(pam_handle_t *pamh); /* this waits for the clock to stop ticking if status != PAM_SUCCESS */ void _pam_await_timer(pam_handle_t *pamh, int status); - -#endif /* LINUX_PAM */ - typedef void (*voidfunc(void))(void); #ifdef PAM_STATIC |