[SCM] Samba Shared Repository - branch master updated

[Michael Adam]

The branch, master has been updated
       via  48d4aac fruit: Fix CID 1323186 Dereference before null check
       via  04c8655 dsdb: Fix a confusing parameter
       via  facb11b samdb: Fix CID 1034736 Dereference after null check
       via  6b44ce6 configure: Fix aio_suspend detection
      from  a7b6dd4 libsmbclient: Fix 32-bit problems

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


- Log -----------------------------------------------------------------
commit 48d4aac563d8980571ae504dd9e63c0620eee4c6
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Sep 8 08:18:02 2015 +0200

    fruit: Fix CID 1323186 Dereference before null check
    
    In all other "goto fail;" paths we had already dereferenced fsp,
    so the if-statement checking for fsp!=NULL was unnecessary. This
    fix gives us an additional error message in case check_aapl fails.
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>
    
    Autobuild-User(master): Michael Adam <obnox at samba.org>
    Autobuild-Date(master): Tue Sep  8 13:47:01 CEST 2015 on sn-devel-104

commit 04c86557195a014bd7e872014e6144c100ead0a1
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Sep 8 07:47:55 2015 +0200

    dsdb: Fix a confusing parameter
    
    LDB_SCOPE_BASE is 0, so this works, but the corresponding parameter
    is "struct ldb_control **controls", so I'd say NULL is more appropriate
    here. Fixes a warning I just saw pass by.
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>

commit facb11b61a6cd322c8b4c42ca2caefe0c509c37c
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Sep 8 07:46:35 2015 +0200

    samdb: Fix CID 1034736 Dereference after null check
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>

commit 6b44ce64242a2f3fe879e59d2337c6801357390b
Author: Timur Bakeyev <timur at FreeBSD.org>
Date:   Fri Sep 4 15:03:24 2015 +0200

    configure: Fix aio_suspend detection
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=11494
    
    Signed-off-by: Timur Bakeyev <timur at FreeBSD.org>
    Reviewed-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>

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

Summary of changes:
 source3/modules/vfs_fruit.c                  | 2 +-
 source3/wscript                              | 2 +-
 source4/dsdb/repl/replicated_objects.c       | 2 +-
 source4/dsdb/samdb/ldb_modules/operational.c | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_fruit.c b/source3/modules/vfs_fruit.c
index 21b49f9..c90699f 100644
--- a/source3/modules/vfs_fruit.c
+++ b/source3/modules/vfs_fruit.c
@@ -3318,7 +3318,7 @@ static NTSTATUS fruit_create_file(vfs_handle_struct *handle,
 
 	status = check_aapl(handle, req, in_context_blobs, out_context_blobs);
 	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+		goto fail;
 	}
 
 	SMB_VFS_HANDLE_GET_DATA(handle, config, struct fruit_config_data,
diff --git a/source3/wscript b/source3/wscript
index 566adfb..33e36b1 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -563,7 +563,7 @@ return acl_get_perm_np(permset_d, perm);
             conf.CHECK_CODE('struct aiocb a; return aio_return(&a);', 'HAVE_AIO_RETURN', msg='Checking for aio_return', headers='aio.h', lib='aio rt')
             conf.CHECK_CODE('struct aiocb a; return aio_error(&a);', 'HAVE_AIO_ERROR', msg='Checking for aio_error', headers='aio.h', lib='aio rt')
             conf.CHECK_CODE('struct aiocb a; return aio_cancel(1, &a);', 'HAVE_AIO_CANCEL', msg='Checking for aio_cancel', headers='aio.h', lib='aio rt')
-            conf.CHECK_CODE('const struct aiocb * const a[1]; struct timespec t; return aio_suspend(&a, 1, &t);', 'HAVE_AIO_SUSPEND', msg='Checking for aio_suspend', headers='aio.h', lib='aio rt')
+            conf.CHECK_CODE('const struct aiocb * const a[1]; struct timespec t; return aio_suspend(a, 1, &t);', 'HAVE_AIO_SUSPEND', msg='Checking for aio_suspend', headers='aio.h', lib='aio rt')
         if not conf.CONFIG_SET('HAVE_AIO'):
             conf.DEFINE('HAVE_NO_AIO', '1')
     else:
diff --git a/source4/dsdb/repl/replicated_objects.c b/source4/dsdb/repl/replicated_objects.c
index 97b8b2a..df880ad 100644
--- a/source4/dsdb/repl/replicated_objects.c
+++ b/source4/dsdb/repl/replicated_objects.c
@@ -902,7 +902,7 @@ WERROR dsdb_replicated_objects_commit(struct ldb_context *ldb,
 
 		ret = ldb_build_mod_req(&req, ldb, objects,
 				msg,
-				LDB_SCOPE_BASE,
+				NULL,
 				NULL,
 				ldb_op_default_callback,
 				NULL);
diff --git a/source4/dsdb/samdb/ldb_modules/operational.c b/source4/dsdb/samdb/ldb_modules/operational.c
index 8390230..c5fd8e2 100644
--- a/source4/dsdb/samdb/ldb_modules/operational.c
+++ b/source4/dsdb/samdb/ldb_modules/operational.c
@@ -462,7 +462,7 @@ static int construct_msds_isrodc_with_dn(struct ldb_module *module,
 	ldb = ldb_module_get_ctx(module);
 	if (!ldb) {
 		DEBUG(4, (__location__ ": Failed to get ldb \n"));
-		return ldb_operr(ldb);
+		return LDB_ERR_OPERATIONS_ERROR;
 	}
 
 	dn = ldb_dn_new(msg, ldb, (const char *)object_category->values[0].data);


-- 
Samba Shared Repository