Committing parts of the patch Timur has submitted for bug 2961, as agreed upon

on irc.

Thanks,

Volker

git-svn-id: svn+ssh://svn.samba.org/data/svn/samba/branches/SAMBA_3_0@15477 0c0555d6-39d7-0310-84fc-f1cc0bd64818

diff --git a/source/pam_smbpass/general.h b/source/pam_smbpass/general.h
index 4f13d6013132eb1aae9469d764ea779dc4774f0b..f84c25444402788859345cd5213603fee91d8072 100644 (file)
--- a/source/pam_smbpass/general.h
+++ b/source/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/source/pam_smbpass/support.c b/source/pam_smbpass/support.c
index c318a5c3ed165edb3b001498d709505c7b126663..2ee43ffa1e16d54d731ea27644d1c0078d4c7858 100644 (file)
--- a/source/pam_smbpass/support.c
+++ b/source/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;