diff options
| author | Steve Langasek <vorlon@debian.org> | 2009-08-24 03:06:11 -0700 |
|---|---|---|
| committer | Steve Langasek <vorlon@debian.org> | 2019-01-08 21:25:43 -0800 |
| commit | 78915f5a06936cc24cf7776c8b53d08b6ea3616c (patch) | |
| tree | 6325216d4660f2a33d2161d71302b8c3f47c76e5 /libpam/include | |
| parent | fdd6439782a15a1abe342044e07e5f7501ae73de (diff) | |
| parent | 212b52cf29c06cc209bc8ac0540dbab1acdf1464 (diff) | |
| download | pam-78915f5a06936cc24cf7776c8b53d08b6ea3616c.tar.gz pam-78915f5a06936cc24cf7776c8b53d08b6ea3616c.tar.bz2 pam-78915f5a06936cc24cf7776c8b53d08b6ea3616c.zip | |
merge upstream version 1.1.0
Diffstat (limited to 'libpam/include')
| -rw-r--r-- | libpam/include/security/_pam_types.h | 1 | ||||
| -rw-r--r-- | libpam/include/security/pam_ext.h | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/libpam/include/security/_pam_types.h b/libpam/include/security/_pam_types.h index 2f7e807f..2d684bce 100644 --- a/libpam/include/security/_pam_types.h +++ b/libpam/include/security/_pam_types.h @@ -143,6 +143,7 @@ typedef struct pam_handle pam_handle_t; delays */ #define PAM_XDISPLAY 11 /* X display name */ #define PAM_XAUTHDATA 12 /* X server authentication data */ +#define PAM_AUTHTOK_TYPE 13 /* The type for pam_get_authtok */ /* -------------- Special defines used by Linux-PAM -------------- */ diff --git a/libpam/include/security/pam_ext.h b/libpam/include/security/pam_ext.h index 111dd633..26f7156c 100644 --- a/libpam/include/security/pam_ext.h +++ b/libpam/include/security/pam_ext.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005, 2006 Thorsten Kukuk. + * Copyright (C) 2005, 2006, 2008 Thorsten Kukuk. * * <security/pam_ext.h> * @@ -74,6 +74,9 @@ pam_prompt (pam_handle_t *pamh, int style, char **response, #define pam_info(pamh, fmt...) pam_prompt(pamh, PAM_TEXT_INFO, NULL, fmt) #define pam_vinfo(pamh, fmt, args) pam_vprompt(pamh, PAM_TEXT_INFO, NULL, fmt, args) +extern int PAM_NONNULL((1,3)) +pam_get_authtok (pam_handle_t *pamh, int item, const char **authtok, + const char *prompt); #ifdef __cplusplus } #endif |