From da5bb1e637ef5f5d1d320e239296e999c6910d33 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Tue, 2 Oct 2012 14:25:40 +0200 Subject: [PATCH 1/2] waf: Build pam_smbpass module only if enabled. (cherry picked from commit fb3cf6c24270d22dad8ac9a1c12e8d77c8189f11) Signed-off-by: Andreas Schneider --- source3/pam_smbpass/wscript_build | 3 ++- source3/wscript | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/source3/pam_smbpass/wscript_build b/source3/pam_smbpass/wscript_build index 70b21d5..a2a2d01 100644 --- a/source3/pam_smbpass/wscript_build +++ b/source3/pam_smbpass/wscript_build @@ -10,5 +10,6 @@ if bld.CONFIG_SET('WITH_PAM_MODULES'): LIBNTLMSSP LIBTSOCKET''', cflags='-DLOCALEDIR=\"%s/locale\"' % bld.env.DATADIR, realname='pam_smbpass.so', - install_path='${PAMMODULESDIR}' + install_path='${PAMMODULESDIR}', + enabled=bld.env.with_pam_smbpass ) diff --git a/source3/wscript b/source3/wscript index 18f84f8..2662edd 100644 --- a/source3/wscript +++ b/source3/wscript @@ -754,6 +754,9 @@ int i; i = PAM_RADIO_TYPE; conf.DEFINE('WITH_PAM', 1) conf.DEFINE('WITH_PAM_MODULES', 1) + if Options.options.with_pam_smbpass: + conf.env.with_pam_smbpass = True + seteuid = False # -- 1.7.12