mirror of
https://github.com/samba-team/samba.git
synced 2024-12-22 13:34:15 +03:00
build: Move pam_wrapper to third_party
Signed-off-by: Andreas Schneider <asn@samba.org> Reviewed-by: Alexander Bokovoy <ab@samba.org>
This commit is contained in:
parent
6fbc8b810e
commit
8635465d77
@ -59,3 +59,8 @@ Build.BuildContext.CHECK_RESOLV_WRAPPER = CHECK_RESOLV_WRAPPER
|
||||
def CHECK_UID_WRAPPER(conf):
|
||||
return conf.CHECK_BUNDLED_SYSTEM_PKG('uid_wrapper', minversion='1.2.4')
|
||||
Build.BuildContext.CHECK_UID_WRAPPER = CHECK_UID_WRAPPER
|
||||
|
||||
@conf
|
||||
def CHECK_PAM_WRAPPER(conf):
|
||||
return conf.CHECK_BUNDLED_SYSTEM_PKG('pam_wrapper', minversion='1.0.4')
|
||||
Build.BuildContext.CHECK_PAM_WRAPPER = CHECK_PAM_WRAPPER
|
||||
|
@ -12,7 +12,7 @@ PASSWORD="$3"
|
||||
export PASSWORD
|
||||
shift 3
|
||||
|
||||
PAM_WRAPPER_PATH="$BINDIR/default/lib/pam_wrapper"
|
||||
PAM_WRAPPER_PATH="$BINDIR/default/third_party/pam_wrapper"
|
||||
|
||||
pam_winbind="$BINDIR/shared/pam_winbind.so"
|
||||
service_dir="$SELFTEST_TMPDIR/pam_services"
|
||||
|
@ -12,7 +12,7 @@ PASSWORD="$3"
|
||||
export PASSWORD
|
||||
shift 3
|
||||
|
||||
PAM_WRAPPER_PATH="$BINDIR/default/lib/pam_wrapper"
|
||||
PAM_WRAPPER_PATH="$BINDIR/default/third_party/pam_wrapper"
|
||||
|
||||
pam_winbind="$BINDIR/shared/pam_winbind.so"
|
||||
service_dir="$SELFTEST_TMPDIR/pam_services"
|
||||
|
@ -1456,7 +1456,7 @@ int pam_prompt(pam_handle_t *pamh,
|
||||
args);
|
||||
va_end(args);
|
||||
|
||||
return rv;
|
||||
return rv;
|
||||
}
|
||||
|
||||
#ifdef HAVE_PAM_STRERROR_CONST
|
@ -13,7 +13,7 @@ def find_library(library_names, lookup_paths):
|
||||
return ''
|
||||
|
||||
def configure(conf):
|
||||
if conf.CHECK_BUNDLED_SYSTEM('pam_wrapper', minversion=VERSION, set_target=False):
|
||||
if conf.CHECK_PAM_WRAPPER():
|
||||
conf.DEFINE('USING_SYSTEM_PAM_WRAPPER', 1)
|
||||
libpam_wrapper_so_path = 'libpam_wrapper.so'
|
||||
else:
|
||||
@ -93,7 +93,7 @@ def configure(conf):
|
||||
|
||||
# Create full path to pam_wrapper
|
||||
blddir = os.path.realpath(conf.blddir)
|
||||
libpam_wrapper_so_path = blddir + '/default/lib/pam_wrapper/libpam-wrapper.so'
|
||||
libpam_wrapper_so_path = blddir + '/default/third_party/pam_wrapper/libpam-wrapper.so'
|
||||
|
||||
conf.DEFINE('LIBPAM_WRAPPER_SO_PATH', libpam_wrapper_so_path)
|
||||
conf.DEFINE('PAM_WRAPPER', 1)
|
||||
@ -110,7 +110,8 @@ def build(bld):
|
||||
realname='libpam-wrapper.so')
|
||||
|
||||
# Can be used to write pam tests in python
|
||||
bld.SAMBA_PYTHON('pypamtest',
|
||||
source='python/pypamtest.c libpamtest.c',
|
||||
deps='dl pam',
|
||||
install=False)
|
||||
for env in bld.gen_python_environments():
|
||||
bld.SAMBA_PYTHON('pypamtest',
|
||||
source='python/pypamtest.c libpamtest.c',
|
||||
deps='dl pam',
|
||||
install=False)
|
5
third_party/wscript
vendored
5
third_party/wscript
vendored
@ -1,6 +1,7 @@
|
||||
#!/usr/bin/env python
|
||||
|
||||
import samba_git
|
||||
import Options
|
||||
import Utils
|
||||
import os
|
||||
import sys
|
||||
@ -56,6 +57,8 @@ def configure(conf):
|
||||
conf.RECURSE('nss_wrapper')
|
||||
conf.RECURSE('resolv_wrapper')
|
||||
conf.RECURSE('uid_wrapper')
|
||||
if Options.options.with_pam:
|
||||
conf.RECURSE('pam_wrapper')
|
||||
|
||||
|
||||
def build(bld):
|
||||
@ -88,3 +91,5 @@ def build(bld):
|
||||
bld.RECURSE('resolv_wrapper')
|
||||
if bld.CONFIG_GET('UID_WRAPPER'):
|
||||
bld.RECURSE('uid_wrapper')
|
||||
if bld.CONFIG_GET('PAM_WRAPPER'):
|
||||
bld.RECURSE('pam_wrapper')
|
||||
|
7
wscript
7
wscript
@ -176,6 +176,11 @@ def configure(conf):
|
||||
else:
|
||||
conf.define('USING_SYSTEM_UID_WRAPPER', 1)
|
||||
|
||||
if not conf.CHECK_PAM_WRAPPER():
|
||||
raise Utils.WafError('pam_wrapper package has not been found.\nIf third_party is installed, check that it is in the proper place.')
|
||||
else:
|
||||
conf.define('USING_SYSTEM_PAM_WRAPPER', 1)
|
||||
|
||||
conf.RECURSE('lib/ldb')
|
||||
|
||||
if not (Options.options.without_ad_dc):
|
||||
@ -204,8 +209,6 @@ def configure(conf):
|
||||
conf.RECURSE('lib/crypto')
|
||||
conf.RECURSE('pidl')
|
||||
if conf.CONFIG_GET('ENABLE_SELFTEST'):
|
||||
if Options.options.with_pam:
|
||||
conf.RECURSE('lib/pam_wrapper')
|
||||
if Options.options.with_ntvfs_fileserver != False:
|
||||
if not (Options.options.without_ad_dc):
|
||||
conf.DEFINE('WITH_NTVFS_FILESERVER', 1)
|
||||
|
@ -67,8 +67,6 @@ bld.RECURSE('source4/lib/messaging')
|
||||
bld.RECURSE('source4/lib/events')
|
||||
bld.RECURSE('source4/lib/cmdline')
|
||||
bld.RECURSE('source4/lib/http')
|
||||
if bld.CONFIG_GET('PAM_WRAPPER') and Options.options.with_pam:
|
||||
bld.RECURSE('lib/pam_wrapper')
|
||||
if bld.CHECK_FOR_THIRD_PARTY():
|
||||
bld.RECURSE('third_party')
|
||||
bld.RECURSE('source4/lib/stream')
|
||||
|
Loading…
Reference in New Issue
Block a user