s4:rpc_server: only pass dcesrv_auth to auth_state.session_key_fn()

[samba.git] / wscript

diff --git a/wscript b/wscript
index 23f94798c51a5a0d30bc9c4949b4cdc830daa9e1..e38a8e9aecfd41f3330cf9db8bd3086fc76ba7f9 100644 (file)
--- a/wscript
+++ b/wscript
@@ -1,21 +1,22 @@
 #!/usr/bin/env python
 
 #!/usr/bin/env python
 

-srcdir = '.'
-blddir = 'bin'
+top = '.'
+out = 'bin'

 
 APPNAME='samba'
 VERSION=None
 
 import sys, os, tempfile
 
 APPNAME='samba'
 VERSION=None
 
 import sys, os, tempfile

-sys.path.insert(0, srcdir+"/buildtools/wafsamba")
-import wafsamba, Options, samba_dist, Scripting, Utils, samba_version
-
+sys.path.insert(0, top+"/buildtools/wafsamba")
+import shutil
+import wafsamba, samba_dist, samba_git, samba_version, samba_utils
+from waflib import Options, Scripting, Logs, Context, Errors

 
 samba_dist.DIST_DIRS('.')
 samba_dist.DIST_BLACKLIST('.gitignore .bzrignore source4/selftest/provisions')
 
 # install in /usr/local/samba by default
 
 samba_dist.DIST_DIRS('.')
 samba_dist.DIST_BLACKLIST('.gitignore .bzrignore source4/selftest/provisions')
 
 # install in /usr/local/samba by default

-Options.default_prefix = '/usr/local/samba'
+default_prefix = Options.default_prefix = '/usr/local/samba'

 
 # This callback optionally takes a list of paths as arguments:
 # --with-system_mitkrb5 /path/to/krb5 /another/path
 
 # This callback optionally takes a list of paths as arguments:
 # --with-system_mitkrb5 /path/to/krb5 /another/path


@@ -31,29 +32,63 @@ def system_mitkrb5_callback(option, opt, value, parser):
         del parser.rargs[:len(value)]
         setattr(parser.values, option.dest, value)
 
         del parser.rargs[:len(value)]
         setattr(parser.values, option.dest, value)
 

-def set_options(opt):
+def options(opt):

     opt.BUILTIN_DEFAULT('NONE')
     opt.PRIVATE_EXTENSION_DEFAULT('samba4')
     opt.RECURSE('lib/replace')
     opt.RECURSE('dynconfig')
     opt.BUILTIN_DEFAULT('NONE')
     opt.PRIVATE_EXTENSION_DEFAULT('samba4')
     opt.RECURSE('lib/replace')
     opt.RECURSE('dynconfig')

+    opt.RECURSE('packaging')

     opt.RECURSE('lib/ldb')
     opt.RECURSE('lib/ldb')

-    opt.RECURSE('lib/ntdb')

     opt.RECURSE('selftest')
     opt.RECURSE('source4/lib/tls')
     opt.RECURSE('selftest')
     opt.RECURSE('source4/lib/tls')

+    opt.RECURSE('source4/dsdb/samdb/ldb_modules')

     opt.RECURSE('pidl')
     opt.RECURSE('source3')
     opt.RECURSE('lib/util')
     opt.RECURSE('pidl')
     opt.RECURSE('source3')
     opt.RECURSE('lib/util')

+    opt.RECURSE('lib/crypto')

     opt.RECURSE('ctdb')
 
     opt.RECURSE('ctdb')
 

+
+    opt.samba_add_onoff_option('pthreadpool', with_name="enable", without_name="disable", default=True)
+

     opt.add_option('--with-system-mitkrb5',
     opt.add_option('--with-system-mitkrb5',

-                   help='enable system MIT krb5 build (includes Samba 4 client and Samba 3 code base).'+
+                   help='build Samba with system MIT Kerberos. ' +

                         'You may specify list of paths where Kerberos is installed (e.g. /usr/local /usr/kerberos) to search krb5-config',
                    action='callback', callback=system_mitkrb5_callback, dest='with_system_mitkrb5', default=False)
 
                         'You may specify list of paths where Kerberos is installed (e.g. /usr/local /usr/kerberos) to search krb5-config',
                    action='callback', callback=system_mitkrb5_callback, dest='with_system_mitkrb5', default=False)
 

+    opt.add_option('--with-experimental-mit-ad-dc',
+                   help='Enable the experimental MIT Kerberos-backed AD DC.  ' +
+                   'Note that security patches are not issued for this configuration',
+                   action='store_true',
+                   dest='with_experimental_mit_ad_dc',
+                   default=False)
+
+    opt.add_option('--with-system-mitkdc',
+                   help=('Specify the path to the krb5kdc binary from MIT Kerberos'),
+                   type="string",
+                   dest='with_system_mitkdc',
+                   default=None)
+
+    opt.add_option('--with-system-heimdalkrb5',
+                   help=('build Samba with system Heimdal Kerberos. ' +
+                         'Requires --without-ad-dc' and
+                         'conflicts with --with-system-mitkrb5'),
+                   action='store_true',
+                   dest='with_system_heimdalkrb5',
+                   default=False)
+

     opt.add_option('--without-ad-dc',
     opt.add_option('--without-ad-dc',

-                   help='disable AD DC functionality (enables Samba 4 client and Samba 3 code base).',
+                   help='disable AD DC functionality (enables only Samba FS (File Server, Winbind, NMBD) and client utilities.',

                    action='store_true', dest='without_ad_dc', default=False)
 
                    action='store_true', dest='without_ad_dc', default=False)
 

+    opt.add_option('--with-ntvfs-fileserver',
+                   help='enable the deprecated NTVFS file server from the original Samba4 branch (default if --enable-selftest specified).  Conflicts with --with-system-mitkrb5 and --without-ad-dc',
+                   action='store_true', dest='with_ntvfs_fileserver')
+
+    opt.add_option('--without-ntvfs-fileserver',
+                   help='disable the deprecated NTVFS file server from the original Samba4 branch',
+                   action='store_false', dest='with_ntvfs_fileserver')
+

     opt.add_option('--with-pie',
                   help=("Build Position Independent Executables " +
                         "(default if supported by compiler)"),
     opt.add_option('--with-pie',
                   help=("Build Position Independent Executables " +
                         "(default if supported by compiler)"),


@@ -70,19 +105,18 @@ def set_options(opt):
                   help=("Disable RELRO builds"),
                   action="store_false", dest='enable_relro')
 
                   help=("Disable RELRO builds"),
                   action="store_false", dest='enable_relro')
 

-    opt.add_option('--with-systemd',
-                   help=("Enable systemd integration"),
-                   action='store_true', dest='enable_systemd')
-
-    opt.add_option('--without-systemd',
-                   help=("Disable systemd integration"),
-                   action='store_false', dest='enable_systemd')
-

     gr = opt.option_group('developer options')
 
     gr = opt.option_group('developer options')
 

-    opt.tool_options('python') # options for disabling pyc or pyo compilation
+    opt.load('python') # options for disabling pyc or pyo compilation

     # enable options related to building python extensions
 
     # enable options related to building python extensions
 

+    opt.add_option('--with-json',
+                   action='store_true', dest='with_json',
+                   help=("Build with JSON support (default=True). This "
+                         "requires the jansson development headers."))
+    opt.add_option('--without-json',
+                   action='store_false', dest='with_json',
+                   help=("Build without JSON support."))

 
 def configure(conf):
     version = samba_version.load_version(env=conf.env)
 
 def configure(conf):
     version = samba_version.load_version(env=conf.env)


@@ -94,17 +128,31 @@ def configure(conf):
     if Options.options.developer:
         conf.ADD_CFLAGS('-DDEVELOPER -DDEBUG_PASSWORD')
         conf.env.DEVELOPER = True
     if Options.options.developer:
         conf.ADD_CFLAGS('-DDEVELOPER -DDEBUG_PASSWORD')
         conf.env.DEVELOPER = True

+        # if we are in a git tree without a pre-commit hook, install a
+        # simple default.
+        pre_commit_hook = os.path.join(Context.g_module.top, '.git/hooks/pre-commit')
+        if (os.path.isdir(os.path.dirname(pre_commit_hook)) and
+            not os.path.exists(pre_commit_hook)):
+            shutil.copy(os.path.join(Context.g_module.top, 'script/git-hooks/pre-commit-hook'),
+                        pre_commit_hook)

 
     conf.ADD_EXTRA_INCLUDES('#include/public #source4 #lib #source4/lib #source4/include #include #lib/replace')
 
     conf.env.replace_add_global_pthread = True
     conf.RECURSE('lib/replace')
 
 
     conf.ADD_EXTRA_INCLUDES('#include/public #source4 #lib #source4/lib #source4/include #include #lib/replace')
 
     conf.env.replace_add_global_pthread = True
     conf.RECURSE('lib/replace')
 

+    conf.RECURSE('examples/fuse')
+    conf.RECURSE('examples/winexe')
+

     conf.SAMBA_CHECK_PERL(mandatory=True)
     conf.find_program('xsltproc', var='XSLTPROC')
 
     conf.SAMBA_CHECK_PERL(mandatory=True)
     conf.find_program('xsltproc', var='XSLTPROC')
 

+    if conf.env.disable_python:
+        if not (Options.options.without_ad_dc):
+            raise Errors.WafError('--disable-python requires --without-ad-dc')
+

     conf.SAMBA_CHECK_PYTHON(mandatory=True, version=(2, 6, 0))
     conf.SAMBA_CHECK_PYTHON(mandatory=True, version=(2, 6, 0))

-    conf.SAMBA_CHECK_PYTHON_HEADERS(mandatory=True)
+    conf.SAMBA_CHECK_PYTHON_HEADERS(mandatory=(not conf.env.disable_python))

 
     if sys.platform == 'darwin' and not conf.env['HAVE_ENVIRON_DECL']:
         # Mac OSX needs to have this and it's also needed that the python is compiled with this
 
     if sys.platform == 'darwin' and not conf.env['HAVE_ENVIRON_DECL']:
         # Mac OSX needs to have this and it's also needed that the python is compiled with this


@@ -112,36 +160,93 @@ def configure(conf):
         if not conf.CHECK_SHLIB_W_PYTHON("Checking if -fno-common is needed"):
             conf.ADD_CFLAGS('-fno-common')
         if not conf.CHECK_SHLIB_W_PYTHON("Checking if -undefined dynamic_lookup is not need"):
         if not conf.CHECK_SHLIB_W_PYTHON("Checking if -fno-common is needed"):
             conf.ADD_CFLAGS('-fno-common')
         if not conf.CHECK_SHLIB_W_PYTHON("Checking if -undefined dynamic_lookup is not need"):

-            conf.env.append_value('shlib_LINKFLAGS', ['-undefined', 'dynamic_lookup'])
+            conf.env.append_value('cshlib_LINKFLAGS', ['-undefined', 'dynamic_lookup'])

 
     if sys.platform == 'darwin':
         conf.ADD_LDFLAGS('-framework CoreFoundation')
 
 
     if sys.platform == 'darwin':
         conf.ADD_LDFLAGS('-framework CoreFoundation')
 

-    if int(conf.env['PYTHON_VERSION'][0]) >= 3:
-        raise Utils.WafError('Python version 3.x is not supported by Samba yet')
-

     conf.RECURSE('dynconfig')
     conf.RECURSE('dynconfig')

+    conf.RECURSE('selftest')

 
     if conf.CHECK_FOR_THIRD_PARTY():
 
     if conf.CHECK_FOR_THIRD_PARTY():

-        conf.RECURSE('third_party/zlib')
-        conf.RECURSE('third_party/popt')
+        conf.RECURSE('third_party')

     else:
         if not conf.CHECK_ZLIB():
     else:
         if not conf.CHECK_ZLIB():

-            raise Utils.WafError('zlib development packages have not been found.\nIf third_party is installed, check that it is in the proper place.')
+            raise Errors.WafError('zlib development packages have not been found.\nIf third_party is installed, check that it is in the proper place.')

         else:
             conf.define('USING_SYSTEM_ZLIB',1)
 
         if not conf.CHECK_POPT():
         else:
             conf.define('USING_SYSTEM_ZLIB',1)
 
         if not conf.CHECK_POPT():

-            raise Utils.WafError('popt development packages have not been found.\nIf third_party is installed, check that it is in the proper place.')
+            raise Errors.WafError('popt development packages have not been found.\nIf third_party is installed, check that it is in the proper place.')

         else:
             conf.define('USING_SYSTEM_POPT', 1)
 
         else:
             conf.define('USING_SYSTEM_POPT', 1)
 

+        if not conf.CHECK_CMOCKA():
+            raise Errors.WafError('cmocka development packages has not been found.\nIf third_party is installed, check that it is in the proper place.')
+        else:
+            conf.define('USING_SYSTEM_CMOCKA', 1)
+
+        if conf.CONFIG_GET('ENABLE_SELFTEST'):
+            if not conf.CHECK_SOCKET_WRAPPER():
+                raise Errors.WafError('socket_wrapper package has not been found.\nIf third_party is installed, check that it is in the proper place.')
+            else:
+                conf.define('USING_SYSTEM_SOCKET_WRAPPER', 1)
+
+            if not conf.CHECK_NSS_WRAPPER():
+                raise Errors.WafError('nss_wrapper package has not been found.\nIf third_party is installed, check that it is in the proper place.')
+            else:
+                conf.define('USING_SYSTEM_NSS_WRAPPER', 1)
+
+            if not conf.CHECK_RESOLV_WRAPPER():
+                raise Errors.WafError('resolv_wrapper package has not been found.\nIf third_party is installed, check that it is in the proper place.')
+            else:
+                conf.define('USING_SYSTEM_RESOLV_WRAPPER', 1)
+
+            if not conf.CHECK_UID_WRAPPER():
+                raise Errors.WafError('uid_wrapper package has not been found.\nIf third_party is installed, check that it is in the proper place.')
+            else:
+                conf.define('USING_SYSTEM_UID_WRAPPER', 1)
+
+            if not conf.CHECK_PAM_WRAPPER():
+                raise Errors.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')
 
     conf.RECURSE('lib/ldb')
 

+    if conf.CHECK_LDFLAGS(['-Wl,--wrap=test']):
+        conf.env['HAVE_LDWRAP'] = True
+        conf.define('HAVE_LDWRAP', 1)
+
+    if not (Options.options.without_ad_dc):
+        conf.DEFINE('AD_DC_BUILD_IS_ENABLED', 1)
+

     if Options.options.with_system_mitkrb5:
     if Options.options.with_system_mitkrb5:

+        if not Options.options.with_experimental_mit_ad_dc and \
+           not Options.options.without_ad_dc:
+            raise Errors.WafError('The MIT Kerberos build of Samba as an AD DC ' +
+                                  'is experimental. Therefore '
+                                  '--with-system-mitkrb5 requires either ' +
+                                  '--with-experimental-mit-ad-dc or ' +
+                                  '--without-ad-dc')
+

         conf.PROCESS_SEPARATE_RULE('system_mitkrb5')
         conf.PROCESS_SEPARATE_RULE('system_mitkrb5')

+

     if not (Options.options.without_ad_dc or Options.options.with_system_mitkrb5):
         conf.DEFINE('AD_DC_BUILD_IS_ENABLED', 1)
     if not (Options.options.without_ad_dc or Options.options.with_system_mitkrb5):
         conf.DEFINE('AD_DC_BUILD_IS_ENABLED', 1)

+
+    if Options.options.with_system_heimdalkrb5:
+        if Options.options.with_system_mitkrb5:
+            raise Errors.WafError('--with-system-heimdalkrb5 conflicts with ' +
+                                  '--with-system-mitkrb5')
+        if not Options.options.without_ad_dc:
+            raise Errors.WafError('--with-system-heimdalkrb5 requires ' +
+                                  '--without-ad-dc')
+        conf.env.SYSTEM_LIBS += ('heimdal', 'asn1', 'com_err', 'roken',
+                                 'hx509', 'wind', 'gssapi', 'hcrypto',
+                                 'krb5', 'heimbase', 'asn1_compile',
+                                 'compile_et', 'kdc', 'hdb', 'heimntlm')
+

     # Only process heimdal_build for non-MIT KRB5 builds
     # When MIT KRB5 checks are done as above, conf.env.KRB5_VENDOR will be set
     # to the lowcased output of 'krb5-config --vendor'.
     # Only process heimdal_build for non-MIT KRB5 builds
     # When MIT KRB5 checks are done as above, conf.env.KRB5_VENDOR will be set
     # to the lowcased output of 'krb5-config --vendor'.


@@ -150,26 +255,66 @@ def configure(conf):
     if conf.CONFIG_GET('KRB5_VENDOR') in (None, 'heimdal'):
         conf.RECURSE('source4/heimdal_build')
     conf.RECURSE('source4/lib/tls')
     if conf.CONFIG_GET('KRB5_VENDOR') in (None, 'heimdal'):
         conf.RECURSE('source4/heimdal_build')
     conf.RECURSE('source4/lib/tls')

+    conf.RECURSE('source4/dsdb/samdb/ldb_modules')

     conf.RECURSE('source4/ntvfs/sysdep')
     conf.RECURSE('lib/util')
     conf.RECURSE('source4/ntvfs/sysdep')
     conf.RECURSE('lib/util')

-    conf.RECURSE('lib/ccan')
-    conf.RECURSE('lib/ntdb')

     conf.RECURSE('lib/util/charset')
     conf.RECURSE('source4/auth')
     conf.RECURSE('nsswitch')
     conf.RECURSE('libcli/smbreadline')
     conf.RECURSE('lib/crypto')
     conf.RECURSE('pidl')
     conf.RECURSE('lib/util/charset')
     conf.RECURSE('source4/auth')
     conf.RECURSE('nsswitch')
     conf.RECURSE('libcli/smbreadline')
     conf.RECURSE('lib/crypto')
     conf.RECURSE('pidl')

-    conf.RECURSE('selftest')

     if conf.CONFIG_GET('ENABLE_SELFTEST'):
     if conf.CONFIG_GET('ENABLE_SELFTEST'):

-        conf.RECURSE('lib/nss_wrapper')
-        conf.RECURSE('lib/resolv_wrapper')
-        conf.RECURSE('lib/socket_wrapper')
-        conf.RECURSE('lib/uid_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):
+                raise Errors.WafError('--without-ntvfs-fileserver conflicts with --enable-selftest while building the AD DC')
+        conf.RECURSE('testsuite/unittests')
+
+    if Options.options.with_ntvfs_fileserver == True:
+        if Options.options.without_ad_dc:
+            raise Errors.WafError('--with-ntvfs-fileserver conflicts with --without-ad-dc')
+        conf.DEFINE('WITH_NTVFS_FILESERVER', 1)
+
+    if Options.options.with_pthreadpool:
+        if conf.CONFIG_SET('HAVE_PTHREAD'):
+            conf.DEFINE('WITH_PTHREADPOOL', '1')
+        else:
+            Logs.warn("pthreadpool support cannot be enabled when pthread support was not found")
+            conf.undefine('WITH_PTHREADPOOL')
+
+    conf.SET_TARGET_TYPE('jansson', 'EMPTY')
+
+    if Options.options.with_json != False:
+        if conf.CHECK_CFG(package='jansson', args='--cflags --libs',
+                          msg='Checking for jansson'):
+            conf.CHECK_FUNCS_IN('json_object', 'jansson')
+
+    if not conf.CONFIG_GET('HAVE_JSON_OBJECT'):
+        if Options.options.with_json != False:
+            conf.fatal("Jansson JSON support not found. "
+                       "Try installing libjansson-dev or jansson-devel. "
+                       "Otherwise, use --without-json to build without "
+                       "JSON support. "
+                       "JSON support is required for the JSON "
+                       "formatted audit log feature, the AD DC, and "
+                       "the JSON printers of the net utility")
+        if not Options.options.without_ad_dc:
+            raise Errors.WafError('--without-json requires --without-ad-dc. '
+                                 'Jansson JSON library is required for '
+                                 'building the AD DC')
+        Logs.info("Building without Jansson JSON log support")
+

     conf.RECURSE('source3')
     conf.RECURSE('lib/texpect')
     conf.RECURSE('source3')
     conf.RECURSE('lib/texpect')

+    conf.RECURSE('python')

     if conf.env.with_ctdb:
         conf.RECURSE('ctdb')
     if conf.env.with_ctdb:
         conf.RECURSE('ctdb')

+    conf.RECURSE('lib/socket')
+    conf.RECURSE('lib/mscat')
+    conf.RECURSE('packaging')

 
     conf.SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS()
 
 
     conf.SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS()
 


@@ -178,22 +323,16 @@ def configure(conf):
     # allows us to find problems on our development hosts faster.
     # It also results in faster load time.
 
     # allows us to find problems on our development hosts faster.
     # It also results in faster load time.
 

-    if not sys.platform.startswith("openbsd"):
-        conf.env.asneeded_ldflags = conf.ADD_LDFLAGS('-Wl,--as-needed', testflags=True)
+    conf.env.asneeded_ldflags = conf.ADD_LDFLAGS('-Wl,--as-needed', testflags=True)

 
     if not conf.CHECK_NEED_LC("-lc not needed"):
         conf.ADD_LDFLAGS('-lc', testflags=False)
 
 
     if not conf.CHECK_NEED_LC("-lc not needed"):
         conf.ADD_LDFLAGS('-lc', testflags=False)
 

-    # we don't want PYTHONDIR in config.h, as otherwise changing
-    # --prefix causes a complete rebuild
-    del(conf.env.defines['PYTHONDIR'])
-    del(conf.env.defines['PYTHONARCHDIR'])
-

     if not conf.CHECK_CODE('#include "tests/summary.c"',
                            define='SUMMARY_PASSES',
                            addmain=False,
                            msg='Checking configure summary'):
     if not conf.CHECK_CODE('#include "tests/summary.c"',
                            define='SUMMARY_PASSES',
                            addmain=False,
                            msg='Checking configure summary'):

-        raise Utils.WafError('configure summary failed')
+        raise Errors.WafError('configure summary failed')

 
     if Options.options.enable_pie != False:
         if Options.options.enable_pie == True:
 
     if Options.options.enable_pie != False:
         if Options.options.enable_pie == True:


@@ -215,41 +354,28 @@ def configure(conf):
                          msg="Checking compiler for full RELRO support"):
             conf.env['ENABLE_RELRO'] = True
 
                          msg="Checking compiler for full RELRO support"):
             conf.env['ENABLE_RELRO'] = True
 

-    if Options.options.enable_systemd != False:
-        conf.check_cfg(package='libsystemd-daemon', args='--cflags --libs',
-                       msg='Checking for libsystemd-daemon', uselib_store="SYSTEMD-DAEMON")
-        conf.CHECK_HEADERS('systemd/sd-daemon.h', lib='systemd-daemon')
-        conf.CHECK_LIB('systemd-daemon', shlib=True)
-
-    if (conf.CONFIG_SET('HAVE_SYSTEMD_SD_DAEMON_H') and
-        conf.CONFIG_SET('HAVE_LIBSYSTEMD_DAEMON')):
-        conf.DEFINE('HAVE_SYSTEMD', '1')
-        conf.env['ENABLE_SYSTEMD'] = True
-    else:
-        conf.SET_TARGET_TYPE('systemd-daemon', 'EMPTY')
-        conf.undefine('HAVE_SYSTEMD')
-

     conf.SAMBA_CONFIG_H('include/config.h')
 
 def etags(ctx):
     '''build TAGS file using etags'''
     conf.SAMBA_CONFIG_H('include/config.h')
 
 def etags(ctx):
     '''build TAGS file using etags'''

-    import Utils
-    source_root = os.path.dirname(Utils.g_module.root_path)
+    from waflib import Utils
+    source_root = os.path.dirname(Context.g_module.root_path)

     cmd = 'rm -f %s/TAGS && (find %s -name "*.[ch]" | egrep -v \.inst\. | xargs -n 100 etags -a)' % (source_root, source_root)
     print("Running: %s" % cmd)
     status = os.system(cmd)
     if os.WEXITSTATUS(status):
     cmd = 'rm -f %s/TAGS && (find %s -name "*.[ch]" | egrep -v \.inst\. | xargs -n 100 etags -a)' % (source_root, source_root)
     print("Running: %s" % cmd)
     status = os.system(cmd)
     if os.WEXITSTATUS(status):

-        raise Utils.WafError('etags failed')
+        raise Errors.WafError('etags failed')

 
 def ctags(ctx):
     "build 'tags' file using ctags"
 
 def ctags(ctx):
     "build 'tags' file using ctags"

-    import Utils
-    source_root = os.path.dirname(Utils.g_module.root_path)
+    from waflib import Utils
+    source_root = os.path.dirname(Context.g_module.root_path)

     cmd = 'ctags --python-kinds=-i $(find %s -name "*.[ch]" | grep -v "*_proto\.h" | egrep -v \.inst\.) $(find %s -name "*.py")' % (source_root, source_root)
     print("Running: %s" % cmd)
     status = os.system(cmd)
     if os.WEXITSTATUS(status):
     cmd = 'ctags --python-kinds=-i $(find %s -name "*.[ch]" | grep -v "*_proto\.h" | egrep -v \.inst\.) $(find %s -name "*.py")' % (source_root, source_root)
     print("Running: %s" % cmd)
     status = os.system(cmd)
     if os.WEXITSTATUS(status):

-        raise Utils.WafError('ctags failed')
+        raise Errors.WafError('ctags failed')
+

 
 # putting this here enabled build in the list
 # of commands in --help
 
 # putting this here enabled build in the list
 # of commands in --help


@@ -262,7 +388,7 @@ def pydoctor(ctx):
     '''build python apidocs'''
     bp = os.path.abspath('bin/python')
     mpaths = {}
     '''build python apidocs'''
     bp = os.path.abspath('bin/python')
     mpaths = {}

-    modules = ['talloc', 'tdb', 'ldb', 'ntdb']
+    modules = ['talloc', 'tdb', 'ldb']

     for m in modules:
         f = os.popen("PYTHONPATH=%s python -c 'import %s; print %s.__file__'" % (bp, m, m), 'r')
         try:
     for m in modules:
         f = os.popen("PYTHONPATH=%s python -c 'import %s; print %s.__file__'" % (bp, m, m), 'r')
         try:


@@ -277,7 +403,7 @@ def pydoctor(ctx):
     print("Running: %s" % cmd)
     status = os.system(cmd)
     if os.WEXITSTATUS(status):
     print("Running: %s" % cmd)
     status = os.system(cmd)
     if os.WEXITSTATUS(status):

-        raise Utils.WafError('pydoctor failed')
+        raise Errors.WafError('pydoctor failed')

 
 
 def pep8(ctx):
 
 
 def pep8(ctx):


@@ -286,7 +412,7 @@ def pep8(ctx):
     print("Running: %s" % cmd)
     status = os.system(cmd)
     if os.WEXITSTATUS(status):
     print("Running: %s" % cmd)
     status = os.system(cmd)
     if os.WEXITSTATUS(status):

-        raise Utils.WafError('pep8 failed')
+        raise Errors.WafError('pep8 failed')

 
 
 def wafdocs(ctx):
 
 
 def wafdocs(ctx):


@@ -302,24 +428,24 @@ def wafdocs(ctx):
     print("Running: %s" % cmd)
     status = os.system(cmd)
     if os.WEXITSTATUS(status):
     print("Running: %s" % cmd)
     status = os.system(cmd)
     if os.WEXITSTATUS(status):

-        raise Utils.WafError('wafdocs failed')
+        raise Errors.WafError('wafdocs failed')

 
 
 def dist():
     '''makes a tarball for distribution'''
     sambaversion = samba_version.load_version(env=None)
 
 
 
 def dist():
     '''makes a tarball for distribution'''
     sambaversion = samba_version.load_version(env=None)
 

-    os.system("make -C ctdb/doc")
+    os.system("make -C ctdb manpages")

     samba_dist.DIST_FILES('ctdb/doc:ctdb/doc', extend=True)
 
     samba_dist.DIST_FILES('ctdb/doc:ctdb/doc', extend=True)
 

-    os.system(srcdir + "/release-scripts/build-manpages-nogit")
+    os.system("DOC_VERSION='" + sambaversion.STRING + "' " + Context.g_module.top + "/release-scripts/build-manpages-nogit")

     samba_dist.DIST_FILES('bin/docs:docs', extend=True)
 
     if sambaversion.IS_SNAPSHOT:
         # write .distversion file and add to tar
     samba_dist.DIST_FILES('bin/docs:docs', extend=True)
 
     if sambaversion.IS_SNAPSHOT:
         # write .distversion file and add to tar

-        if not os.path.isdir(blddir):
-            os.makedirs(blddir)
-        distversionf = tempfile.NamedTemporaryFile(mode='w', prefix='.distversion',dir=blddir)
+        if not os.path.isdir(Context.g_module.out):
+            os.makedirs(Context.g_module.out)
+        distversionf = tempfile.NamedTemporaryFile(mode='w', prefix='.distversion',dir=Context.g_module.out)

         for field in sambaversion.vcs_fields:
             distveroption = field + '=' + str(sambaversion.vcs_fields[field])
             distversionf.write(distveroption + '\n')
         for field in sambaversion.vcs_fields:
             distveroption = field + '=' + str(sambaversion.vcs_fields[field])
             distversionf.write(distveroption + '\n')


@@ -335,9 +461,6 @@ def dist():
 def distcheck():
     '''test that distribution tarball builds and installs'''
     samba_version.load_version(env=None)
 def distcheck():
     '''test that distribution tarball builds and installs'''
     samba_version.load_version(env=None)

-    import Scripting
-    d = Scripting.distcheck
-    d()

 
 def wildcard_cmd(cmd):
     '''called on a unknown command'''
 
 def wildcard_cmd(cmd):
     '''called on a unknown command'''


@@ -346,6 +469,7 @@ def wildcard_cmd(cmd):
 
 def main():
     from samba_wildcard import wildcard_main
 
 def main():
     from samba_wildcard import wildcard_main

+

     wildcard_main(wildcard_cmd)
 Scripting.main = main
 
     wildcard_main(wildcard_cmd)
 Scripting.main = main
 


@@ -353,3 +477,10 @@ def reconfigure(ctx):
     '''reconfigure if config scripts have changed'''
     import samba_utils
     samba_utils.reconfigure(ctx)
     '''reconfigure if config scripts have changed'''
     import samba_utils
     samba_utils.reconfigure(ctx)

+
+
+if os.path.isdir(os.path.join(top, ".git")):
+    # Check if there are submodules that are checked out but out of date.
+    for submodule, status in samba_git.read_submodule_status(top):
+        if status == "out-of-date":
+            raise Errors.WafError("some submodules are out of date. Please run 'git submodule update'")