Author: vlendec Date: 2006-05-06 20:05:43 +0000 (Sat, 06 May 2006) New Revision: 15477
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15477 Log: Committing parts of the patch Timur has submitted for bug 2961, as agreed upon on irc. Thanks, Volker Modified: branches/SAMBA_3_0/source/pam_smbpass/general.h branches/SAMBA_3_0/source/pam_smbpass/support.c trunk/source/pam_smbpass/general.h trunk/source/pam_smbpass/support.c Changeset: Modified: branches/SAMBA_3_0/source/pam_smbpass/general.h =================================================================== --- branches/SAMBA_3_0/source/pam_smbpass/general.h 2006-05-06 19:42:25 UTC (rev 15476) +++ branches/SAMBA_3_0/source/pam_smbpass/general.h 2006-05-06 20:05:43 UTC (rev 15477) @@ -50,10 +50,6 @@ #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) Modified: branches/SAMBA_3_0/source/pam_smbpass/support.c =================================================================== --- branches/SAMBA_3_0/source/pam_smbpass/support.c 2006-05-06 19:42:25 UTC (rev 15476) +++ branches/SAMBA_3_0/source/pam_smbpass/support.c 2006-05-06 20:05:43 UTC (rev 15477) @@ -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 @@ 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 @@ 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; Modified: trunk/source/pam_smbpass/general.h =================================================================== --- trunk/source/pam_smbpass/general.h 2006-05-06 19:42:25 UTC (rev 15476) +++ trunk/source/pam_smbpass/general.h 2006-05-06 20:05:43 UTC (rev 15477) @@ -50,10 +50,6 @@ #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) Modified: trunk/source/pam_smbpass/support.c =================================================================== --- trunk/source/pam_smbpass/support.c 2006-05-06 19:42:25 UTC (rev 15476) +++ trunk/source/pam_smbpass/support.c 2006-05-06 20:05:43 UTC (rev 15477) @@ -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 @@ 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 @@ 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;
