Attachment 526 Details for Bug 705 – Attempt to fix warnings on other platforms too

[patch] Attempt to fix warnings on other platforms too

openssh-pam-warn.patch (text/plain), 2.15 KB, created by Darren Tucker on 2004-01-08 06:40:16 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: Darren Tucker

Created: 2004-01-08 06:40:16 AEDT

Size: 2.15 KB

patch

obsolete

>Index: auth-pam.c
>===================================================================
>RCS file: /usr/local/src/security/openssh/cvs/openssh_cvs/auth-pam.c,v
>retrieving revision 1.88
>diff -u -p -r1.88 auth-pam.c
>--- auth-pam.c	8 Jan 2004 12:32:04 -0000	1.88
>+++ auth-pam.c	8 Jan 2004 13:34:39 -0000
>@@ -115,6 +115,12 @@ pthread_join(sp_pthread_t thread, void *
> #endif
> 
> 
>+#ifdef PAM_SUN_CODEBASE
>+# define sshpam_const
>+#else
>+# define sshpam_const   const
>+#endif
>+
> static pam_handle_t *sshpam_handle = NULL;
> static int sshpam_err = 0;
> static int sshpam_authenticated = 0;
>@@ -204,7 +210,7 @@ import_environments(Buffer *b)
>  * Conversation function for authentication thread.
>  */
> static int
>-sshpam_thread_conv(int n, const struct pam_message **msg,
>+sshpam_thread_conv(int n, sshpam_const struct pam_message **msg,
>     struct pam_response **resp, void *data)
> {
> 	Buffer buffer;
>@@ -297,7 +303,7 @@ sshpam_thread(void *ctxtp)
> 	u_int i;
> 	const char *pam_user;
> 
>-	pam_get_item(sshpam_handle, PAM_USER, (const void **)&pam_user);
>+	pam_get_item(sshpam_handle, PAM_USER, (sshpam_const void **)&pam_user);
> 	setproctitle("%s [pam]", pam_user);
> 	environ[0] = NULL;
> #endif
>@@ -381,7 +387,7 @@ sshpam_thread_cleanup(void)
> }
> 
> static int
>-sshpam_null_conv(int n, const struct pam_message **msg,
>+sshpam_null_conv(int n, sshpam_const struct pam_message **msg,
>     struct pam_response **resp, void *data)
> {
> 	return (PAM_CONV_ERR);
>@@ -395,7 +401,7 @@ sshpam_cleanup(void)
> 	debug("PAM: cleanup");
> 	if (sshpam_handle == NULL)
> 		return;
>-	pam_set_item(sshpam_handle, PAM_CONV, (const void *)&null_conv);
>+	pam_set_item(sshpam_handle, PAM_CONV, (sshpam_const void *)&null_conv);
> 	if (sshpam_cred_established) {
> 		pam_setcred(sshpam_handle, PAM_DELETE_CRED);
> 		sshpam_cred_established = 0;
>@@ -419,7 +425,7 @@ sshpam_init(const char *user)
> 	if (sshpam_handle != NULL) {
> 		/* We already have a PAM context; check if the user matches */
> 		sshpam_err = pam_get_item(sshpam_handle,
>-		    PAM_USER, (const void **)&pam_user);
>+		    PAM_USER, (sshpam_const void **)&pam_user);
> 		if (sshpam_err == PAM_SUCCESS && strcmp(user, pam_user) == 0)
> 			return (0);
> 		pam_end(sshpam_handle, sshpam_err);

Actions: View | Diff

Attachments on bug 705: 455 | 526 | 674