metze/samba/wip.git
13 years agos3:net: remove unused net_idmap_help
Gregor Beck [Fri, 28 Jan 2011 09:58:03 +0000 (10:58 +0100)]
s3:net: remove unused net_idmap_help

Signed-off-by: Michael Adam <obnox@samba.org>
Autobuild-User: Michael Adam <obnox@samba.org>
Autobuild-Date: Tue Feb  8 11:50:37 CET 2011 on sn-devel-104

13 years agos3: Added file for clang complete support in vim.
Andreas Schneider [Mon, 7 Feb 2011 17:06:40 +0000 (18:06 +0100)]
s3: Added file for clang complete support in vim.

Autobuild-User: Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date: Tue Feb  8 10:40:42 CET 2011 on sn-devel-104

13 years agos3: Added missing files in .gitignore.
Andreas Schneider [Mon, 7 Feb 2011 17:06:04 +0000 (18:06 +0100)]
s3: Added missing files in .gitignore.

13 years agolibndr: share some uuid helpers.
Günther Deschner [Mon, 7 Feb 2011 23:04:20 +0000 (00:04 +0100)]
libndr: share some uuid helpers.

Guenther

Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Tue Feb  8 09:52:56 CET 2011 on sn-devel-104

13 years agondr: merge ndr_map_error2string and ndr_errstr.
Günther Deschner [Mon, 7 Feb 2011 22:27:57 +0000 (23:27 +0100)]
ndr: merge ndr_map_error2string and ndr_errstr.

Guenther

13 years agondr: move null_ndr_syntax_id to the common libndr location.
Günther Deschner [Mon, 7 Feb 2011 22:21:41 +0000 (23:21 +0100)]
ndr: move null_ndr_syntax_id to the common libndr location.

Guenther

13 years agondr: merge duplicate ndr_map_error2ntstatus() functions.
Günther Deschner [Fri, 28 Jan 2011 22:38:21 +0000 (23:38 +0100)]
ndr: merge duplicate ndr_map_error2ntstatus() functions.

Guenther

13 years agoIf possible (O_DIRECTORY exists) open an fd for a directory open.
Jeremy Allison [Tue, 8 Feb 2011 04:46:36 +0000 (20:46 -0800)]
If possible (O_DIRECTORY exists) open an fd for a directory open.

Start of the move towards handle-based code for directory access.
Currently makes fstat/fchown code work for directories rather than
falling back to pathnames.

Jeremy.

Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Tue Feb  8 06:34:41 CET 2011 on sn-devel-104

13 years agoUse corrcet function instead of cut-and-paste code.
Jeremy Allison [Tue, 8 Feb 2011 01:34:22 +0000 (17:34 -0800)]
Use corrcet function instead of cut-and-paste code.

Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Tue Feb  8 03:23:40 CET 2011 on sn-devel-104

13 years agoFix leak in error path.
Jeremy Allison [Tue, 8 Feb 2011 01:33:26 +0000 (17:33 -0800)]
Fix leak in error path.

13 years agomit-samba: Allow nesting on the event context
Simo Sorce [Fri, 4 Feb 2011 01:51:45 +0000 (20:51 -0500)]
mit-samba: Allow nesting on the event context

This context is used in ldb, and ldb modules apparently abort if nesting is not
allowed.

Autobuild-User: Simo Sorce <idra@samba.org>
Autobuild-Date: Mon Feb  7 20:58:02 CET 2011 on sn-devel-104

13 years agolibcli/security: Make add_sid_to_array_unique use a uin32_t counter
Volker Lendecke [Thu, 3 Feb 2011 12:23:50 +0000 (05:23 -0700)]
libcli/security: Make add_sid_to_array_unique use a uin32_t counter

Logical consequence of the previous commit

Signed-off-by: Michael Adam <obnox@samba.org>
Autobuild-User: Michael Adam <obnox@samba.org>
Autobuild-Date: Mon Feb  7 19:24:19 CET 2011 on sn-devel-104

13 years agolibcli/security: Make del_sid_from_array take a uint32_t
Volker Lendecke [Thu, 3 Feb 2011 12:22:36 +0000 (05:22 -0700)]
libcli/security: Make del_sid_from_array take a uint32_t

This aligns it with add_sid_to_array

Signed-off-by: Michael Adam <obnox@samba.org>
13 years agos3:net conf: fix a comment typo
Michael Adam [Mon, 7 Feb 2011 12:30:11 +0000 (13:30 +0100)]
s3:net conf: fix a comment typo

13 years agoscript/autobuild.py: git diff has a '--stat' option, no need to use 'diffstat'
Stefan Metzmacher [Mon, 7 Feb 2011 12:48:08 +0000 (13:48 +0100)]
script/autobuild.py: git diff has a '--stat' option, no need to use 'diffstat'

metze

Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Mon Feb  7 14:55:10 CET 2011 on sn-devel-104

13 years agos3-waf: add --with-automount option.
Günther Deschner [Mon, 7 Feb 2011 12:21:35 +0000 (13:21 +0100)]
s3-waf: add --with-automount option.

Guenther

Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Mon Feb  7 14:11:03 CET 2011 on sn-devel-104

13 years agowaf: add clock_gettime clock ID checks to libreplace wscript.
Günther Deschner [Mon, 7 Feb 2011 12:12:17 +0000 (13:12 +0100)]
waf: add clock_gettime clock ID checks to libreplace wscript.

Guenther

13 years agos3-waf: fix wrong check for vfs_aio_fork dependencies.
Günther Deschner [Mon, 7 Feb 2011 11:38:48 +0000 (12:38 +0100)]
s3-waf: fix wrong check for vfs_aio_fork dependencies.

Guenther

13 years agos3-waf: fix the build after winreg and rpc services changes. master4-s3upgrade
Günther Deschner [Thu, 3 Feb 2011 11:25:24 +0000 (12:25 +0100)]
s3-waf: fix the build after winreg and rpc services changes.

Andreas, please check.

Guenther

Signed-off-by: Günther Deschner <gd@samba.org>
Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Mon Feb  7 13:18:41 CET 2011 on sn-devel-104

13 years agos3-perfcount: Create the directory on tdb open.
Andreas Schneider [Wed, 2 Feb 2011 10:47:37 +0000 (11:47 +0100)]
s3-perfcount: Create the directory on tdb open.

Signed-off-by: Günther Deschner <gd@samba.org>
13 years agos3-rpc_server: Migrated spoolss to dcerpc_winreg_set_multi_sz.
Andreas Schneider [Tue, 1 Feb 2011 14:33:02 +0000 (15:33 +0100)]
s3-rpc_server: Migrated spoolss to dcerpc_winreg_set_multi_sz.

Signed-off-by: Günther Deschner <gd@samba.org>
13 years agos3-rpc_server: Migrated spoolss to dcerpc_winreg_query_dword.
Andreas Schneider [Tue, 1 Feb 2011 14:29:48 +0000 (15:29 +0100)]
s3-rpc_server: Migrated spoolss to dcerpc_winreg_query_dword.

Signed-off-by: Günther Deschner <gd@samba.org>
13 years agos3-rpc_server: Migrated spoolss to dcerpc_winreg_set_X.
Andreas Schneider [Tue, 1 Feb 2011 14:25:13 +0000 (15:25 +0100)]
s3-rpc_server: Migrated spoolss to dcerpc_winreg_set_X.

Signed-off-by: Günther Deschner <gd@samba.org>
13 years agos3-rpc_server: Migrated spoolss to dcerpc_winreg_set_X.
Andreas Schneider [Tue, 1 Feb 2011 14:11:05 +0000 (15:11 +0100)]
s3-rpc_server: Migrated spoolss to dcerpc_winreg_set_X.

Signed-off-by: Günther Deschner <gd@samba.org>
13 years agos3-rpc_server: Migrated spoolss to dcerpc_winreg_set_dword.
Andreas Schneider [Tue, 1 Feb 2011 13:58:08 +0000 (14:58 +0100)]
s3-rpc_server: Migrated spoolss to dcerpc_winreg_set_dword.

Signed-off-by: Günther Deschner <gd@samba.org>
13 years agos3-rpc_server: Migrated spoolss to dcerpc_winreg_set_sz..
Andreas Schneider [Tue, 1 Feb 2011 13:48:11 +0000 (14:48 +0100)]
s3-rpc_server: Migrated spoolss to dcerpc_winreg_set_sz..

Signed-off-by: Günther Deschner <gd@samba.org>
13 years agos3-rpc_server: Migrated spoolss to dcerpc_winreg_enum_keys.
Andreas Schneider [Tue, 1 Feb 2011 13:28:39 +0000 (14:28 +0100)]
s3-rpc_server: Migrated spoolss to dcerpc_winreg_enum_keys.

Signed-off-by: Günther Deschner <gd@samba.org>
13 years agos3-services: Remove obsolete services_db.c.
Andreas Schneider [Tue, 1 Feb 2011 12:38:16 +0000 (13:38 +0100)]
s3-services: Remove obsolete services_db.c.

Signed-off-by: Günther Deschner <gd@samba.org>
13 years agos3-smbd: Init the svcctl registry keys on service startup.
Andreas Schneider [Tue, 1 Feb 2011 10:50:10 +0000 (11:50 +0100)]
s3-smbd: Init the svcctl registry keys on service startup.

Signed-off-by: Günther Deschner <gd@samba.org>
13 years agos3-rpc_server: Added a winreg based svcctl registry init.
Andreas Schneider [Mon, 31 Jan 2011 15:40:16 +0000 (16:40 +0100)]
s3-rpc_server: Added a winreg based svcctl registry init.

Signed-off-by: Günther Deschner <gd@samba.org>
13 years agos3-rpc_server: Added a svcctl shutdown function.
Andreas Schneider [Tue, 1 Feb 2011 10:49:33 +0000 (11:49 +0100)]
s3-rpc_server: Added a svcctl shutdown function.

Signed-off-by: Günther Deschner <gd@samba.org>
13 years agos3-services: Migrated svcctl registry functions to winreg.
Andreas Schneider [Mon, 31 Jan 2011 15:40:33 +0000 (16:40 +0100)]
s3-services: Migrated svcctl registry functions to winreg.

This is a bigger commit. It moves the relevant function to
svc_winreg_glue. We need to use them in the same commit else we have
problems with prototypes in proto.h.

Signed-off-by: Günther Deschner <gd@samba.org>
13 years agos3-registry: Remove obsolete reg_eventlog.
Andreas Schneider [Fri, 28 Jan 2011 11:37:18 +0000 (12:37 +0100)]
s3-registry: Remove obsolete reg_eventlog.

Signed-off-by: Günther Deschner <gd@samba.org>
13 years agos3-smbd: Init the eventlog registry on service startup.
Andreas Schneider [Fri, 28 Jan 2011 11:33:20 +0000 (12:33 +0100)]
s3-smbd: Init the eventlog registry on service startup.

Signed-off-by: Günther Deschner <gd@samba.org>
13 years agos3-util: Moved eventlog_add_source to admin util.
Andreas Schneider [Thu, 27 Jan 2011 17:06:16 +0000 (18:06 +0100)]
s3-util: Moved eventlog_add_source to admin util.

This function is only used in the admin util.

Signed-off-by: Günther Deschner <gd@samba.org>
13 years agos3-rpc_server: Added a winreg based eventlog registry init.
Andreas Schneider [Thu, 27 Jan 2011 18:22:02 +0000 (19:22 +0100)]
s3-rpc_server: Added a winreg based eventlog registry init.

This enumerates the keys first and only creates them if they don't exist
yet.

Signed-off-by: Günther Deschner <gd@samba.org>
13 years agos3-rpc_server: Migrated eventlog to winreg.
Andreas Schneider [Thu, 27 Jan 2011 14:32:48 +0000 (15:32 +0100)]
s3-rpc_server: Migrated eventlog to winreg.

Signed-off-by: Günther Deschner <gd@samba.org>
13 years agos3-rpc_client: Added a winreg query security descriptor helper.
Andreas Schneider [Tue, 1 Feb 2011 10:04:16 +0000 (11:04 +0100)]
s3-rpc_client: Added a winreg query security descriptor helper.

Signed-off-by: Günther Deschner <gd@samba.org>
13 years agos3-rpc_client: Added a winreg set security descriptor helper.
Andreas Schneider [Mon, 31 Jan 2011 17:40:06 +0000 (18:40 +0100)]
s3-rpc_client: Added a winreg set security descriptor helper.

Signed-off-by: Günther Deschner <gd@samba.org>
13 years agos3-rpc_client: Added a winreg set binary helper.
Andreas Schneider [Mon, 31 Jan 2011 17:35:06 +0000 (18:35 +0100)]
s3-rpc_client: Added a winreg set binary helper.

Signed-off-by: Günther Deschner <gd@samba.org>
13 years agos3-rpc_client: Added a winreg query sz helper.
Andreas Schneider [Mon, 31 Jan 2011 15:39:34 +0000 (16:39 +0100)]
s3-rpc_client: Added a winreg query sz helper.

Signed-off-by: Günther Deschner <gd@samba.org>
13 years agos3-rpc_client: Added a winreg helper to enum keys.
Andreas Schneider [Fri, 28 Jan 2011 11:08:58 +0000 (12:08 +0100)]
s3-rpc_client: Added a winreg helper to enum keys.

Signed-off-by: Günther Deschner <gd@samba.org>
13 years agos3-rpc_client: Added a winreg add multi sz helper.
Andreas Schneider [Fri, 28 Jan 2011 09:43:49 +0000 (10:43 +0100)]
s3-rpc_client: Added a winreg add multi sz helper.

Signed-off-by: Günther Deschner <gd@samba.org>
13 years agos3-rpc_client: Added a winreg query multi sz helper.
Andreas Schneider [Fri, 28 Jan 2011 09:07:57 +0000 (10:07 +0100)]
s3-rpc_client: Added a winreg query multi sz helper.

Signed-off-by: Günther Deschner <gd@samba.org>
13 years agos3-rpc_client: Added a winreg set multi sz helper.
Andreas Schneider [Fri, 28 Jan 2011 08:57:41 +0000 (09:57 +0100)]
s3-rpc_client: Added a winreg set multi sz helper.

Signed-off-by: Günther Deschner <gd@samba.org>
13 years agos3-rpc_client: Added a winreg set expand sz helper.
Andreas Schneider [Fri, 28 Jan 2011 08:50:48 +0000 (09:50 +0100)]
s3-rpc_client: Added a winreg set expand sz helper.

Signed-off-by: Günther Deschner <gd@samba.org>
13 years agos3-rpc_client: Added a winreg set sz helper.
Andreas Schneider [Fri, 28 Jan 2011 08:45:44 +0000 (09:45 +0100)]
s3-rpc_client: Added a winreg set sz helper.

Signed-off-by: Günther Deschner <gd@samba.org>
13 years agos3-rpc_client: Added a winreg set dword helper.
Andreas Schneider [Thu, 27 Jan 2011 15:57:34 +0000 (16:57 +0100)]
s3-rpc_client: Added a winreg set dword helper.

Signed-off-by: Günther Deschner <gd@samba.org>
13 years agos3-rpc_client: Added winreg query binary helper.
Andreas Schneider [Thu, 27 Jan 2011 15:20:30 +0000 (16:20 +0100)]
s3-rpc_client: Added winreg query binary helper.

Signed-off-by: Günther Deschner <gd@samba.org>
13 years agos3-rpc_client: Added winreg query dword helper.
Andreas Schneider [Thu, 27 Jan 2011 14:20:58 +0000 (15:20 +0100)]
s3-rpc_client: Added winreg query dword helper.

Signed-off-by: Günther Deschner <gd@samba.org>
13 years agos3-rpc_client: Added dcerpc_winreg_int_openkey().
Andreas Schneider [Thu, 27 Jan 2011 11:27:23 +0000 (12:27 +0100)]
s3-rpc_client: Added dcerpc_winreg_int_openkey().

Signed-off-by: Günther Deschner <gd@samba.org>
13 years agos3-waf: add support for --with-aio-support.
Günther Deschner [Mon, 7 Feb 2011 10:40:06 +0000 (11:40 +0100)]
s3-waf: add support for --with-aio-support.

Guenther

Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Mon Feb  7 12:30:57 CET 2011 on sn-devel-104

13 years agos3-waf: only build auth_netlogond in developer build.
Günther Deschner [Mon, 7 Feb 2011 10:39:42 +0000 (11:39 +0100)]
s3-waf: only build auth_netlogond in developer build.

Volker, please check.

Guenther

13 years agos3:rpc_server: fix make_external_rpc_pipe_p() and create read and write queues
Stefan Metzmacher [Mon, 7 Feb 2011 09:29:55 +0000 (10:29 +0100)]
s3:rpc_server: fix make_external_rpc_pipe_p() and create read and write queues

They are needed for the callers in rpc_server/srv_pipe_hnd.c.

It seems I only looked at the caller in rpc_server/rpc_ncacn_np.c
when I've done the change of commit e55426fe7926ae6f8afe5fa6cfc009e0c3b54e38.

Thanks Volker for finding this :-)

metze

Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Mon Feb  7 11:40:20 CET 2011 on sn-devel-104

13 years agos3-waf: add --with-syslog option.
Günther Deschner [Fri, 4 Feb 2011 16:42:10 +0000 (17:42 +0100)]
s3-waf: add --with-syslog option.

Guenther

Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Mon Feb  7 10:50:39 CET 2011 on sn-devel-104

13 years agos3-netlogon: fix typo.
Günther Deschner [Fri, 4 Feb 2011 16:31:13 +0000 (17:31 +0100)]
s3-netlogon: fix typo.

Guenther

13 years agos3-waf: recurse into ../lib/util/wscript_configure
Günther Deschner [Fri, 4 Feb 2011 16:27:26 +0000 (17:27 +0100)]
s3-waf: recurse into ../lib/util/wscript_configure

This gets us all the statvfs checks.

Guenther

13 years agos3-waf: add support for iprint.
Günther Deschner [Fri, 4 Feb 2011 15:49:30 +0000 (16:49 +0100)]
s3-waf: add support for iprint.

Guenther

13 years agos4-build: fixed uses of os.path.relpath()
Andrew Tridgell [Mon, 7 Feb 2011 04:03:26 +0000 (15:03 +1100)]
s4-build: fixed uses of os.path.relpath()

these should be os_path_relpath() to support older python versions.
This should fix the build on FreeBSD 7.2

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>

Autobuild-User: Andrew Tridgell <tridge@samba.org>
Autobuild-Date: Mon Feb  7 05:49:58 CET 2011 on sn-devel-104

13 years agobuild: removed unused build scripts
Andrew Tridgell [Mon, 7 Feb 2011 03:55:18 +0000 (14:55 +1100)]
build: removed unused build scripts

each library has its own configure/Makefile now

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>

13 years agobuild: removed the old autogen.sh and autogen-waf.sh scripts
Andrew Tridgell [Mon, 7 Feb 2011 03:50:30 +0000 (14:50 +1100)]
build: removed the old autogen.sh and autogen-waf.sh scripts

for the builds that use waf only, these are no longer needed and just
cause confusion

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>

13 years agobuild: fixed error message for incorrect waf version
Andrew Tridgell [Mon, 7 Feb 2011 03:43:52 +0000 (14:43 +1100)]
build: fixed error message for incorrect waf version

just need configure now

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>

13 years agoautobuild: lib/replace doesn't need autogen.sh
Andrew Tridgell [Mon, 7 Feb 2011 03:42:09 +0000 (14:42 +1100)]
autobuild: lib/replace doesn't need autogen.sh

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>

13 years agos3-torture: switch source3 to using top level samba4 build for smbtorture
Andrew Tridgell [Mon, 7 Feb 2011 02:57:57 +0000 (13:57 +1100)]
s3-torture: switch source3 to using top level samba4 build for smbtorture

this is in preparation for removing the source4/ build

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>

13 years agos4-build: remove a bunch of unused build scripts
Andrew Tridgell [Mon, 7 Feb 2011 02:18:43 +0000 (13:18 +1100)]
s4-build: remove a bunch of unused build scripts

these were leftover from the autoconf build

Autobuild-User: Andrew Tridgell <tridge@samba.org>
Autobuild-Date: Mon Feb  7 04:09:40 CET 2011 on sn-devel-104

13 years agos4-charset: use dyn_CODEPAGEDIR for location of upcase.dat/lowcase.dat
Andrew Tridgell [Mon, 7 Feb 2011 02:13:44 +0000 (13:13 +1100)]
s4-charset: use dyn_CODEPAGEDIR for location of upcase.dat/lowcase.dat

this matches samba3 behaviour

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>

13 years agos4-provision: added setup_path() import in two more places
Andrew Tridgell [Mon, 7 Feb 2011 00:54:31 +0000 (11:54 +1100)]
s4-provision: added setup_path() import in two more places

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>

13 years agoautobuild: fixed clone source for build trees
Andrew Tridgell [Mon, 7 Feb 2011 00:43:03 +0000 (11:43 +1100)]
autobuild: fixed clone source for build trees

this fixes a bug where autobuild would test the tree that the user
pushed, not the tree that has been rebased on master. That could cause
broken trees to get into master. Andrew Bartlett noticed this with a
tree from Jan 19th.

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>

13 years agoautobuild: add a bit more debug info in autobuild
Andrew Tridgell [Mon, 7 Feb 2011 00:41:21 +0000 (11:41 +1100)]
autobuild: add a bit more debug info in autobuild

this may help to track down rebase problems in future

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>

13 years agoautobuild: decouple build directories from target names
Andrew Tridgell [Sun, 6 Feb 2011 23:05:32 +0000 (10:05 +1100)]
autobuild: decouple build directories from target names

this allows us to use 'samba4' as the tag, but build in '.'

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>

13 years agos4-wintest Use top level build for wintest
Andrew Bartlett [Sat, 5 Feb 2011 08:14:38 +0000 (19:14 +1100)]
s4-wintest Use top level build for wintest

13 years agos4-python: get ordering right on python paths
Andrew Tridgell [Sun, 6 Feb 2011 22:45:26 +0000 (09:45 +1100)]
s4-python: get ordering right on python paths

we need to have PYTHONARCHDIR first, as that is where we currently
install. That will minimise problems with upgrades from old installs.

We also don't need to add the path twice if PYTHONDIR is the same as
PYTHONARCHDIR (as happens on debian based systems)

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>

13 years agos4-python Don't force "bin" into the python sys.path
Andrew Bartlett [Sat, 5 Feb 2011 07:00:45 +0000 (18:00 +1100)]
s4-python Don't force "bin" into the python sys.path

This patch uses the fact that dyn_PYTHONDIR and dyn_PYTHONARCHDIR is
now set properly at all times, incluidng for installed and
build-directory binaries.  So we don't need to make assumptions about
bin being magic any more.

Andrew Bartlett

13 years agos4-waf Add PYTHONDIR and PYTHONARCHDIR to the 'different on install' list
Andrew Bartlett [Sat, 5 Feb 2011 07:27:33 +0000 (18:27 +1100)]
s4-waf Add PYTHONDIR and PYTHONARCHDIR to the 'different on install' list

This allows the C code to rely on PYTHONDIR and PYTHONARCHDIR to
always be correct, and so not to cause problems when forcing these
into sys.path.

Andrew Bartlett

13 years agos4-provision Remove setup_path, setup_dir and find_setup_dir
Andrew Bartlett [Fri, 4 Feb 2011 23:34:51 +0000 (10:34 +1100)]
s4-provision Remove setup_path, setup_dir and find_setup_dir

We now have a reliable way to know the current location of the
templates: dyn_SETUPDIR, which is updated for both the in-build and
installed binaries.

This replaces the function arguments and the distributed resolution of
the setup directory with one 'global' function (imported as required).

This also removes the ability to specify an alternate setup directory
on the command line, as this was rarely if ever used and never tested.

Andrew Bartlett

13 years agos4-waf Don't include ../librpc in paths
Andrew Bartlett [Fri, 4 Feb 2011 04:28:32 +0000 (15:28 +1100)]
s4-waf Don't include ../librpc in paths

The paths here are relative to the librpc directory the wscript_build
file is in, and so these don't actually change anything.

Andrew Bartlett

13 years agos4-build: fixed install of version.h from source4 build
Andrew Tridgell [Sat, 5 Feb 2011 02:26:44 +0000 (13:26 +1100)]
s4-build: fixed install of version.h from source4 build

13 years agos4-upgradeprovision: renames need a relax to avoid subtree_rename checks
Andrew Tridgell [Fri, 4 Feb 2011 00:05:40 +0000 (11:05 +1100)]
s4-upgradeprovision: renames need a relax to avoid subtree_rename checks

13 years agos4-dsdb: make subtree_rename errors clearer
Andrew Tridgell [Fri, 4 Feb 2011 00:05:17 +0000 (11:05 +1100)]
s4-dsdb: make subtree_rename errors clearer

13 years agobuild: fixed make install for top level build
Andrew Tridgell [Thu, 3 Feb 2011 23:22:45 +0000 (10:22 +1100)]
build: fixed make install for top level build

13 years agos4-provision: removed spurious os.chdir() from upgradehelpers.py
Andrew Tridgell [Thu, 3 Feb 2011 22:51:38 +0000 (09:51 +1100)]
s4-provision: removed spurious os.chdir() from upgradehelpers.py

this breaks make test with a top level build, and is not needed

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>

13 years agobuild: fixed top level etags and ctags target
Andrew Tridgell [Thu, 3 Feb 2011 22:49:39 +0000 (09:49 +1100)]
build: fixed top level etags and ctags target

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>

13 years agos4-test: fixed samba4.policy.python test for top level build
Andrew Tridgell [Thu, 3 Feb 2011 22:49:17 +0000 (09:49 +1100)]
s4-test: fixed samba4.policy.python test for top level build

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>

13 years agos4-test: fixed ndrdump test for top level build
Andrew Tridgell [Thu, 3 Feb 2011 22:48:35 +0000 (09:48 +1100)]
s4-test: fixed ndrdump test for top level build

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>

13 years agobuild: added placeholder to ensure include/ is available in build dir
Andrew Tridgell [Thu, 3 Feb 2011 06:44:41 +0000 (17:44 +1100)]
build: added placeholder to ensure include/ is available in build dir

13 years agobuild: added configure.developer for top level build
Andrew Tridgell [Thu, 3 Feb 2011 06:42:37 +0000 (17:42 +1100)]
build: added configure.developer for top level build

13 years agos4-test: fixed hard coded test paths for top level build
Andrew Tridgell [Thu, 3 Feb 2011 06:36:36 +0000 (17:36 +1100)]
s4-test: fixed hard coded test paths for top level build

this fixes the various test plans that hard coded incorrect paths for
a top level build

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>

13 years agos4-test: fixed setup/ assumption for top level build
Andrew Tridgell [Thu, 3 Feb 2011 06:35:54 +0000 (17:35 +1100)]
s4-test: fixed setup/ assumption for top level build

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>

13 years agos4-test: fixed test_samba4.pl for top level build
Andrew Tridgell [Thu, 3 Feb 2011 06:35:13 +0000 (17:35 +1100)]
s4-test: fixed test_samba4.pl for top level build

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>

13 years agos4-dynconfig: fixed dyn_SETUPDIR to point to the right directory
Andrew Tridgell [Thu, 3 Feb 2011 06:34:51 +0000 (17:34 +1100)]
s4-dynconfig: fixed dyn_SETUPDIR to point to the right directory

this make dyn_SETUPDIR correct for both source4/ build and a top level
build

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>

13 years agos4-loadparm: removed "setup directory" option
Andrew Tridgell [Thu, 3 Feb 2011 06:32:55 +0000 (17:32 +1100)]
s4-loadparm: removed "setup directory" option

the correct setup directory is known at both build time and install
time using dyn_SETUPDIR, so we no longer have any need to override it

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>

13 years agos4-test: fixed more assumptions of ./setup for setup directory
Andrew Tridgell [Thu, 3 Feb 2011 06:31:37 +0000 (17:31 +1100)]
s4-test: fixed more assumptions of ./setup for setup directory

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>

13 years agoblackbox: removed assumption of build directory
Andrew Tridgell [Thu, 3 Feb 2011 06:30:53 +0000 (17:30 +1100)]
blackbox: removed assumption of build directory

this fixes the blackbox tests for a top level build

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>

13 years agos4-test: allow make test to work from top level directory
Andrew Tridgell [Thu, 3 Feb 2011 04:14:31 +0000 (15:14 +1100)]
s4-test: allow make test to work from top level directory

this fixes the path assumptions in Samba4 make test to allow it to
work from the top level directory.

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>

13 years agos4-provision: cope with top level directory for provision
Andrew Tridgell [Thu, 3 Feb 2011 02:49:29 +0000 (13:49 +1100)]
s4-provision: cope with top level directory for provision

to allow for top level 'make test' we need to cope with two in-tree
directory layouts

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>

13 years agowaf: added top level build rules
Andrew Tridgell [Thu, 3 Feb 2011 02:08:37 +0000 (13:08 +1100)]
waf: added top level build rules

This adds build rules for the top level directory based on the ones
from source4.

This is an intermediate step towards a combined top level build which
will build both the Samba3 (bin/smbd, bin/nmbd etc) and Samba4
(bin/samba) binaries from a single build

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>

13 years agos4-idl: make the source4 idl build independent of build directory
Andrew Tridgell [Thu, 3 Feb 2011 02:06:55 +0000 (13:06 +1100)]
s4-idl: make the source4 idl build independent of build directory

this allows the source4 idl to be built from any top level directory

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>

13 years agos4-heimdal: allow heimdal build scripts to work from top level
Andrew Tridgell [Thu, 3 Feb 2011 02:06:16 +0000 (13:06 +1100)]
s4-heimdal: allow heimdal build scripts to work from top level

the version_script handling relied on the directory layout. This makes
it independent of the directory structure

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>

13 years agopidl: support using pidl from top level directory
Andrew Tridgell [Thu, 3 Feb 2011 02:05:18 +0000 (13:05 +1100)]
pidl: support using pidl from top level directory

pidl needs to know if it is being used within the samba tree or not,
to get the names of some include files right. This adds support for
using pidl in the top level directory of a Samba build

This change also makes it clear that is_intree() is a boolean
function. Previously it returned different values for Samba3 and
Samba4, but there is nothing that depends on that

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>

13 years agowaf: samba deps generation depends on EXTRA_INCLUDES
Andrew Tridgell [Thu, 3 Feb 2011 02:03:18 +0000 (13:03 +1100)]
waf: samba deps generation depends on EXTRA_INCLUDES