From: Volker Lendecke <vlendec@samba.org>
Date: Sat, 6 May 2006 20:05:43 +0000 (+0000)
Subject: r15477: Committing parts of the patch Timur has submitted for bug 2961, as agreed... 
X-Git-Tag: samba-4.0.0alpha6~801^2~8484
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fbc58eb455bd6f48725b0a817c28c8d5e02f69b4;p=thirdparty%2Fsamba.git

r15477: Committing parts of the patch Timur has submitted for bug 2961, as agreed upon
on irc.

Thanks,

Volker
(This used to be commit 51b415d2306f8244d7449756e4fa873adfc8fbe7)
---

diff --git a/source3/pam_smbpass/general.h b/source3/pam_smbpass/general.h
index 4f13d601313..f84c2544440 100644
--- a/source3/pam_smbpass/general.h
+++ b/source3/pam_smbpass/general.h
@@ -50,10 +50,6 @@ typedef struct {
 #define set(x,ctrl)   (ctrl = ((ctrl)&smb_args[x].mask)|smb_args[x].flag)
 #define unset(x,ctrl) (ctrl &= ~(smb_args[x].flag))
 
-#ifndef __linux__
-#define strncasecmp(s1,s2,n) StrnCaseCmp(s1,s2,n)
-#endif
-
 /* the generic mask */
 #define _ALL_ON_  (~0U)
 
diff --git a/source3/pam_smbpass/support.c b/source3/pam_smbpass/support.c
index c318a5c3ed1..2ee43ffa1e1 100644
--- a/source3/pam_smbpass/support.c
+++ b/source3/pam_smbpass/support.c
@@ -114,7 +114,7 @@
 			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;
 
@@ -515,7 +515,7 @@ int _smb_read_password( pam_handle_t * pamh, unsigned int ctrl,
     if (comment != NULL && off(SMB__QUIET, ctrl)) {
         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;
@@ -523,12 +523,12 @@ int _smb_read_password( pam_handle_t * pamh, unsigned int ctrl,
 
     pmsg[i] = &msg[i];
     msg[i].msg_style = PAM_PROMPT_ECHO_OFF;
-    msg[i++].msg = prompt1;
+    msg[i++].msg = CONST_DISCARD(char *, prompt1);
 
     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);
         expect = 2;
     } else
         expect = 1;