diff options
| author | Jeremy Allison <jra@samba.org> | 2011-05-05 16:19:49 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2011-05-06 01:44:07 +0200 |
| commit | 7d6ebe0de7d99c20854cafb8af50fe8f30ed778a (patch) | |
| tree | 718a3cfdae0a8c6db47245d028bd043c4df0c09e /source3/pam_smbpass | |
| parent | 76f5a39c7f165c656cdc9db29bfa0df59514fceb (diff) | |
| download | samba-7d6ebe0de7d99c20854cafb8af50fe8f30ed778a.tar.gz samba-7d6ebe0de7d99c20854cafb8af50fe8f30ed778a.tar.bz2 samba-7d6ebe0de7d99c20854cafb8af50fe8f30ed778a.zip | |
More const fixes. Remove CONST_DISCARD.
Diffstat (limited to 'source3/pam_smbpass')
| -rw-r--r-- | source3/pam_smbpass/support.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/pam_smbpass/support.c b/source3/pam_smbpass/support.c index 79f92a8758..3dfdff3c02 100644 --- a/source3/pam_smbpass/support.c +++ b/source3/pam_smbpass/support.c @@ -150,7 +150,7 @@ int make_remark( pam_handle_t * pamh, unsigned int ctrl struct pam_response *resp; pmsg[0] = &msg[0]; - msg[0].msg = CONST_DISCARD(char *, text); + msg[0].msg = discard_const_p(char, text); msg[0].msg_style = type; resp = NULL; @@ -550,7 +550,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 = CONST_DISCARD(char *, comment); + msg[0].msg = discard_const_p(char, comment); i = 1; } else { i = 0; @@ -558,12 +558,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 = CONST_DISCARD(char *, prompt1); + msg[i++].msg = discard_const_p(char, prompt1); if (prompt2 != NULL) { pmsg[i] = &msg[i]; msg[i].msg_style = PAM_PROMPT_ECHO_OFF; - msg[i++].msg = CONST_DISCARD(char *, prompt2); + msg[i++].msg = discard_const_p(char, prompt2); expect = 2; } else expect = 1; |