[SCM] Samba Shared Repository - branch master updated

[Uri Simchoni]

The branch, master has been updated
       via  3e08469 build: fix ldbsearch panic on FC22
      from  8ec92e5 smbspool: Add string representation of nt_status

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


- Log -----------------------------------------------------------------
commit 3e084695daff377da6f6e4a6fcb10c05f2a6dd03
Author: Uri Simchoni <uri at samba.org>
Date:   Thu Jan 21 11:14:36 2016 +0200

    build: fix ldbsearch panic on FC22
    
    add dependency that fixes ldbsearch panic due to conflict -
    function read_data() is implemented both by libtspi.so.1, which
    is a dependency of gnutls on FC22, and by an internal samba
    shared lib.
    
    Signed-off-by: Uri Simchoni <uri at samba.org>
    Reviewed-by: Alexander Bokovoy <ab at samba.org>
    
    Autobuild-User(master): Uri Simchoni <uri at samba.org>
    Autobuild-Date(master): Sat Jan 23 00:06:59 CET 2016 on sn-devel-144

-----------------------------------------------------------------------

Summary of changes:
 source4/dsdb/samdb/ldb_modules/wscript_build_server | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


Changeset truncated at 500 lines:

diff --git a/source4/dsdb/samdb/ldb_modules/wscript_build_server b/source4/dsdb/samdb/ldb_modules/wscript_build_server
index b54d27f..8fa9939 100755
--- a/source4/dsdb/samdb/ldb_modules/wscript_build_server
+++ b/source4/dsdb/samdb/ldb_modules/wscript_build_server
@@ -325,7 +325,7 @@ bld.SAMBA_MODULE('ldb_acl',
 	init_function='ldb_acl_module_init',
 	module_init_name='ldb_init_module',
 	internal_module=False,
-	deps='talloc samba-security samdb DSDB_MODULE_HELPERS krb5samba'
+	deps='talloc samba-util samba-security samdb DSDB_MODULE_HELPERS krb5samba'
 	)
 
 


-- 
Samba Shared Repository