From 7d6ebe0de7d99c20854cafb8af50fe8f30ed778a Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Thu, 5 May 2011 16:19:49 -0700 Subject: More const fixes. Remove CONST_DISCARD. --- source3/pam_smbpass/support.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'source3/pam_smbpass') 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; -- cgit From 6552561b87ff5537d17ca82a85f7eb7943231241 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 31 May 2011 13:26:57 +1000 Subject: s3-build Don't allow undefined symbols in pam_smbpass.so --- source3/pam_smbpass/wscript_build | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/pam_smbpass') diff --git a/source3/pam_smbpass/wscript_build b/source3/pam_smbpass/wscript_build index 0d200c6fd2..8c15d71800 100644 --- a/source3/pam_smbpass/wscript_build +++ b/source3/pam_smbpass/wscript_build @@ -10,4 +10,5 @@ if bld.CONFIG_SET('WITH_PAM_MODULES'): LIBNTLMSSP LIBTSOCKET''', cflags='-DLOCALEDIR=\"%s/locale\"' % bld.env.DATADIR, realname='pam_smbpass.so', + allow_undefined_symbols=False ) -- cgit From b373d0e777df8770c24cfcc5cc80bf4808faa815 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 31 May 2011 13:18:37 +1000 Subject: s3-build: Provide a run-time shim to work around duplicate symbols The become_root() and similar 'smbd' functions that are used widely in Samba libraries had 'dummy' copies in dummysmbd.c and dummyroot.c. These have been replaced by a runtime plugin mechanim, which ensures that standlone binaries still do nothing, while in smbd the correct function is used. This avoids having these as duplicate symbols in the smbd binary, which can cause unpredictable behaviour. Andrew Bartlett Signed-off-by: Andrew Tridgell --- source3/pam_smbpass/wscript_build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/pam_smbpass') diff --git a/source3/pam_smbpass/wscript_build b/source3/pam_smbpass/wscript_build index 8c15d71800..200482c7cf 100644 --- a/source3/pam_smbpass/wscript_build +++ b/source3/pam_smbpass/wscript_build @@ -6,7 +6,7 @@ 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', -- cgit