diff options
Diffstat (limited to 'source3/pam_smbpass')
-rw-r--r-- | source3/pam_smbpass/support.c | 8 | ||||
-rw-r--r-- | source3/pam_smbpass/wscript_build | 3 |
2 files changed, 6 insertions, 5 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; diff --git a/source3/pam_smbpass/wscript_build b/source3/pam_smbpass/wscript_build index 0d200c6fd2..200482c7cf 100644 --- a/source3/pam_smbpass/wscript_build +++ b/source3/pam_smbpass/wscript_build @@ -6,8 +6,9 @@ if bld.CONFIG_SET('WITH_PAM_MODULES'): pam_smb_passwd.c pam_smb_acct.c support.c''', - deps='''tdb talloc pam PAM_ERRORS wbclient cap asn1util param LIB_NONSMBD passdb SMBLDAP + deps='''tdb talloc pam PAM_ERRORS wbclient cap asn1util param passdb SMBLDAP LIBNTLMSSP LIBTSOCKET''', cflags='-DLOCALEDIR=\"%s/locale\"' % bld.env.DATADIR, realname='pam_smbpass.so', + allow_undefined_symbols=False ) |