From: Amos Jeffries <squid3@treenet.co.nz>
Date: Tue, 4 May 2010 13:42:02 +0000 (+1200)
Subject: OpenSolaris: PAM conversation defined non-const
X-Git-Tag: SQUID_3_1_4~33
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=69dc3e187cc00ae7aeb75f80cfa2fec4f09ca18a;p=thirdparty%2Fsquid.git

OpenSolaris: PAM conversation defined non-const
---

diff --git a/helpers/basic_auth/PAM/pam_auth.c b/helpers/basic_auth/PAM/pam_auth.c
index 7ece95e86f..b0d4d40a07 100644
--- a/helpers/basic_auth/PAM/pam_auth.c
+++ b/helpers/basic_auth/PAM/pam_auth.c
@@ -100,7 +100,11 @@ static char *password = NULL;	/* Workaround for Solaris 2.6 brokenness */
  * expects a single converstation message of type PAM_PROMPT_ECHO_OFF.
  */
 static int
+#if _SQUID_SOLARIS_
+password_conversation(int num_msg, struct pam_message **msg, struct pam_response **resp, void *appdata_ptr)
+#else
 password_conversation(int num_msg, const struct pam_message **msg, struct pam_response **resp, void *appdata_ptr)
+#endif
 {
     if (num_msg != 1 || msg[0]->msg_style != PAM_PROMPT_ECHO_OFF) {
         fprintf(stderr, "ERROR: Unexpected PAM converstaion '%d/%s'\n", msg[0]->msg_style, msg[0]->msg);