[SCM] Samba Shared Repository - branch master updated
Andrew Bartlett
abartlet at samba.org
Tue May 28 00:48:03 MDT 2013
The branch, master has been updated
via 5a633dd s4-dns: Print/Set minimumTTL value in SOA record
via 6676511 build: Remove unused mkbuildoptions.awk
via dd72d85 build: Remove unused tool for config.h comparison
via 4c4520a build: Remove feature tests for variables now always provided
via dc6b03f build: Remove unused credentials_samba3.c
via 26d36be selftest: VFSLIBDIR is not needed, the waf build knows where to find modules automatically
via cbddf9e build: Remove autoconf build system from examples/VFS
via f073401 passdb-machine_account_secrets: Remove #if SAMBA_BUILD_ == 4 now we only have the waf build
via 2c70b0e nsswitch: Remove #if SAMBA_BUILD_ >= 4 now we only have the waf build
via 922fe92 lib/util/modules.c: Remove #if SAMBA_BUILD_ == 3 now we only have the waf build
via 2bede9d param: Remove _SAMBA_BUILD_ checks from now the autoconf build is gone
via ae14497 docs: Document removal of the autoconf build system
via 11aab8a build: Remove unused preproc-dummy.c
via 53c61a3 build: Remove unused linkmodules.sh script
via 69c09e7 build: Remove unused revert.sh script
via 26ff1f2 build: Remove unused uninstall*.sh scripts
via d98f107 build: Remove unused install*.sh scripts
via 167b8bd build: Remove unused build_idl.sh
via c5bde69 Remove lib/netapi autoconf build system, this is now build with waf
via 87049bf build: Remove unused build_idl.sh
via af443d0 Remove now-unused s3-selftest.sh wrapper
via 8bcaa14 Remove stub ldb_version.h and source3/include/autoconf as no longer needed
via 8b2590c build: Remove autoconf directory no longer needed
via 0b5c23b build: Remove unused script/mkversion.sh
via a768e6b build: Remove unused install-sh
via cd4b413 build: Remove autoconf build system
via 97cceb5 build: No longer run autogen.sh during tarball creation
via fb67cea autobuild: Remove samba3 and samba3-ctdb targets to allow autoconf removal for 4.1
from 4e76a77 waf: build position independent executables
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 5a633dd6bb5be817c6b421df0c098e3428a20773
Author: Amitay Isaacs <amitay at gmail.com>
Date: Thu Dec 6 16:10:42 2012 +1100
s4-dns: Print/Set minimumTTL value in SOA record
Signed-off-by: Amitay Isaacs <amitay at gmail.com>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
Autobuild-Date(master): Tue May 28 08:47:56 CEST 2013 on sn-devel-104
commit 667651132b9136e1ad9d7dc5f44dd86c66907e70
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu May 23 09:37:10 2013 +1000
build: Remove unused mkbuildoptions.awk
This is not used by the waf build.
Andrew Bartlett
Reviewed-by: Jelmer Vernooij <jelmer at samba.org>
Reviewed-by: David Disseldorp <ddiss at samba.org>
commit dd72d85e928a9f52113235daaab1e71ea916aa0d
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed May 22 17:05:11 2013 +1000
build: Remove unused tool for config.h comparison
Reviewed-by: Jelmer Vernooij <jelmer at samba.org>
Reviewed-by: David Disseldorp <ddiss at samba.org>
commit 4c4520ac3794f917c831255d6598945712bcfb5c
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed May 22 16:23:23 2013 +1000
build: Remove feature tests for variables now always provided
These #ifdef statements were added in replacement for #if (_SAMBA_BUILD_ >= 4)
in fbe7ed79b0f056a9a8f44a9b42e887441d2f00d5
Andrew Bartlett
Reviewed-by: Jelmer Vernooij <jelmer at samba.org>
Reviewed-by: David Disseldorp <ddiss at samba.org>
commit dc6b03ffa55968708576cb527f1b52a37d8e5317
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed May 22 16:16:31 2013 +1000
build: Remove unused credentials_samba3.c
This file was only used by the autoconf build system.
Andrew Bartlett
Reviewed-by: Jelmer Vernooij <jelmer at samba.org>
Reviewed-by: David Disseldorp <ddiss at samba.org>
commit 26d36befa8347eb093850cc8853fd9939555d458
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed May 22 16:13:21 2013 +1000
selftest: VFSLIBDIR is not needed, the waf build knows where to find modules automatically
This is why was relinks on install, because it is fixing these
internal variables up.
Andrew Bartlett
Reviewed-by: Jelmer Vernooij <jelmer at samba.org>
Reviewed-by: David Disseldorp <ddiss at samba.org>
commit cbddf9e2efd856a25c6405f6893ad3a9cda1b181
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed May 22 14:22:36 2013 +1000
build: Remove autoconf build system from examples/VFS
Reviewed-by: Jelmer Vernooij <jelmer at samba.org>
Reviewed-by: David Disseldorp <ddiss at samba.org>
commit f073401abf9a0f91715854d885fad96332d001b5
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed May 22 13:48:35 2013 +1000
passdb-machine_account_secrets: Remove #if SAMBA_BUILD_ == 4 now we only have the waf build
Reviewed-by: Jelmer Vernooij <jelmer at samba.org>
Reviewed-by: David Disseldorp <ddiss at samba.org>
commit 2c70b0edcfbc009b5cdc27454d3703fbf20a50bd
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed May 22 13:47:50 2013 +1000
nsswitch: Remove #if SAMBA_BUILD_ >= 4 now we only have the waf build
Reviewed-by: Jelmer Vernooij <jelmer at samba.org>
Reviewed-by: David Disseldorp <ddiss at samba.org>
commit 922fe921ce3df0ea7c3b44f07a076301fcbe06fa
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed May 22 13:46:16 2013 +1000
lib/util/modules.c: Remove #if SAMBA_BUILD_ == 3 now we only have the waf build
Reviewed-by: Jelmer Vernooij <jelmer at samba.org>
Reviewed-by: David Disseldorp <ddiss at samba.org>
commit 2bede9d0d6f92046dffe9bcd282fdd791339b10c
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed May 22 13:44:59 2013 +1000
param: Remove _SAMBA_BUILD_ checks from now the autoconf build is gone
Reviewed-by: Jelmer Vernooij <jelmer at samba.org>
Reviewed-by: David Disseldorp <ddiss at samba.org>
commit ae144978bc7141e66426eccf08450a6408eda359
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed May 22 12:47:59 2013 +1000
docs: Document removal of the autoconf build system
Reviewed-by: Jelmer Vernooij <jelmer at samba.org>
Reviewed-by: David Disseldorp <ddiss at samba.org>
commit 11aab8a348af6ae825756f199ff592beb51f241c
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed May 22 12:39:59 2013 +1000
build: Remove unused preproc-dummy.c
This was used by autogen.sh
Reviewed-by: Jelmer Vernooij <jelmer at samba.org>
Reviewed-by: David Disseldorp <ddiss at samba.org>
commit 53c61a3a18666e3c01130380bd62fa579c1e4458
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed May 22 12:37:54 2013 +1000
build: Remove unused linkmodules.sh script
Reviewed-by: Jelmer Vernooij <jelmer at samba.org>
Reviewed-by: David Disseldorp <ddiss at samba.org>
commit 69c09e7a34de7fd31960d240d34dabdeddb37222
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed May 22 12:37:34 2013 +1000
build: Remove unused revert.sh script
Reviewed-by: Jelmer Vernooij <jelmer at samba.org>
Reviewed-by: David Disseldorp <ddiss at samba.org>
commit 26ff1f2167c8f326c3ea17bc69ee927d58b5baf8
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed May 22 12:37:14 2013 +1000
build: Remove unused uninstall*.sh scripts
Reviewed-by: Jelmer Vernooij <jelmer at samba.org>
Reviewed-by: David Disseldorp <ddiss at samba.org>
commit d98f1075443b7feedab0212e75366d502b20e17a
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed May 22 12:36:34 2013 +1000
build: Remove unused install*.sh scripts
Reviewed-by: Jelmer Vernooij <jelmer at samba.org>
Reviewed-by: David Disseldorp <ddiss at samba.org>
commit 167b8bddad24421a2e8fcf0e7647ef3296b1665c
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed May 22 12:35:15 2013 +1000
build: Remove unused build_idl.sh
Reviewed-by: Jelmer Vernooij <jelmer at samba.org>
Reviewed-by: David Disseldorp <ddiss at samba.org>
commit c5bde695683be4af68cf8eb876f88a307bf2fcd3
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed May 22 12:32:55 2013 +1000
Remove lib/netapi autoconf build system, this is now build with waf
Reviewed-by: Jelmer Vernooij <jelmer at samba.org>
Reviewed-by: David Disseldorp <ddiss at samba.org>
commit 87049bf32fa069916800316366cc577116b9d703
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed May 22 12:30:10 2013 +1000
build: Remove unused build_idl.sh
Reviewed-by: Jelmer Vernooij <jelmer at samba.org>
Reviewed-by: David Disseldorp <ddiss at samba.org>
commit af443d0017125209cce61fbab88b2385bf1df9df
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed May 22 12:27:33 2013 +1000
Remove now-unused s3-selftest.sh wrapper
This is now always invokes via waf.
Andrew Bartlett
Reviewed-by: Jelmer Vernooij <jelmer at samba.org>
Reviewed-by: David Disseldorp <ddiss at samba.org>
commit 8bcaa145f23e606f4b850fe7147192a6fec11c2d
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed May 22 12:26:35 2013 +1000
Remove stub ldb_version.h and source3/include/autoconf as no longer needed
Reviewed-by: Jelmer Vernooij <jelmer at samba.org>
Reviewed-by: David Disseldorp <ddiss at samba.org>
commit 8b2590c311ad24f809a5b27d2a408b6e9338db1d
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed May 22 12:25:45 2013 +1000
build: Remove autoconf directory no longer needed
This was only needed to avoid autoconf and waf builds colliding.
Andrew Bartlett
Reviewed-by: Jelmer Vernooij <jelmer at samba.org>
Reviewed-by: David Disseldorp <ddiss at samba.org>
commit 0b5c23b5220faaf7d04e70773a0f74746486068b
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed May 22 12:24:16 2013 +1000
build: Remove unused script/mkversion.sh
Reviewed-by: Jelmer Vernooij <jelmer at samba.org>
Reviewed-by: David Disseldorp <ddiss at samba.org>
commit a768e6b0f89a1395dbce1dde73c001c2bde1fc99
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed May 22 12:23:56 2013 +1000
build: Remove unused install-sh
Reviewed-by: Jelmer Vernooij <jelmer at samba.org>
Reviewed-by: David Disseldorp <ddiss at samba.org>
commit cd4b413cb0574c459c1c24cf07f8d6b44f5fc077
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed May 22 12:23:20 2013 +1000
build: Remove autoconf build system
We are now confident that that waf build system meets enough of our needs
that we will work to improve it, rather than maintain two build systems.
Andrew Bartlett
Reviewed-by: Jelmer Vernooij <jelmer at samba.org>
Reviewed-by: David Disseldorp <ddiss at samba.org>
commit 97cceb5f8b9fc68cb8942092e92fde2b965883e4
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed May 22 14:23:31 2013 +1000
build: No longer run autogen.sh during tarball creation
Reviewed-by: Jelmer Vernooij <jelmer at samba.org>
Reviewed-by: David Disseldorp <ddiss at samba.org>
commit fb67cea6803650e0696fc45a2a8475728dbb18f0
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed May 22 14:35:08 2013 +1000
autobuild: Remove samba3 and samba3-ctdb targets to allow autoconf removal for 4.1
Reviewed-by: Jelmer Vernooij <jelmer at samba.org>
Reviewed-by: David Disseldorp <ddiss at samba.org>
-----------------------------------------------------------------------
Summary of changes:
BUILD_SYSTEMS.txt | 25 +-
auth/credentials/credentials_samba3.c | 49 -
buildtools/compare_config_h3-exceptions.grep | 10 -
buildtools/compare_config_h3.sh | 27 -
dynconfig/config.m4 | 299 --
dynconfig/dynconfig.c | 11 -
examples/VFS/Makefile.in | 72 -
examples/VFS/autogen.sh | 63 -
examples/VFS/config.guess | 1561 ------
examples/VFS/config.sub | 1686 -------
examples/VFS/configure.in | 357 --
examples/VFS/install-sh | 238 -
lib/ccan/libccan.m4 | 363 --
lib/iniparser_build/config.m4 | 45 -
lib/nss_wrapper/config.m4 | 19 -
lib/ntdb/libntdb.m4 | 41 -
lib/param/loadparm.c | 2 -
lib/param/loadparm_server_role.c | 4 -
lib/param/param_table.c | 2 -
lib/popt/libpopt.m4 | 43 -
lib/popt/samba.m4 | 8 -
lib/replace/crypt.m4 | 6 -
lib/replace/dlfcn.m4 | 31 -
lib/replace/libreplace.m4 | 490 --
lib/replace/libreplace_cc.m4 | 197 -
lib/replace/libreplace_ld.m4 | 337 --
lib/replace/libreplace_macros.m4 | 347 --
lib/replace/libreplace_network.m4 | 503 --
lib/replace/repdir.m4 | 81 -
lib/replace/strptime.m4 | 16 -
lib/replace/system/config.m4 | 145 -
lib/replace/timegm.m4 | 1 -
lib/replace/win32.m4 | 20 -
lib/socket_wrapper/config.m4 | 22 -
lib/talloc/compat/talloc_compat1.m4 | 14 -
lib/talloc/libtalloc.m4 | 38 -
lib/tdb/libtdb.m4 | 41 -
lib/tevent/libtevent.m4 | 75 -
lib/uid_wrapper/config.m4 | 19 -
lib/util/modules.c | 8 -
lib/zlib/zlib.m4 | 29 -
librpc/build_idl.sh | 67 -
m4/check_make.m4 | 33 -
m4/check_perl.m4 | 32 -
m4/check_python.m4 | 111 -
m4/pkg.m4 | 156 -
nsswitch/wbinfo.c | 4 -
python/samba/netcmd/dns.py | 4 +-
script/autobuild.py | 24 +-
selftest/target/Samba3.pm | 16 +-
selftest/wscript | 1 -
source3/Makefile-smbtorture | 24 -
source3/Makefile.in | 3405 -------------
source3/autoconf/lib/param/README | 3 -
source3/autoconf/librpc/gen_ndr/README | 7 -
source3/autoconf/source3/param/README | 3 -
source3/autogen.sh | 121 -
source3/config.guess | 1561 ------
source3/config.sub | 1686 -------
source3/configure.developer | 7 -
source3/configure.in | 6693 --------------------------
source3/include/autoconf/README | 5 -
source3/include/autoconf/ldb_version.h | 4 -
source3/install-sh | 238 -
source3/lib/netapi/examples/Makefile.in | 364 --
source3/lib/netapi/tests/Makefile.in | 57 -
source3/m4/aclocal.m4 | 899 ----
source3/m4/autoconf-2.60.m4 | 236 -
source3/m4/check_path.m4 | 89 -
source3/m4/samba_version.m4 | 29 -
source3/passdb/machine_account_secrets.c | 8 -
source3/passdb/pdb_ipa.c | 2 -
source3/script/build_idl.sh | 60 -
source3/script/installbin.sh.in | 34 -
source3/script/installdat.sh | 65 -
source3/script/installdirs.sh | 18 -
source3/script/installman.sh | 87 -
source3/script/installmo.sh | 87 -
source3/script/installmodules.sh | 42 -
source3/script/installscripts.sh | 47 -
source3/script/linkmodules.sh | 12 -
source3/script/mkbuildoptions.awk | 275 --
source3/script/mkversion.sh | 150 -
source3/script/revert.sh | 18 -
source3/script/uninstallbin.sh.in | 41 -
source3/script/uninstalldat.sh | 1 -
source3/script/uninstallman.sh | 37 -
source3/script/uninstallmo.sh | 2 -
source3/script/uninstallmodules.sh | 39 -
source3/script/uninstallmsg.sh | 1 -
source3/script/uninstallscripts.sh | 36 -
source3/script/uninstallswat.sh | 1 -
source3/selftest/s3-selftest.sh | 54 -
source3/tests/preproc-dummy.c | 1 -
wscript | 7 -
95 files changed, 18 insertions(+), 24331 deletions(-)
delete mode 100644 auth/credentials/credentials_samba3.c
delete mode 100644 buildtools/compare_config_h3-exceptions.grep
delete mode 100755 buildtools/compare_config_h3.sh
delete mode 100644 dynconfig/config.m4
delete mode 100644 examples/VFS/Makefile.in
delete mode 100755 examples/VFS/autogen.sh
delete mode 100755 examples/VFS/config.guess
delete mode 100755 examples/VFS/config.sub
delete mode 100644 examples/VFS/configure.in
delete mode 100644 examples/VFS/install-sh
delete mode 100644 lib/ccan/libccan.m4
delete mode 100644 lib/iniparser_build/config.m4
delete mode 100644 lib/nss_wrapper/config.m4
delete mode 100644 lib/ntdb/libntdb.m4
delete mode 100644 lib/popt/libpopt.m4
delete mode 100644 lib/popt/samba.m4
delete mode 100644 lib/replace/crypt.m4
delete mode 100644 lib/replace/dlfcn.m4
delete mode 100644 lib/replace/libreplace.m4
delete mode 100644 lib/replace/libreplace_cc.m4
delete mode 100644 lib/replace/libreplace_ld.m4
delete mode 100644 lib/replace/libreplace_macros.m4
delete mode 100644 lib/replace/libreplace_network.m4
delete mode 100644 lib/replace/repdir.m4
delete mode 100644 lib/replace/strptime.m4
delete mode 100644 lib/replace/system/config.m4
delete mode 100644 lib/replace/timegm.m4
delete mode 100644 lib/replace/win32.m4
delete mode 100644 lib/socket_wrapper/config.m4
delete mode 100644 lib/talloc/compat/talloc_compat1.m4
delete mode 100644 lib/talloc/libtalloc.m4
delete mode 100644 lib/tdb/libtdb.m4
delete mode 100644 lib/tevent/libtevent.m4
delete mode 100644 lib/uid_wrapper/config.m4
delete mode 100644 lib/zlib/zlib.m4
delete mode 100755 librpc/build_idl.sh
delete mode 100644 m4/check_make.m4
delete mode 100644 m4/check_perl.m4
delete mode 100644 m4/check_python.m4
delete mode 100644 m4/pkg.m4
delete mode 100644 source3/Makefile-smbtorture
delete mode 100644 source3/Makefile.in
delete mode 100644 source3/autoconf/lib/param/README
delete mode 100644 source3/autoconf/librpc/gen_ndr/README
delete mode 100644 source3/autoconf/source3/param/README
delete mode 100755 source3/autogen.sh
delete mode 100755 source3/config.guess
delete mode 100755 source3/config.sub
delete mode 100755 source3/configure.developer
delete mode 100644 source3/configure.in
delete mode 100644 source3/include/autoconf/README
delete mode 100644 source3/include/autoconf/ldb_version.h
delete mode 100755 source3/install-sh
delete mode 100644 source3/lib/netapi/examples/Makefile.in
delete mode 100644 source3/lib/netapi/tests/Makefile.in
delete mode 100644 source3/m4/aclocal.m4
delete mode 100644 source3/m4/autoconf-2.60.m4
delete mode 100644 source3/m4/check_path.m4
delete mode 100644 source3/m4/samba_version.m4
delete mode 100755 source3/script/build_idl.sh
delete mode 100755 source3/script/installbin.sh.in
delete mode 100755 source3/script/installdat.sh
delete mode 100755 source3/script/installdirs.sh
delete mode 100755 source3/script/installman.sh
delete mode 100755 source3/script/installmo.sh
delete mode 100755 source3/script/installmodules.sh
delete mode 100755 source3/script/installscripts.sh
delete mode 100755 source3/script/linkmodules.sh
delete mode 100644 source3/script/mkbuildoptions.awk
delete mode 100755 source3/script/mkversion.sh
delete mode 100755 source3/script/revert.sh
delete mode 100755 source3/script/uninstallbin.sh.in
delete mode 120000 source3/script/uninstalldat.sh
delete mode 100755 source3/script/uninstallman.sh
delete mode 100755 source3/script/uninstallmo.sh
delete mode 100755 source3/script/uninstallmodules.sh
delete mode 120000 source3/script/uninstallmsg.sh
delete mode 100755 source3/script/uninstallscripts.sh
delete mode 120000 source3/script/uninstallswat.sh
delete mode 100755 source3/selftest/s3-selftest.sh
delete mode 100644 source3/tests/preproc-dummy.c
Changeset truncated at 500 lines:
diff --git a/BUILD_SYSTEMS.txt b/BUILD_SYSTEMS.txt
index f8590f6..96d1e35 100644
--- a/BUILD_SYSTEMS.txt
+++ b/BUILD_SYSTEMS.txt
@@ -1,5 +1,4 @@
BUILDING SAMBA 4.0
-(which build system to use and why)
===================================
The waf build
@@ -59,27 +58,15 @@ our users, for whatever purpose you want to put Samba to.
The autoconf build
------------------
-For a small number of users, the requirement to have access to Python
-2.4 and perl will be unacceptable, and for these users we continue to
-provide the 'autoconf' build system used in Samba 3.x under the
-source3/. This will build fewer parts of Samba, but should not be seen
-as 'the file server build' (typical file server deployments should use
-the top level build), but as a measure provided with limited features
-for systems and organisations unable to meet the requirements for the
-new build system.
-
-If you do need to use the autoconf build system, please let us know:
-both why you cannot use the 'waf' build in the top level, and what
-features of the source3 build that you require. We need this
-information to assess the continuing demand for this parallel
-infrastructure, and to determine which features need to remain available
-in both build systems.
+The autoconf build was removed in Samba 4.1. If you have tried and
+failed to use our waf build system, you may wish to use the latest
+supported 4.0 release instead, while we address your use case.
Optional Libraries
------------------
To assist users and distributors to build Samba with the full feature
-set, by the first release candidate the build system will abort if our
+set, we hope to in the future the build system will abort if our
dependent libraries and their header files are not found on the target
system. This will mean for example, that xattr, acl and ldap headers
must be installed for the default build to complete. The configure
@@ -93,4 +80,6 @@ indicate:
This will assist users and in particular distributors in building fully
functional packages, while allowing those on systems truly without these
-facilities to continue to build Samba after careful consideration.
+facilities to continue to build Samba after careful consideration.
+
+Sadly this feature is still pending implementation.
diff --git a/auth/credentials/credentials_samba3.c b/auth/credentials/credentials_samba3.c
deleted file mode 100644
index d742a0a..0000000
--- a/auth/credentials/credentials_samba3.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- Unix SMB/CIFS implementation.
-
- Handle user credentials (shim to allow samba3 to build)
-
- Copyright (C) Andrew Bartlett <abartlet at samba.org> 2011
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "includes.h"
-#include "auth/credentials/credentials.h"
-
-/* These dummy functions are required only to allow the rest of the
- * code to compile when we are in the s3 autoconf build system */
-
-_PUBLIC_ void cli_credentials_invalidate_ccache(struct cli_credentials *cred,
- enum credentials_obtained obtained)
-{
- return;
-}
-
-_PUBLIC_ int cli_credentials_set_ccache(struct cli_credentials *cred,
- struct loadparm_context *lp_ctx,
- const char *name,
- enum credentials_obtained obtained,
- const char **error_string)
-{
- DEBUG(0, ("cli_credentials_set_ccache is unimplemented in the autoconf build\n"));
- return EINVAL;
-}
-
-_PUBLIC_ NTSTATUS cli_credentials_set_machine_account(struct cli_credentials *cred,
- struct loadparm_context *lp_ctx)
-{
- DEBUG(0, ("cli_credentials_set_machine_account is unimplemented in the autoconf build\n"));
- return NT_STATUS_CANT_ACCESS_DOMAIN_INFO;
-}
diff --git a/buildtools/compare_config_h3-exceptions.grep b/buildtools/compare_config_h3-exceptions.grep
deleted file mode 100644
index aa8851f..0000000
--- a/buildtools/compare_config_h3-exceptions.grep
+++ /dev/null
@@ -1,10 +0,0 @@
-^.define HAVE_.*KRB5
-^.define HAVE_.*KEYTAB
-^.define HAVE__ET_LIST
-^.define HAVE_LIBK5CRYPTO
-^.define HAVE_GSS
-^.define static
-^.define STATIC
-^.define PACKAGE
-^.define STRING_STATIC_MODULES
-^.define perfcount_test_init
diff --git a/buildtools/compare_config_h3.sh b/buildtools/compare_config_h3.sh
deleted file mode 100755
index 45be1ec..0000000
--- a/buildtools/compare_config_h3.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-
-# compare the generated config.h from a waf build with existing samba
-# build
-
-OLD_CONFIG=source3/include/autoconf/config.h
-if test "x$1" != "x" ; then
- OLD_CONFIG=$1
-fi
-
-NEW_CONFIG=bin/default/include/config.h
-if test "x$2" != "x" ; then
- NEW_CONFIG=$2
-fi
-
-EXCEPTIONS=`dirname $0`/compare_config_h3-exceptions.grep
-
-if test "x$DIFF" = "x" ; then
- DIFF="comm -23"
-fi
-
-grep "^.define" $NEW_CONFIG | egrep -v -f $EXCEPTIONS | sort > waf-config.h
-grep "^.define" $OLD_CONFIG | egrep -v -f $EXCEPTIONS | sort > old-config.h
-
-$DIFF old-config.h waf-config.h
-rm -f old-config.h waf-config.h
-
diff --git a/dynconfig/config.m4 b/dynconfig/config.m4
deleted file mode 100644
index fe69abe..0000000
--- a/dynconfig/config.m4
+++ /dev/null
@@ -1,299 +0,0 @@
-#################################################
-# Directory handling stuff to support both the
-# legacy SAMBA directories and FHS compliant
-# ones...
-AC_PREFIX_DEFAULT(/usr/local/samba)
-
-BINDIR="${bindir}"
-SBINDIR="${sbindir}"
-LIBDIR="${libdir}"
-LIBEXECDIR="${libexecdir}"
-MANDIR="${mandir}"
-DATADIR="${datadir}"
-LOCALEDIR="${localedir}"
-SCRIPTSBINDIR="${sbindir}"
-#PYTHONDIR
-#PYTHONARCHDIR
-
-AC_ARG_ENABLE(fhs,
-[AS_HELP_STRING([--enable-fhs], [Turn on FHS support (default=no)])])
-
-if test x$enable_fhs != xyes; then
- if test x"$prefix" = x"/usr" -o x"$prefix" = x"/usr/local"; then
- AC_MSG_WARN([Don't install directly under /usr or /usr/local without using the FHS option (--enable-fhs)])
- AC_MSG_ERROR([invalid --prefix=$prefix])
- fi
- MODULESDIR="${libdir}"
- INCLUDEDIR="${includedir}"
- SETUPDIR="${datadir}/setup"
- PKGCONFIGDIR="${libdir}/pkgconfig"
- CODEPAGEDIR="${datadir}/codepages"
- PAMMODULESDIR="${libdir}/security"
- CONFIGDIR="\${sysconfdir}"
- PRIVATE_DIR="\${prefix}/private"
- LOCKDIR="\${localstatedir}/lock"
- PIDDIR="\${localstatedir}/run"
- STATEDIR="\${localstatedir}/locks"
- CACHEDIR="\${localstatedir}/cache"
- LOGFILEBASE="\${localstatedir}"
- SOCKET_DIR="\${localstatedir}/run"
- PRIVILEGED_SOCKET_DIR="\${localstatedir}/lib"
-else
- AC_DEFINE(FHS_COMPATIBLE, 1, [Whether to use fully FHS-compatible paths])
-
- MODULESDIR="${libdir}/samba"
- INCLUDEDIR="${includedir}/samba-4.0"
- SETUPDIR="${datadir}/samba/setup"
- PKGCONFIGDIR="${libdir}/pkgconfig"
- CODEPAGEDIR="${datadir}/samba/codepages"
- PAMMODULESDIR="${libdir}/security"
- CONFIGDIR="\${sysconfdir}/samba"
- PRIVATE_DIR="\${localstatedir}/lib/samba/private"
- LOCKDIR="\${localstatedir}/lock/samba"
- PIDDIR="\${localstatedir}/run/samba"
- STATEDIR="\${localstatedir}/lib/samba"
- CACHEDIR="\${localstatedir}/cache/samba"
- LOGFILEBASE="\${localstatedir}/log/samba"
- SOCKET_DIR="\${localstatedir}/run/samba"
- PRIVILEGED_SOCKET_DIR="\${localstatedir}/lib/samba"
-fi
-
-AC_ARG_WITH(modulesdir,
-[AS_HELP_STRING([--with-modulesdir=DIR],
- [Which directory to use for modules ($exec_prefix/modules)])],
-[ case "$withval" in
- yes|no)
- #
- # Just in case anybody calls it without argument
- #
- AC_MSG_WARN([--with-modulesdir called without argument - will use default])
- ;;
- * )
- MODULESDIR="$withval"
- ;;
- esac])
-
-AC_ARG_WITH(pammodulesdir,
-[AS_HELP_STRING([--with-pammodulesdir=DIR],
- [Which directory to use for PAM modules ($libdir/security)])],
-[ case "$withval" in
- yes|no)
- #
- # Just in case anybody calls it without argument
- #
- AC_MSG_WARN([--with-pammodulesdir called without argument - will use default])
- ;;
- * )
- PAMMODULESDIR="$withval"
- ;;
- esac])
-
-AC_ARG_WITH(configdir,
-[AS_HELP_STRING([--with-configdir=DIR],
- [Where to put configuration files ($sysconfdir)])],
-[ case "$withval" in
- yes|no)
- #
- # Just in case anybody calls it without argument
- #
- AC_MSG_WARN([--with-configdir called without argument - will use default])
- ;;
- * )
- CONFIGDIR="$withval"
- ;;
- esac])
-
-AC_ARG_WITH(privatedir,
-[AS_HELP_STRING([--with-privatedir=DIR],
- [Where to put passdb.tdb and other private files ($prefix/private)])],
-[ case "$withval" in
- yes|no)
- #
- # Just in case anybody calls it without argument
- #
- AC_MSG_WARN([--with-privatedir called without argument - will use default])
- ;;
- * )
- PRIVATE_DIR="$withval"
- ;;
- esac])
-
-AC_ARG_WITH(lockdir,
-[AS_HELP_STRING([--with-lockdir=DIR],
- [Where to put short term disposable state files ($localstatedir/lock)])],
-[ case "$withval" in
- yes|no)
- #
- # Just in case anybody calls it without argument
- #
- AC_MSG_WARN([--with-lockdir called without argument - will use default])
- ;;
- * )
- LOCKDIR="$withval"
- ;;
- esac])
-
-AC_ARG_WITH(piddir,
-[AS_HELP_STRING([--with-piddir=DIR],
- [Where to put pid files ($localstatedir/run)])],
-[ case "$withval" in
- yes|no)
- #
- # Just in case anybody calls it without argument
- #
- AC_MSG_WARN([--with-piddir called without argument - will use default])
- ;;
- * )
- PIDDIR="$withval"
- ;;
- esac])
-
-AC_ARG_WITH(statedir,
-[AS_HELP_STRING([--with-statedir=DIR],
- [Where to put persistent state files ($localstatedir/locks)])],
-[ case "$withval" in
- yes|no)
- #
- # Just in case anybody calls it without argument
- #
- AC_MSG_WARN([--with-statedir called without argument - will use default])
- ;;
- * )
- STATEDIR="$withval"
- ;;
- esac])
-
-AC_ARG_WITH(cachedir,
-[AS_HELP_STRING([--with-cachedir=DIR],
- [Where to put temporary cache files ($localstatedir/cache)])],
-[ case "$withval" in
- yes|no)
- #
- # Just in case anybody calls it without argument
- #
- AC_MSG_WARN([--with-cachedir called without argument - will use default])
- ;;
- * )
- CACHEDIR="$withval"
- ;;
- esac])
-
-AC_ARG_WITH(logfilebase,
-[AS_HELP_STRING([--with-logfilebase=DIR],
- [Where to put log files ($localstatedir)])],
-[ case "$withval" in
- yes|no)
- #
- # Just in case anybody calls it without argument
- #
- AC_MSG_WARN([--with-logfilebase called without argument - will use default])
- ;;
- * )
- LOGFILEBASE="$withval"
- ;;
- esac])
-
-AC_ARG_WITH(sockets-dir,
-[AS_HELP_STRING([--with-sockets-dir=DIR],
- [socket directory ($localstatedir/run)])],
-[ case "$withval" in
- yes|no)
- #
- # Just in case anybody calls it without argument
- #
- AC_MSG_WARN([--with-sockets-dir called without argument - will use default])
- ;;
- * )
- SOCKET_DIR="$withval"
- ;;
- esac])
-
-AC_ARG_WITH(privileged-socket-dir,
-[AS_HELP_STRING([--with-privileged-socket-dir=DIR],
- [privileged socket directory ($localstatedir/lib)])],
-[ case "$withval" in
- yes|no)
- #
- # Just in case anybody calls it without argument
- #
- AC_MSG_WARN([--with-sockets-dir called without argument - will use default])
- ;;
- * )
- PRIVILEGED_SOCKET_DIR="$withval"
- ;;
- esac])
-
-WINBINDD_SOCKET_DIR="${SOCKET_DIR}/winbindd"
-WINBINDD_PRIVILEGED_SOCKET_DIR="${PRIVILEGED_SOCKET_DIR}/winbindd_privileged"
-
-AC_ARG_WITH(winbind-socket-dir,
-[AS_HELP_STRING([--with-winbind-socket-dir=DIR],
- [winbnd socket directory ($localstatedir/run/winbindd)])],
-[ case "$withval" in
- yes|no)
- #
- # Just in case anybody calls it without argument
- #
- AC_MSG_WARN([--with-winbind-socket-dir called without argument - will use default])
- ;;
- * )
- WINBINDD_SOCKET_DIR="$withval"
- ;;
- esac])
-
-AC_ARG_WITH(winbind-privileged-socket-dir,
-[AS_HELP_STRING([--with-winbind-privileged-socket-dir=DIR],
- [winbind privileged socket directory ($localstatedir/lib/winbindd)])],
-[ case "$withval" in
- yes|no)
- #
- # Just in case anybody calls it without argument
- #
- AC_MSG_WARN([--with-winbind-privileged-socket-dir called without argument - will use default])
- ;;
- * )
- WINBINDD_PRIVILEGED_SOCKET_DIR="$withval"
- ;;
- esac])
-
-NMBDSOCKETDIR="${SOCKET_DIR}/nmbd"
-NTP_SIGND_SOCKET_DIR="${SOCKET_DIR}/ntp_signd"
-NCALRPCDIR="${SOCKET_DIR}/ncalrpc"
-CONFIGFILE="${CONFIGDIR}/smb.conf"
-LMHOSTSFILE="${CONFIGDIR}/lmhosts"
-SMB_PASSWD_FILE="${PRIVATE_DIR}/smbpasswd"
-
-AC_SUBST(BINDIR)
-AC_SUBST(SBINDIR)
-AC_SUBST(LIBDIR)
-AC_SUBST(LIBEXECDIR)
-AC_SUBST(MANDIR)
-AC_SUBST(DATADIR)
-AC_SUBST(LOCALEDIR)
-AC_SUBST(SCRIPTSBINDIR)
-dnl AC_SUBST(PYTHONDIR)
-dnl AC_SUBST(PYTHONARCHDIR)
-AC_SUBST(MODULESDIR)
-AC_SUBST(INCLUDEDIR)
-AC_SUBST(SETUPDIR)
-AC_SUBST(PKGCONFIGDIR)
-AC_SUBST(CODEPAGEDIR)
-AC_SUBST(PAMMODULESDIR)
-AC_SUBST(CONFIGDIR)
-AC_SUBST(PRIVATE_DIR)
-AC_SUBST(LOCKDIR)
-AC_SUBST(PIDDIR)
-AC_SUBST(STATEDIR)
-AC_SUBST(CACHEDIR)
-AC_SUBST(LOGFILEBASE)
-AC_SUBST(SOCKET_DIR)
-AC_SUBST(PRIVILEGED_SOCKET_DIR)
-AC_SUBST(WINBINDD_SOCKET_DIR)
-AC_SUBST(WINBINDD_PRIVILEGED_SOCKET_DIR)
-AC_SUBST(NMBDSOCKETDIR)
-AC_SUBST(NTP_SIGND_SOCKET_DIR)
-AC_SUBST(NCALRPCDIR)
-AC_SUBST(CONFIGFILE)
-AC_SUBST(LMHOSTSFILE)
-AC_SUBST(SMB_PASSWD_FILE)
-
diff --git a/dynconfig/dynconfig.c b/dynconfig/dynconfig.c
index 9fd7108..5f67278 100644
--- a/dynconfig/dynconfig.c
+++ b/dynconfig/dynconfig.c
@@ -106,19 +106,8 @@ DEFINE_DYN_CONFIG_PARAM(DATADIR)
DEFINE_DYN_CONFIG_PARAM(SETUPDIR)
DEFINE_DYN_CONFIG_PARAM(WINBINDD_SOCKET_DIR) /* from winbind_struct_protocol.h in s3 autoconf */
-/* these are not used in s3 */
-#ifdef WINBINDD_PRIVILEGED_SOCKET_DIR
DEFINE_DYN_CONFIG_PARAM(WINBINDD_PRIVILEGED_SOCKET_DIR)
-#endif
-#ifdef NTP_SIGND_SOCKET_DIR
DEFINE_DYN_CONFIG_PARAM(NTP_SIGND_SOCKET_DIR)
-#endif
-#ifdef PYTHONDIR
DEFINE_DYN_CONFIG_PARAM(PYTHONDIR)
-#endif
-#ifdef PYTHONARCHDIR
DEFINE_DYN_CONFIG_PARAM(PYTHONARCHDIR)
-#endif
-#ifdef SCRIPTSBINDIR
DEFINE_DYN_CONFIG_PARAM(SCRIPTSBINDIR)
-#endif
diff --git a/examples/VFS/Makefile.in b/examples/VFS/Makefile.in
deleted file mode 100644
index ba41923..0000000
--- a/examples/VFS/Makefile.in
+++ /dev/null
@@ -1,72 +0,0 @@
-CC = @CC@
-CFLAGS = @CFLAGS@
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-LDSHFLAGS = @LDSHFLAGS@
-INSTALLCMD = @INSTALL@
-SAMBA_SOURCE = @SAMBA_SOURCE@
-SHLIBEXT = @SHLIBEXT@
-OBJEXT = @OBJEXT@
-FLAGS = $(CFLAGS) $(CPPFLAGS) -fPIC \
- -Iinclude -I$(SAMBA_SOURCE)/include \
--
Samba Shared Repository
More information about the samba-cvs
mailing list