summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2006-05-06 20:12:42 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:16:53 -0500
commit2e83035b8332889379127f3b4f123394eba2b7ba (patch)
tree1e628208fee02cbebf6cd9fc71bfad20aa6a24d3 /source3
parentfbc58eb455bd6f48725b0a817c28c8d5e02f69b4 (diff)
downloadsamba-2e83035b8332889379127f3b4f123394eba2b7ba.tar.gz
samba-2e83035b8332889379127f3b4f123394eba2b7ba.tar.bz2
samba-2e83035b8332889379127f3b4f123394eba2b7ba.zip
r15478: Likewise for bug # 3763
(This used to be commit 7188ec6bd81715c4df17528bca2b2e658173043f)
Diffstat (limited to 'source3')
-rw-r--r--source3/nsswitch/pam_winbind.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/nsswitch/pam_winbind.c b/source3/nsswitch/pam_winbind.c
index 3b42e404a4..239db5da5b 100644
--- a/source3/nsswitch/pam_winbind.c
+++ b/source3/nsswitch/pam_winbind.c
@@ -191,7 +191,7 @@ static int _make_remark(pam_handle_t * pamh, int type, const char *text)
struct pam_response *resp;
pmsg[0] = &msg[0];
- msg[0].msg = text;
+ msg[0].msg = CONST_DISCARD(char *, text);
msg[0].msg_style = type;
resp = NULL;
@@ -709,7 +709,7 @@ static int _winbind_read_password(pam_handle_t * pamh,
if (comment != NULL) {
pmsg[0] = &msg[0];
msg[0].msg_style = PAM_TEXT_INFO;
- msg[0].msg = comment;
+ msg[0].msg = CONST_DISCARD(char *, comment);
i = 1;
} else {
i = 0;
@@ -717,13 +717,13 @@ static int _winbind_read_password(pam_handle_t * pamh,
pmsg[i] = &msg[i];
msg[i].msg_style = PAM_PROMPT_ECHO_OFF;
- msg[i++].msg = prompt1;
+ msg[i++].msg = CONST_DISCARD(char *, prompt1);
replies = 1;
if (prompt2 != NULL) {
pmsg[i] = &msg[i];
msg[i].msg_style = PAM_PROMPT_ECHO_OFF;
- msg[i++].msg = prompt2;
+ msg[i++].msg = CONST_DISCARD(char *, prompt2);
++replies;
}
/* so call the conversation expecting i responses */