12 files changed, 25 insertions, 13 deletions
diff --git a/buildtools/wafsamba/samba_third_party.py b/buildtools/wafsamba/samba_third_party.py
index 3253f948b8b..9c894e4aed4 100644
--- a/buildtools/wafsamba/samba_third_party.py
+++ b/buildtools/wafsamba/samba_third_party.py
@@ -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
diff --git a/python/samba/tests/test_pam_winbind.sh b/python/samba/tests/test_pam_winbind.sh
index c535759885c..0406b108b31 100755
--- a/python/samba/tests/test_pam_winbind.sh
+++ b/python/samba/tests/test_pam_winbind.sh
@@ -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"
diff --git a/python/samba/tests/test_pam_winbind_warn_pwd_expire.sh b/python/samba/tests/test_pam_winbind_warn_pwd_expire.sh
index 305633d5a31..16dede44227 100755
--- a/python/samba/tests/test_pam_winbind_warn_pwd_expire.sh
+++ b/python/samba/tests/test_pam_winbind_warn_pwd_expire.sh
@@ -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"
diff --git a/lib/pam_wrapper/libpamtest.c b/third_party/pam_wrapper/libpamtest.c
index c0ab41dac8e..c0ab41dac8e 100644
--- a/lib/pam_wrapper/libpamtest.c
+++ b/third_party/pam_wrapper/libpamtest.c
diff --git a/lib/pam_wrapper/libpamtest.h b/third_party/pam_wrapper/libpamtest.h
index 0307a2663af..0307a2663af 100644
--- a/lib/pam_wrapper/libpamtest.h
+++ b/third_party/pam_wrapper/libpamtest.h
diff --git a/lib/pam_wrapper/pam_wrapper.c b/third_party/pam_wrapper/pam_wrapper.c
index 03584beb95e..2db9bcca889 100644
--- a/lib/pam_wrapper/pam_wrapper.c
+++ b/third_party/pam_wrapper/pam_wrapper.c
@@ -1456,7 +1456,7 @@ int pam_prompt(pam_handle_t *pamh,
 			       args);
 	va_end(args);
 
-	return rv;  
+	return rv;
 }
 
 #ifdef HAVE_PAM_STRERROR_CONST
diff --git a/lib/pam_wrapper/pwrap_compat.h b/third_party/pam_wrapper/pwrap_compat.h
index a30df15c61f..a30df15c61f 100644
--- a/lib/pam_wrapper/pwrap_compat.h
+++ b/third_party/pam_wrapper/pwrap_compat.h
diff --git a/lib/pam_wrapper/python/pypamtest.c b/third_party/pam_wrapper/python/pypamtest.c
index e25900f001b..e25900f001b 100644
--- a/lib/pam_wrapper/python/pypamtest.c
+++ b/third_party/pam_wrapper/python/pypamtest.c
diff --git a/lib/pam_wrapper/wscript b/third_party/pam_wrapper/wscript
index cfd8b4f9baf..75b4eec2314 100644
--- a/lib/pam_wrapper/wscript
+++ b/third_party/pam_wrapper/wscript
@@ -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)
diff --git a/third_party/wscript b/third_party/wscript
index 72f1daabcde..9a86dfe44e3 100644
--- a/third_party/wscript
+++ b/third_party/wscript
@@ -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')
diff --git a/wscript b/wscript
index 7dbaa90e773..b1671022be1 100644
--- a/wscript
+++ b/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)
diff --git a/wscript_build b/wscript_build
index b7ebaae630e..253f95f8bc0 100644
--- a/wscript_build
+++ b/wscript_build
@@ -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')