From 210bf96cc952572b25335cef77532e8fda471ba7 Mon Sep 17 00:00:00 2001
From: Hasso Tepper <hasso@estpak.ee>
Date: Sat, 20 Dec 2008 03:56:54 +0200
Subject: [PATCH] Adapt to OpenPAM Hydrangea.

---
 lib/libpam/Makefile                | 2 +-
 lib/pam_module/pam_krb5/pam_krb5.c | 6 +++---
 lib/pam_module/pam_ssh/pam_ssh.c   | 4 ++--
 lib/pam_module/pam_unix/pam_unix.c | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/libpam/Makefile b/lib/libpam/Makefile
index 347daed478..a714afe05e 100644
--- a/lib/libpam/Makefile
+++ b/lib/libpam/Makefile
@@ -29,7 +29,7 @@ SRCS+=	pam_debug_log.c
 SRCS+=	${PATCHES}
 
 PAMINCS=	openpam.h openpam_version.h pam_appl.h pam_constants.h
-PAMINCS+=	pam_modules.h pam_types.h
+PAMINCS+=	pam_modules.h pam_types.h openpam_attr.h
 INCS=	${PAMINCS:S;^;${SRCDIR}/include/security/;} pam_mod_misc.h
 INCSDIR=	${INCLUDEDIR}/security
 
diff --git a/lib/pam_module/pam_krb5/pam_krb5.c b/lib/pam_module/pam_krb5/pam_krb5.c
index 59344f0f30..a30a877be0 100644
--- a/lib/pam_module/pam_krb5/pam_krb5.c
+++ b/lib/pam_module/pam_krb5/pam_krb5.c
@@ -105,7 +105,7 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags __unused,
 	krb5_get_init_creds_opt opts;
 	struct passwd *pwd;
 	int retval;
-	void *ccache_data;
+	const void *ccache_data;
 	const char *user, *pass;
 	const void *sourceuser, *service;
 	char *principal, *princ_name, *ccache_name, luser[32], *srvdup;
@@ -346,7 +346,7 @@ pam_sm_setcred(pam_handle_t *pamh, int flags,
 	int retval;
 	const char *cache_name, *q;
 	const void *user;
-	void *cache_data;
+	const void *cache_data;
 	char *cache_name_buf = NULL, *p;
 
 	uid_t euid;
@@ -588,7 +588,7 @@ pam_sm_acct_mgmt(pam_handle_t *pamh, int flags __unused,
 	krb5_principal princ;
 	int retval;
 	const void *user;
-	void *ccache_name;
+	const void *ccache_name;
 
 	retval = pam_get_item(pamh, PAM_USER, &user);
 	if (retval != PAM_SUCCESS)
diff --git a/lib/pam_module/pam_ssh/pam_ssh.c b/lib/pam_module/pam_ssh/pam_ssh.c
index 5740638c7b..007a04fe8f 100644
--- a/lib/pam_module/pam_ssh/pam_ssh.c
+++ b/lib/pam_module/pam_ssh/pam_ssh.c
@@ -305,7 +305,7 @@ static int
 pam_ssh_add_keys_to_agent(pam_handle_t *pamh)
 {
 	AuthenticationConnection *ac;
-	struct pam_ssh_key *psk;
+	const struct pam_ssh_key *psk;
 	const char **kfn;
 	char **envlist, **env;
 	int pam_err;
@@ -358,7 +358,7 @@ pam_sm_open_session(pam_handle_t *pamh, int flags __unused,
 {
 	struct passwd *pwd;
 	const char *user;
-	void *data;
+	const void *data;
 	int pam_err;
 
 	/* no keys, no work */
diff --git a/lib/pam_module/pam_unix/pam_unix.c b/lib/pam_module/pam_unix/pam_unix.c
index 7c0677975f..bd5e6dbff8 100644
--- a/lib/pam_module/pam_unix/pam_unix.c
+++ b/lib/pam_module/pam_unix/pam_unix.c
@@ -261,7 +261,7 @@ pam_sm_chauthtok(pam_handle_t *pamh, int flags,
 {
 #ifdef YP
 	struct ypclnt *ypclnt;
-	void *yp_domain, *yp_server;
+	const void *yp_domain, *yp_server;
 #endif
 	char salt[SALTSIZE + 1];
 	login_cap_t * lc;
-- 
2.41.0