Attachment 7474 Details for Bug 8888 – Fix winbind compiler warnings

[patch] Fix winbind compiler warnings

0001-pam_winbind-Fix-compiler-warnings.patch (text/plain), 2.42 KB, created by Stef walter on 2012-04-23 13:45:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stef walter

Created: 2012-04-23 13:45:24 UTC

Size: 2.42 KB

patch

obsolete

>From 6a194623fe8205e10f80eb3b1410adcaca7bd4aa Mon Sep 17 00:00:00 2001
>From: Stef Walter <stefw@gnome.org>
>Date: Mon, 23 Apr 2012 15:40:13 +0200
>Subject: [PATCH] pam_winbind: Fix compiler warnings
>
>http://bugzilla.samba.org/show_bug.cgi?id=8888
>---
> nsswitch/pam_winbind.c |   17 ++++++++++-------
> 1 file changed, 10 insertions(+), 7 deletions(-)
>
>diff --git a/nsswitch/pam_winbind.c b/nsswitch/pam_winbind.c
>index 831fa84..05df027 100644
>--- a/nsswitch/pam_winbind.c
>+++ b/nsswitch/pam_winbind.c
>@@ -639,7 +639,7 @@ static const char *_get_ntstatus_error_string(const char *nt_status_string)
> 
> static int converse(const pam_handle_t *pamh,
> 		    int nargs,
>-		    struct pam_message **message,
>+		    const struct pam_message **message,
> 		    struct pam_response **response)
> {
> 	int retval;
>@@ -662,7 +662,8 @@ static int _make_remark(struct pwb_context *ctx,
> {
> 	int retval = PAM_SUCCESS;
> 
>-	struct pam_message *pmsg[1], msg[1];
>+	const struct pam_message *pmsg[1];
>+	struct pam_message msg[1];
> 	struct pam_response *resp;
> 
> 	if (ctx->flags & WINBIND_SILENT) {
>@@ -810,7 +811,8 @@ static int wbc_auth_error_to_pam_error(struct pwb_context *ctx,
> #if defined(HAVE_PAM_RADIO_TYPE)
> static bool _pam_winbind_change_pwd(struct pwb_context *ctx)
> {
>-	struct pam_message msg, *pmsg;
>+	struct pam_message msg;
>+	const struct pam_message *pmsg;
> 	struct pam_response *resp = NULL;
> 	const char *prompt;
> 	int ret;
>@@ -1985,7 +1987,7 @@ static int winbind_chauthtok_request(struct pwb_context *ctx,
> 		}
> 
> 		/* FIXME: avoid to send multiple PAM messages after another */
>-		switch (reject_reason) {
>+		switch ((int)reject_reason) {
> 			case -1:
> 				break;
> 			case WBC_PWD_CHANGE_NO_ERROR:
>@@ -2146,7 +2148,8 @@ static int _winbind_read_password(struct pwb_context *ctx,
> 	 */
> 
> 	{
>-		struct pam_message msg[3], *pmsg[3];
>+		struct pam_message msg[3];
>+		const struct pam_message *pmsg[3];
> 		struct pam_response *resp;
> 		int i, replies;
> 
>@@ -2798,7 +2801,7 @@ int pam_sm_acct_mgmt(pam_handle_t *pamh, int flags,
> {
> 	const char *username;
> 	int ret = PAM_USER_UNKNOWN;
>-	void *tmp = NULL;
>+	const void *tmp = NULL;
> 	struct pwb_context *ctx = NULL;
> 
> 	ret = _pam_winbind_init_context(pamh, flags, argc, argv, &ctx);
>@@ -2997,7 +3000,7 @@ int pam_sm_chauthtok(pam_handle_t * pamh, int flags,
> 
> 	/* <DO NOT free() THESE> */
> 	const char *user;
>-	char *pass_old, *pass_new;
>+	const char *pass_old, *pass_new;
> 	/* </DO NOT free() THESE> */
> 
> 	char *Announce;
>-- 
>1.7.10
>

Actions: View

Attachments on bug 8888: 7474