build: Move pam_wrapper to third_party

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>

diff --git a/buildtools/wafsamba/samba_third_party.py b/buildtools/wafsamba/samba_third_party.py
index 3253f948b8b9687a06ed21747fb4b7d066a45e22..9c894e4aed430cd5da9d534fbc24448f72531775 100644 (file)
--- 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
 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 c535759885ccecdae2a5e307ecb2c2a7cddc8717..0406b108b3125ffbb5985cf408e07540d2e0eedb 100755 (executable)
--- 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
 
 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"
 
 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 305633d5a31b802f26e198b2feea52feaf569c31..16dede442270bb3297f1d6d0d3ee3e9720774c97 100755 (executable)
--- 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
 
 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"
 
 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
similarity index 100%
rename from lib/pam_wrapper/libpamtest.c
rename to third_party/pam_wrapper/libpamtest.c

diff --git a/lib/pam_wrapper/libpamtest.h b/third_party/pam_wrapper/libpamtest.h
similarity index 100%
rename from lib/pam_wrapper/libpamtest.h
rename to third_party/pam_wrapper/libpamtest.h

diff --git a/lib/pam_wrapper/pam_wrapper.c b/third_party/pam_wrapper/pam_wrapper.c
similarity index 99%
rename from lib/pam_wrapper/pam_wrapper.c
rename to third_party/pam_wrapper/pam_wrapper.c
index 03584beb95e33bac969f360ec82c5531df17ce25..2db9bcca889ad3725871e8a5d0bcb70ce7a545a1 100644 (file)
--- 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);
 
                               args);
        va_end(args);
 

-       return rv;  
+       return rv;

 }
 
 #ifdef HAVE_PAM_STRERROR_CONST
 }
 
 #ifdef HAVE_PAM_STRERROR_CONST

diff --git a/lib/pam_wrapper/pwrap_compat.h b/third_party/pam_wrapper/pwrap_compat.h
similarity index 100%
rename from lib/pam_wrapper/pwrap_compat.h
rename to third_party/pam_wrapper/pwrap_compat.h

diff --git a/lib/pam_wrapper/python/pypamtest.c b/third_party/pam_wrapper/python/pypamtest.c
similarity index 100%
rename from lib/pam_wrapper/python/pypamtest.c
rename to third_party/pam_wrapper/python/pypamtest.c

diff --git a/lib/pam_wrapper/wscript b/third_party/pam_wrapper/wscript
similarity index 91%
rename from lib/pam_wrapper/wscript
rename to third_party/pam_wrapper/wscript
index cfd8b4f9baf778c42ab7509c20dc474963d482a8..75b4eec231419fe0750a68e8b0340fa085700975 100644 (file)
--- 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):
     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:
         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)
 
         # 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)
 
     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
                           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 72f1daabcde35a42f19e68e37a462f469aad589a..9a86dfe44e3aedc896f8714240f576b1f83ec5b2 100644 (file)
--- a/third_party/wscript
+++ b/third_party/wscript
@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 
 import samba_git
 #!/usr/bin/env python
 
 import samba_git

+import Options

 import Utils
 import os
 import sys
 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')
         conf.RECURSE('nss_wrapper')
         conf.RECURSE('resolv_wrapper')
         conf.RECURSE('uid_wrapper')

+        if Options.options.with_pam:
+            conf.RECURSE('pam_wrapper')

 
 
 def build(bld):
 
 
 def build(bld):


@@ -88,3 +91,5 @@ def build(bld):
         bld.RECURSE('resolv_wrapper')
     if bld.CONFIG_GET('UID_WRAPPER'):
         bld.RECURSE('uid_wrapper')
         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 7dbaa90e7735bd5ad438c5c85c0cb60cd9b4b8eb..b1671022be19a38ad702e4e309ecbc8a334aa985 100644 (file)
--- a/wscript
+++ b/wscript
@@ -176,6 +176,11 @@ def configure(conf):
             else:
                 conf.define('USING_SYSTEM_UID_WRAPPER', 1)
 
             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):
     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'):
     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)
         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 b7ebaae630eb5be3a248b65d5c52a0dd29e78b63..253f95f8bc0cfb12276cb24a0c40d8b0f9a9ea48 100644 (file)
--- 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')
 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')
 if bld.CHECK_FOR_THIRD_PARTY():
     bld.RECURSE('third_party')
 bld.RECURSE('source4/lib/stream')