autobuild: intermittent test failure detected

2014-09-02 Thread autobuild
The autobuild test system has detected an intermittent failing test in 
the current master tree.

The autobuild log of the failure is available here:

   http://git.samba.org/autobuild.flakey/2014-09-02-0940/flakey.log

The samba build logs are available here:

   http://git.samba.org/autobuild.flakey/2014-09-02-0940/samba.stderr
   http://git.samba.org/autobuild.flakey/2014-09-02-0940/samba.stdout
  
The top commit at the time of the failure was:

commit eee14f775e6f2075729d68fa9598dd99f9b9b05d
Author: Stefan Metzmacher me...@samba.org
Date:   Wed Aug 27 15:13:30 2014 +0200

samba-tool/ldapcmp: update the list of non replicated attributes

Bug: https://bugzilla.samba.org/show_bug.cgi?id=10788

Signed-off-by: Stefan Metzmacher me...@samba.org
Reviewed-by: Andrew Bartlett abart...@samba.org

Autobuild-User(master): Andrew Bartlett abart...@samba.org
Autobuild-Date(master): Tue Sep  2 03:49:49 CEST 2014 on sn-devel-104


[SCM] Samba Shared Repository - branch master updated

2014-09-02 Thread Stefan Metzmacher
The branch, master has been updated
   via  b55a91e join.py: Set NT ACL on crossRef object for new partition
  from  eee14f7 samba-tool/ldapcmp: update the list of non replicated 
attributes

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit b55a91e9d297c74602d6bd5ef6d2676cf1bfbc75
Author: Andrew Bartlett abart...@samba.org
Date:   Fri Aug 22 14:16:30 2014 +1200

join.py: Set NT ACL on crossRef object for new partition

Change-Id: Icb1b00697cc5641481370ded26f2f0551a5b2a97
Pair-Programmed-With: Stefan Metzmacher me...@samba.org
Signed-off-by: Andrew Bartlett abart...@samba.org
Signed-off-by: Stefan Metzmacher me...@samba.org

Autobuild-User(master): Stefan Metzmacher me...@samba.org
Autobuild-Date(master): Tue Sep  2 14:15:54 CEST 2014 on sn-devel-104

---

Summary of changes:
 python/samba/descriptor.py |8 +++-
 python/samba/join.py   |   10 +++---
 2 files changed, 14 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/python/samba/descriptor.py b/python/samba/descriptor.py
index 164b0bf..86ea869 100644
--- a/python/samba/descriptor.py
+++ b/python/samba/descriptor.py
@@ -361,6 +361,13 @@ def get_dns_domain_microsoft_dns_descriptor(domain_sid, 
name_map={}):
 (A;CI;RPWPCRCCDCLCRCWOWDSDDTSW;;;ED)
 return sddl2binary(sddl, domain_sid, name_map)
 
+def get_paritions_crossref_subdomain_descriptor(domain_sid, name_map={}):
+sddl = O:SubdomainAdminsG:SubdomainAdminsD:AI \
+(A;;RPWPCRCCLCLORCWOWDSW;;;SubdomainAdmins)
+(A;;RPLCLORC;;;AU)
+(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;SY)
+return sddl2binary(sddl, domain_sid, name_map)
+
 def get_wellknown_sds(samdb):
 
 # Then subcontainers
@@ -427,7 +434,6 @@ def get_wellknown_sds(samdb):
 
 return subcontainers
 
-
 def chunck_acl(acl):
 Return separate ACE of an ACL
 
diff --git a/python/samba/join.py b/python/samba/join.py
index d9e5e8c..c356145 100644
--- a/python/samba/join.py
+++ b/python/samba/join.py
@@ -29,6 +29,7 @@ from samba.credentials import Credentials, DONT_USE_KERBEROS
 from samba.provision import secretsdb_self_join, provision, provision_fill, 
FILL_DRS, FILL_SUBDOMAIN
 from samba.provision.common import setup_path
 from samba.schema import Schema
+from samba import descriptor
 from samba.net import Net
 from samba.provision.sambadns import setup_bind9_dns
 from samba import read_and_sub_file
@@ -672,8 +673,8 @@ class dc_join(object):
 add the various objects needed for the join, for subdomains post 
replication
 
 print Adding %s % ctx.partition_dn
-# NOTE: windows sends a ntSecurityDescriptor here, we
-# let it default
+name_map = {'SubdomainAdmins': %s-%s % (str(ctx.domsid), 
security.DOMAIN_RID_ADMINS)}
+sd_binary = 
descriptor.get_paritions_crossref_subdomain_descriptor(ctx.forestsid, 
name_map=name_map)
 rec = {
 dn : ctx.partition_dn,
 objectclass : crossRef,
@@ -682,7 +683,10 @@ class dc_join(object):
 nETBIOSName : ctx.domain_name,
 dnsRoot: ctx.dnsdomain,
 trustParent : ctx.parent_partition_dn,
-systemFlags : 
str(samba.dsdb.SYSTEM_FLAG_CR_NTDS_NC|samba.dsdb.SYSTEM_FLAG_CR_NTDS_DOMAIN)}
+systemFlags : 
str(samba.dsdb.SYSTEM_FLAG_CR_NTDS_NC|samba.dsdb.SYSTEM_FLAG_CR_NTDS_DOMAIN),
+ntSecurityDescriptor : sd_binary,
+}
+
 if ctx.behavior_version = samba.dsdb.DS_DOMAIN_FUNCTION_2003:
 rec[msDS-Behavior-Version] = str(ctx.behavior_version)
 


-- 
Samba Shared Repository


autobuild: intermittent test failure detected

2014-09-02 Thread autobuild
The autobuild test system has detected an intermittent failing test in 
the current master tree.

The autobuild log of the failure is available here:

   http://git.samba.org/autobuild.flakey/2014-09-02-1542/flakey.log

The samba build logs are available here:

   http://git.samba.org/autobuild.flakey/2014-09-02-1542/samba.stderr
   http://git.samba.org/autobuild.flakey/2014-09-02-1542/samba.stdout
  
The top commit at the time of the failure was:

commit b55a91e9d297c74602d6bd5ef6d2676cf1bfbc75
Author: Andrew Bartlett abart...@samba.org
Date:   Fri Aug 22 14:16:30 2014 +1200

join.py: Set NT ACL on crossRef object for new partition

Change-Id: Icb1b00697cc5641481370ded26f2f0551a5b2a97
Pair-Programmed-With: Stefan Metzmacher me...@samba.org
Signed-off-by: Andrew Bartlett abart...@samba.org
Signed-off-by: Stefan Metzmacher me...@samba.org

Autobuild-User(master): Stefan Metzmacher me...@samba.org
Autobuild-Date(master): Tue Sep  2 14:15:54 CEST 2014 on sn-devel-104


[SCM] UID Wrapper Repository - branch master updated

2014-09-02 Thread Michael Adam
The branch, master has been updated
   via  45b044d TESTS: SYS_gettimeofday behaves differently on OS X
   via  a7ff27e TESTS: add -DOSX if building on OS X
   via  0322556 testsuite: Fix comparison
  from  1122f2a tests: Remove test with legacy access system call.

http://gitweb.samba.org/?p=uid_wrapper.git;a=shortlog;h=master


- Log -
commit 45b044d753eeb9ec15c7e3d58d9a2d20c1b1fe80
Author: Jakub Hrozek jakub.hro...@gmail.com
Date:   Sun Aug 24 00:52:26 2014 +0200

TESTS: SYS_gettimeofday behaves differently on OS X

SYS_gettimeofday returns the number of seconds on OS X and doesn't set
the tz parameter.

Signed-off-by: Jakub Hrozek jakub.hro...@gmail.com
Reviewed-by: Andreas Schneider a...@samba.org
Reviewed-by: Michael Adam ob...@samba.org

commit a7ff27e9889236776cd98fc04c15c733bf5250a5
Author: Jakub Hrozek jakub.hro...@gmail.com
Date:   Sun Aug 24 00:50:18 2014 +0200

TESTS: add -DOSX if building on OS X

We need some OS X specific branch in the tests.

Signed-off-by: Jakub Hrozek jakub.hro...@gmail.com
Reviewed-by: Andreas Schneider a...@samba.org
Reviewed-by: Michael Adam ob...@samba.org

commit 03225567bbb6cb34b395d878d48d81e57039c753
Author: Jakub Hrozek jakub.hro...@gmail.com
Date:   Sun Aug 24 00:54:18 2014 +0200

testsuite: Fix comparison

Signed-off-by: Jakub Hrozek jakub.hro...@gmail.com
Reviewed-by: Andreas Schneider a...@samba.org
Reviewed-by: Michael Adam ob...@samba.org

---

Summary of changes:
 tests/CMakeLists.txt |1 +
 tests/testsuite.c|8 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 9b1f4bb..7d54876 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -8,6 +8,7 @@ include_directories(
 
 if (OSX)
 set(TEST_ENVIRONMENT 
DYLD_FORCE_FLAT_NAMESPACE=1;DYLD_INSERT_LIBRARIES=${UID_WRAPPER_LOCATION};UID_WRAPPER=1)
+add_definitions(-DOSX)
 else ()
 set(TEST_ENVIRONMENT LD_PRELOAD=${UID_WRAPPER_LOCATION};UID_WRAPPER=1)
 endif ()
diff --git a/tests/testsuite.c b/tests/testsuite.c
index c88b051..1a053b1 100644
--- a/tests/testsuite.c
+++ b/tests/testsuite.c
@@ -203,12 +203,16 @@ static void test_uwrap_syscall(void **state)
rc = gettimeofday(tv1, tz1);
assert_int_equal(rc, 0);
 
+#ifdef OSX
+   tv2.tv_sec = syscall(SYS_gettimeofday, tv2, NULL);
+#else
rc = syscall(SYS_gettimeofday, tv2, tz2);
assert_int_equal(rc, 0);
+   assert_int_equal(tz1.tz_dsttime, tz2.tz_dsttime);
+   assert_int_equal(tz1.tz_minuteswest, tz2.tz_minuteswest);
+#endif
 
assert_int_equal(tv1.tv_sec, tv2.tv_sec);
-   assert_int_equal(tz2.tz_dsttime, tz2.tz_dsttime);
-   assert_int_equal(tz2.tz_minuteswest, tz2.tz_minuteswest);
 }
 
 static void test_uwrap_syscall_setreuid(void **state)


-- 
UID Wrapper Repository


autobuild: intermittent test failure detected

2014-09-02 Thread autobuild
The autobuild test system has detected an intermittent failing test in 
the current master tree.

The autobuild log of the failure is available here:

   http://git.samba.org/autobuild.flakey/2014-09-02-2246/flakey.log

The samba build logs are available here:

   http://git.samba.org/autobuild.flakey/2014-09-02-2246/samba.stderr
   http://git.samba.org/autobuild.flakey/2014-09-02-2246/samba.stdout
  
The top commit at the time of the failure was:

commit b55a91e9d297c74602d6bd5ef6d2676cf1bfbc75
Author: Andrew Bartlett abart...@samba.org
Date:   Fri Aug 22 14:16:30 2014 +1200

join.py: Set NT ACL on crossRef object for new partition

Change-Id: Icb1b00697cc5641481370ded26f2f0551a5b2a97
Pair-Programmed-With: Stefan Metzmacher me...@samba.org
Signed-off-by: Andrew Bartlett abart...@samba.org
Signed-off-by: Stefan Metzmacher me...@samba.org

Autobuild-User(master): Stefan Metzmacher me...@samba.org
Autobuild-Date(master): Tue Sep  2 14:15:54 CEST 2014 on sn-devel-104


[SCM] Samba Shared Repository - branch v4-0-test updated

2014-09-02 Thread Karolin Seeger
The branch, v4-0-test has been updated
   via  d14c83e s3: winbindd: On new client connect, prune idle or hung 
connections older than winbind request timeout
   via  36f55df s3: winbindd: Add new parameter winbind request timeout 
set to 60 seconds with man page.
   via  bd576b8 dosmode: fix FSCTL_SET_SPARSE request validation
   via  9a1a13a smbd: Properly initialize mangle_hash
   via  77e7db9 Don't discard result of checking grouptype
   via  691fe9a docs: Fix typos in smb.conf (inherit acls)
   via  851b93d samba: Retain case sensitivity of cifs client
   via  2eb6bbd printing: reload printer shares on OpenPrinter
   via  668127f smbd: split printer reload processing
   via  051cd1d server: remove duplicate snum_is_shared_printer()
   via  1a2a342 smbd: only reprocess printer_list.tdb if it changed
   via  918f7db printing: return last change time with pcap_cache_loaded()
   via  a4b2289 printing: remove pcap_cache_add()
   via  bad147d printing: reload printer_list.tdb from in memory list
   via  a97c2db printing: only reload printer shares on client enum
   via  c82338f printing: traverse_read the printer list for share updates
   via  d3fb60a s3: smbd : SMB2 - fix SMB2_SEARCH when searching non 
wildcard string with a case-canonicalized share.
   via  8a2f945 s3: smbd - SMB[2|3]. Ensure a \ or / can't be found 
anywhere in a search path, not just at the start.
   via  9977aa9 s3: enforce a positive allocation_file_size for non-empty 
files (bug #10543)
   via  7ff8102 passdb: fix NT_STATUS_NO_SUCH_GROUP
   via  8c97d9a s3:libsmb: Set a max charge for SMB2 connections
   via  cad42ef s3: smbd: POSIX ACLs. Remove incorrect check for 
SECINFO_PROTECTED_DACL in incoming security_information flags in 
posix_get_nt_acl_common().
   via  9fadcf3 libcli/security: add better detection of 
SECINFO_[UN]PROTECTED_[D|S]ACL in get_sec_info()
   via  c0ddfc1 s3:smbd: mask security_information input values with 
SMB_SUPPORTED_SECINFO_FLAGS
   via  04916e0 security.idl: add SMB_SUPPORTED_SECINFO_FLAGS
   via  6db4a91 Fixed a memory leak in cli_set_mntpoint().
   via  624a52f lib: Remove unused nstrcpy
   via  796afb4 build: fix configure to honour --without-dmapi
  from  473ccb5 tests: dnsserver: Add a update test with name set to '.'

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test


- Log -
commit d14c83e072045cd2f638c4e4484a9f2ea71b9460
Author: Jeremy Allison j...@samba.org
Date:   Fri Jul 25 12:46:46 2014 -0700

s3: winbindd: On new client connect, prune idle or hung connections older 
than winbind request timeout

Bug 3204 winbindd: Exceeding 200 client connections, no idle connection 
found

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

Signed-off-by: Jeremy Allison j...@samba.org
Reviewed-by: Ira Cooper i...@samba.org

Autobuild-User(master): Jeremy Allison j...@samba.org
Autobuild-Date(master): Tue Jul 29 23:31:14 CEST 2014 on sn-devel-104

(cherry picked from commit f9588675ea3cb2f1fabd07a4ea8b2138d65aee83)

Autobuild-User(v4-0-test): Karolin Seeger ksee...@samba.org
Autobuild-Date(v4-0-test): Tue Sep  2 22:45:38 CEST 2014 on sn-devel-104

commit 36f55df047e58e79b22ff46fcfcf2758ab58e9b6
Author: Jeremy Allison j...@samba.org
Date:   Tue Jul 29 14:53:11 2014 -0700

s3: winbindd: Add new parameter winbind request timeout set to 60 seconds 
with man page.

This parameter specifies the number of seconds the winbindd
daemon will wait before disconnecting either a client connection
with no outstanding requests (idle) or a client connection with a
request that has remained outstanding (hung) for longer than this
number of seconds.

Bug 3204 winbindd: Exceeding 200 client connections, no idle connection 
found

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

Signed-off-by: Jeremy Allison j...@samba.org
Reviewed-by: Ira Cooper i...@samba.org

commit bd576b832248f07d66f5921d3d2eedef7602d856
Author: David Disseldorp dd...@samba.org
Date:   Wed Aug 27 15:42:00 2014 +0200

dosmode: fix FSCTL_SET_SPARSE request validation

Check that FSCTL_SET_SPARSE requests does not refer to directories. Also
reject such requests when issued over IPC or printer share connections.

Bug: https://bugzilla.samba.org/show_bug.cgi?id=10787

Signed-off-by: David Disseldorp dd...@samba.org
Reviewed-by: Jeremy Allison j...@samba.org

Autobuild-User(master): Jeremy Allison j...@samba.org
Autobuild-Date(master): Thu Aug 28 04:22:37 CEST 2014 on sn-devel-104

(cherry picked from commit 0751495b1327d002b79482632b7c590cae6e3f9d)

commit 9a1a13ab5712fa021fdbce75a12c2bc47af24568
Author: Volker Lendecke v...@samba.org
Date:   Tue Aug 19 14:32:15 2014 +

smbd: Properly initialize 

autobuild: intermittent test failure detected

2014-09-02 Thread autobuild
The autobuild test system has detected an intermittent failing test in 
the current master tree.

The autobuild log of the failure is available here:

   http://git.samba.org/autobuild.flakey/2014-09-03-0217/flakey.log

The samba build logs are available here:

   http://git.samba.org/autobuild.flakey/2014-09-03-0217/samba.stderr
   http://git.samba.org/autobuild.flakey/2014-09-03-0217/samba.stdout
  
The top commit at the time of the failure was:

commit b55a91e9d297c74602d6bd5ef6d2676cf1bfbc75
Author: Andrew Bartlett abart...@samba.org
Date:   Fri Aug 22 14:16:30 2014 +1200

join.py: Set NT ACL on crossRef object for new partition

Change-Id: Icb1b00697cc5641481370ded26f2f0551a5b2a97
Pair-Programmed-With: Stefan Metzmacher me...@samba.org
Signed-off-by: Andrew Bartlett abart...@samba.org
Signed-off-by: Stefan Metzmacher me...@samba.org

Autobuild-User(master): Stefan Metzmacher me...@samba.org
Autobuild-Date(master): Tue Sep  2 14:15:54 CEST 2014 on sn-devel-104


autobuild: intermittent test failure detected

2014-09-02 Thread autobuild
The autobuild test system has detected an intermittent failing test in 
the current master tree.

The autobuild log of the failure is available here:

   http://git.samba.org/autobuild.flakey/2014-09-03-0343/flakey.log

The samba build logs are available here:

   http://git.samba.org/autobuild.flakey/2014-09-03-0343/samba.stderr
   http://git.samba.org/autobuild.flakey/2014-09-03-0343/samba.stdout
  
The top commit at the time of the failure was:

commit b55a91e9d297c74602d6bd5ef6d2676cf1bfbc75
Author: Andrew Bartlett abart...@samba.org
Date:   Fri Aug 22 14:16:30 2014 +1200

join.py: Set NT ACL on crossRef object for new partition

Change-Id: Icb1b00697cc5641481370ded26f2f0551a5b2a97
Pair-Programmed-With: Stefan Metzmacher me...@samba.org
Signed-off-by: Andrew Bartlett abart...@samba.org
Signed-off-by: Stefan Metzmacher me...@samba.org

Autobuild-User(master): Stefan Metzmacher me...@samba.org
Autobuild-Date(master): Tue Sep  2 14:15:54 CEST 2014 on sn-devel-104


[SCM] Samba Shared Repository - branch master updated

2014-09-02 Thread Amitay Isaacs
The branch, master has been updated
   via  80f00ea ctdb-build: SAMBA_BINARY targets should not include bin/ 
prefix
  from  b55a91e join.py: Set NT ACL on crossRef object for new partition

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit 80f00eaf51b99d1849d23a219f7f83c5cffebe1d
Author: Amitay Isaacs ami...@gmail.com
Date:   Thu Aug 21 17:26:14 2014 +1000

ctdb-build: SAMBA_BINARY targets should not include bin/ prefix

Signed-off-by: Amitay Isaacs ami...@gmail.com
Reviewed-by: Martin Schwenke mar...@meltin.net

Autobuild-User(master): Amitay Isaacs ami...@samba.org
Autobuild-Date(master): Wed Sep  3 06:26:16 CEST 2014 on sn-devel-104

---

Summary of changes:
 ctdb/wscript |   29 ++---
 1 files changed, 14 insertions(+), 15 deletions(-)


Changeset truncated at 500 lines:

diff --git a/ctdb/wscript b/ctdb/wscript
index d1f112e..9c7d697 100755
--- a/ctdb/wscript
+++ b/ctdb/wscript
@@ -267,7 +267,7 @@ def build(bld):
   include/ctdb_typesafe_cb.h''',
 deps='replace popt talloc tevent tdb')
 
-bld.SAMBA_BINARY('bin/ctdbd',
+bld.SAMBA_BINARY('ctdbd',
  source='',
  deps='''ctdb-server ctdb-client ctdb-common
  ctdb-common-util ctdb-system ctdb-tcp
@@ -276,26 +276,26 @@ def build(bld):
  install_path='${SBINDIR}',
  manpages='doc/ctdbd.1')
 
-bld.SAMBA_BINARY('bin/ctdb',
+bld.SAMBA_BINARY('ctdb',
  source='tools/ctdb.c tools/ctdb_vacuum.c',
  deps='''ctdb-client ctdb-common ctdb-common-util
  ctdb-system ctdb-util ctdb-util-misc''',
  install_path='${BINDIR}',
  manpages='doc/ctdb.1')
 
-bld.SAMBA_BINARY('bin/ltdbtool',
+bld.SAMBA_BINARY('ltdbtool',
  source='tools/ltdbtool.c',
  includes='include',
  deps='tdb',
  install_path='${BINDIR}',
  manpages='doc/ltdbtool.1')
 
-bld.SAMBA_BINARY('bin/ctdb_lock_helper',
+bld.SAMBA_BINARY('ctdb_lock_helper',
  source='server/ctdb_lock_helper.c',
  deps='ctdb-util ctdb-util-misc ctdb-common-util talloc 
tdb',
  install_path='${BINDIR}')
 
-bld.SAMBA_BINARY('bin/ctdb_event_helper',
+bld.SAMBA_BINARY('ctdb_event_helper',
  source='server/ctdb_event_helper.c',
  includes='include include/internal',
  deps='ctdb-util ctdb-util-misc ctdb-common-util replace 
tdb',
@@ -318,21 +318,21 @@ def build(bld):
 target='utils/smnotify/gen_smnotify.c',
 rule='rpcgen -l ${SRC}  ${TGT}')
 
-bld.SAMBA_BINARY('bin/smnotify',
+bld.SAMBA_BINARY('smnotify',
  source=bld.SUBDIR('utils/smnotify',
'smnotify.c gen_smnotify.c gen_xdr.c'),
  deps='ctdb-smnotify-h ctdb-smnotify-c ctdb-smnotify-x 
popt',
  includes='utils utils/smnotify',
  install_path='${BINDIR}')
 
-bld.SAMBA_BINARY('bin/ping_pong',
+bld.SAMBA_BINARY('ping_pong',
  source='utils/ping_pong/ping_pong.c',
  deps='',
  install_path='${BINDIR}',
  manpages='doc/ping_pong.1')
 
 if bld.env.HAVE_PMDA:
-bld.SAMBA_BINARY('bin/pmdactdb',
+bld.SAMBA_BINARY('pmdactdb',
  source='utils/pmda/pmda_ctdb.c',
  includes='include include/internal',
  deps='''ctdb-client ctdb-common ctdb-system
@@ -440,9 +440,8 @@ def build(bld):
 'ctdb_lock_tdb'
 ]
 
-for t in ctdb_tests:
-target = 'bin/' + t
-src = 'tests/src/' + t + '.c'
+for target in ctdb_tests:
+src = 'tests/src/' + target + '.c'
 
 bld.SAMBA_BINARY(target,
  source=src,
@@ -450,27 +449,27 @@ def build(bld):
  ctdb-system ctdb-util ctdb-util-misc''',
  install_path='${CTDB_TEST_LIBDIR}')
 
-bld.SAMBA_BINARY('bin/ctdb_takeover_tests',
+bld.SAMBA_BINARY('ctdb_takeover_tests',
  source='tests/src/ctdb_takeover_tests.c',
  deps='replace popt tdb tevent talloc ctdb-system' +
   ib_deps,
  includes='../include ../include/internal lib/util',
  install_path='${CTDB_TEST_LIBDIR}')
 
-bld.SAMBA_BINARY('bin/ctdb_functest',
+bld.SAMBA_BINARY('ctdb_functest',