Adjust for OpenPAM Hydrangea.
This commit is contained in:
parent
df21757a45
commit
64dbe1a7af
@ -139,6 +139,7 @@ CFLAGS+= -DLIB_MAJ=${SHLIB_MAJOR}
|
|||||||
CFLAGS+= -DOPENPAM_MODULES_DIR='"${PAM_MOD_DIR:C/\/*$//}/"'
|
CFLAGS+= -DOPENPAM_MODULES_DIR='"${PAM_MOD_DIR:C/\/*$//}/"'
|
||||||
|
|
||||||
HEADERS= security/openpam.h \
|
HEADERS= security/openpam.h \
|
||||||
|
security/openpam_attr.h \
|
||||||
security/openpam_version.h \
|
security/openpam_version.h \
|
||||||
security/pam_appl.h \
|
security/pam_appl.h \
|
||||||
security/pam_constants.h \
|
security/pam_constants.h \
|
||||||
|
@ -106,7 +106,7 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags __unused,
|
|||||||
krb5_get_init_creds_opt opts;
|
krb5_get_init_creds_opt opts;
|
||||||
struct passwd *pwd;
|
struct passwd *pwd;
|
||||||
int retval;
|
int retval;
|
||||||
void *ccache_data;
|
const void *ccache_data;
|
||||||
const char *user, *pass;
|
const char *user, *pass;
|
||||||
const void *sourceuser, *service;
|
const void *sourceuser, *service;
|
||||||
char *principal, *princ_name, *ccache_name, luser[32], *srvdup;
|
char *principal, *princ_name, *ccache_name, luser[32], *srvdup;
|
||||||
@ -347,7 +347,7 @@ pam_sm_setcred(pam_handle_t *pamh, int flags,
|
|||||||
int retval;
|
int retval;
|
||||||
const char *cache_name, *q;
|
const char *cache_name, *q;
|
||||||
const void *user;
|
const void *user;
|
||||||
void *cache_data;
|
const void *cache_data;
|
||||||
char *cache_name_buf = NULL, *p;
|
char *cache_name_buf = NULL, *p;
|
||||||
|
|
||||||
uid_t euid;
|
uid_t euid;
|
||||||
@ -589,7 +589,7 @@ pam_sm_acct_mgmt(pam_handle_t *pamh, int flags __unused,
|
|||||||
krb5_principal princ;
|
krb5_principal princ;
|
||||||
int retval;
|
int retval;
|
||||||
const void *user;
|
const void *user;
|
||||||
void *ccache_name;
|
const void *ccache_name;
|
||||||
|
|
||||||
retval = pam_get_item(pamh, PAM_USER, &user);
|
retval = pam_get_item(pamh, PAM_USER, &user);
|
||||||
if (retval != PAM_SUCCESS)
|
if (retval != PAM_SUCCESS)
|
||||||
|
@ -306,9 +306,9 @@ static int
|
|||||||
pam_ssh_add_keys_to_agent(pam_handle_t *pamh)
|
pam_ssh_add_keys_to_agent(pam_handle_t *pamh)
|
||||||
{
|
{
|
||||||
AuthenticationConnection *ac;
|
AuthenticationConnection *ac;
|
||||||
struct pam_ssh_key *psk;
|
const struct pam_ssh_key *psk;
|
||||||
const char **kfn;
|
const char **kfn;
|
||||||
void *item;
|
const void *item;
|
||||||
char **envlist, **env;
|
char **envlist, **env;
|
||||||
int pam_err;
|
int pam_err;
|
||||||
|
|
||||||
@ -361,7 +361,7 @@ pam_sm_open_session(pam_handle_t *pamh, int flags __unused,
|
|||||||
{
|
{
|
||||||
struct passwd *pwd;
|
struct passwd *pwd;
|
||||||
const char *user;
|
const char *user;
|
||||||
void *data;
|
const void *data;
|
||||||
int pam_err;
|
int pam_err;
|
||||||
|
|
||||||
/* no keys, no work */
|
/* no keys, no work */
|
||||||
|
@ -268,7 +268,7 @@ pam_sm_chauthtok(pam_handle_t *pamh, int flags,
|
|||||||
{
|
{
|
||||||
#ifdef YP
|
#ifdef YP
|
||||||
struct ypclnt *ypclnt;
|
struct ypclnt *ypclnt;
|
||||||
void *yp_domain, *yp_server;
|
const void *yp_domain, *yp_server;
|
||||||
#endif
|
#endif
|
||||||
char salt[SALTSIZE + 1];
|
char salt[SALTSIZE + 1];
|
||||||
login_cap_t * lc;
|
login_cap_t * lc;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user