Samba 4.4.0rc5 build fails

[Uri Simchoni]

Sorry for that. Classic mistake of focusing on how to support quotas and 
neglecting to test what happens if someone doesn't want quotas.

Attached is a fix for master - Can I get a reviewer?
Thanks,
Uri.

On 03/16/2016 07:53 PM, Justin Maggard wrote:
> Commit 36b0b0e (build: fix disk-free quota support on Solaris 10)
> broke compiling in my environment.  Just after configure finishes, I
> get this:
>
> symlink: samba/xattr.py -> python/samba/xattr.py
> symlink: rpc/dcerpc.py -> python/samba/dcerpc/__init__.py
> Selected system MIT krb5 libraries, Heimdal use is disabled
> /usr/src/s/samba/4.4.0/samba-4.4.0rc5/wscript: error: Traceback (most
> recent call last):
>    File "/usr/src/s/samba/4.4.0/samba-4.4.0rc5/third_party/waf/wafadmin/Utils.py",
> line 669, in recurse
>      exec(compile(txt, file_path, 'exec'), dc)
>    File "/usr/src/s/samba/4.4.0/samba-4.4.0rc5/wscript_build", line
> 147, in <module>
>      bld.RECURSE('source3')
>    File "./buildtools/wafsamba/samba_utils.py", line 453, in RECURSE
>      return ctx.add_subdirs(relpath)
>    File "/usr/src/s/samba/4.4.0/samba-4.4.0rc5/third_party/waf/wafadmin/Build.py",
> line 997, in add_subdirs
>      self.recurse(dirs, 'build')
>    File "/usr/src/s/samba/4.4.0/samba-4.4.0rc5/third_party/waf/wafadmin/Utils.py",
> line 672, in recurse
>      raise WscriptError("".join(traceback.format_exception(exc_type,
> exc_value, tb)), base)
> WscriptError: /usr/src/s/samba/4.4.0/samba-4.4.0rc5/source3/wscript:
> error: Traceback (most recent call last):
>    File "/usr/src/s/samba/4.4.0/samba-4.4.0rc5/third_party/waf/wafadmin/Utils.py",
> line 669, in recurse
>      exec(compile(txt, file_path, 'exec'), dc)
>    File "/usr/src/s/samba/4.4.0/samba-4.4.0rc5/source3/wscript_build",
> line 642, in <module>
>      bld.env['legacy_quota_libs'] +
> TypeError: cannot concatenate 'str' and 'list' objects
>
> Here are my configure args:
>
> ./buildtools/bin/waf configure --prefix=/usr --mandir=/usr/share/man
> --sysconfdir=/etc --localstatedir=/var --with-piddir=/var/run
> --with-modulesdir=/usr/lib/x86_64-linux-gnu/samba/ --disable-rpath
> --disable-rpath-install
> --bundled-libraries=NONE,pytevent,iniparser,ntdb,nss_wrapper,socket_wrapper,uid_wrapper
> --builtin-libraries=ccan,ntdb,nss_wrapper,socket_wrapper,uid_wrapper
> --minimum-library-version= --libdir=/usr/lib/x86_64-linux-gnu
> --enable-fhs --enable-avahi --with-dnsupdate --with-system-mitkrb5
> --without-ad-dc --without-quotas
>
> -Justin
>

-------------- next part --------------
From 990f287d0bf3694c85359e8eb42cfba1f435d7c5 Mon Sep 17 00:00:00 2001
From: Uri Simchoni <uri at samba.org>
Date: Wed, 16 Mar 2016 20:20:02 +0200
Subject: [PATCH] build: fix build when --without-quota specified

BUG: https://bugzilla.samba.org/show_bug.cgi?id=11798

Signed-off-by: Uri Simchoni <uri at samba.org>
---
 source3/wscript | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/source3/wscript b/source3/wscript
index c23f621..9b73bfc 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -1375,6 +1375,7 @@ main() {
     conf.CHECK_FUNCS_IN('getspnam', 'security')
     conf.CHECK_FUNCS_IN('getspnam', 'sec')
 
+    legacy_quota_libs = ''
     if Options.options.with_quotas:
         # For quotas on Veritas VxFS filesystems
         conf.CHECK_HEADERS('sys/fs/vx_quota.h')
@@ -1459,7 +1460,6 @@ main() {
         # check if Legacy quota code can be brought in
         # if standard interfaces are not supported
         #
-        legacy_quota_libs = ''
         if not conf.CONFIG_SET('WITH_QUOTAS'):
             if host_os.rfind('sunos5') > -1:
                 conf.DEFINE('SUNOS5', '1')
@@ -1477,7 +1477,7 @@ main() {
                             addmain=False)
             if not conf.CONFIG_SET('WITH_QUOTAS'):
                 legacy_quota_libs = ''
-        conf.env['legacy_quota_libs'] = legacy_quota_libs
+    conf.env['legacy_quota_libs'] = legacy_quota_libs
 
     #
     # cluster support (CTDB)
-- 
2.5.0