Samba 4.4.0rc5 build fails

[Justin Maggard]

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