[SCM] Samba Shared Repository - branch master updated
Jeremy Allison
jra at samba.org
Wed Oct 19 03:12:03 UTC 2016
The branch, master has been updated
via 7d9f18f torture: Fix clang errors
via 46fac3b lib: Fix a signed/unsigned hickup
via be21ae6 loadparm: Fix a warning for increased alignment
via 8d8c638 lib: Fix an uninitialized variable
via 3460ad8 ldb: Fix a signed/unsigned mixup
via ee090c0 vfs: Fix warnings for time_t != long
from 44a7040 s3: cldap: cldap_multi_netlogon_send() fails with one bad IPv6 address.
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 7d9f18f3f3a3d9f6160af06591cc01cd9d6053fe
Author: Volker Lendecke <vl at samba.org>
Date: Tue Oct 18 13:27:00 2016 +0200
torture: Fix clang errors
h1.data is an array and as such always is != NULL, so it's always true
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
Autobuild-User(master): Jeremy Allison <jra at samba.org>
Autobuild-Date(master): Wed Oct 19 05:11:25 CEST 2016 on sn-devel-144
commit 46fac3b796318680674da242c475a4f6cb747ade
Author: Volker Lendecke <vl at samba.org>
Date: Tue Oct 18 12:51:16 2016 +0200
lib: Fix a signed/unsigned hickup
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit be21ae621ff32ee51c90eac15395591726afba3f
Author: Volker Lendecke <vl at samba.org>
Date: Tue Oct 18 12:45:28 2016 +0200
loadparm: Fix a warning for increased alignment
There's tons of those, but you have to start somewhere :-)
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 8d8c638c3d532424c0a8abb028c40c9b8caed30c
Author: Volker Lendecke <vl at samba.org>
Date: Tue Oct 18 08:26:07 2016 +0200
lib: Fix an uninitialized variable
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 3460ad8faea19e7ce00dfe7a393bd5aaa69b0d95
Author: Volker Lendecke <vl at samba.org>
Date: Mon Oct 17 21:40:25 2016 +0200
ldb: Fix a signed/unsigned mixup
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit ee090c0423f73baa32244ea96e62ca4d6b4299e1
Author: Volker Lendecke <vl at samba.org>
Date: Mon Oct 17 20:56:20 2016 +0200
vfs: Fix warnings for time_t != long
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
-----------------------------------------------------------------------
Summary of changes:
lib/ldb/ldb_tdb/ldb_index.c | 3 ++-
source3/libads/ldap.c | 1 +
source3/librpc/crypto/gse_krb5.c | 2 +-
source3/modules/vfs_snapper.c | 5 +++--
source3/param/loadparm.c | 2 +-
source4/torture/smb2/rename.c | 28 ++++++++++++++--------------
source4/torture/vfs/fruit.c | 2 +-
7 files changed, 23 insertions(+), 20 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/ldb/ldb_tdb/ldb_index.c b/lib/ldb/ldb_tdb/ldb_index.c
index 7924172..53fcde5 100644
--- a/lib/ldb/ldb_tdb/ldb_index.c
+++ b/lib/ldb/ldb_tdb/ldb_index.c
@@ -1210,7 +1210,8 @@ static int ltdb_index_add_el(struct ldb_module *module, const char *dn,
add index entries for all elements in a message
*/
static int ltdb_index_add_all(struct ldb_module *module, const char *dn,
- struct ldb_message_element *elements, int num_el,
+ struct ldb_message_element *elements,
+ unsigned int num_el,
bool is_new)
{
struct ltdb_private *ltdb = talloc_get_type(ldb_module_get_private(module), struct ltdb_private);
diff --git a/source3/libads/ldap.c b/source3/libads/ldap.c
index 9e2ed98..b01201e 100644
--- a/source3/libads/ldap.c
+++ b/source3/libads/ldap.c
@@ -2947,6 +2947,7 @@ ADS_STATUS ads_current_time(ADS_STRUCT *ads)
if ( (ads_s = ads_init( ads->server.realm, ads->server.workgroup,
ads->server.ldap_server )) == NULL )
{
+ status = ADS_ERROR(LDAP_NO_MEMORY);
goto done;
}
ads_s->auth.flags = ADS_AUTH_ANON_BIND;
diff --git a/source3/librpc/crypto/gse_krb5.c b/source3/librpc/crypto/gse_krb5.c
index 2ee075d..71b2338 100644
--- a/source3/librpc/crypto/gse_krb5.c
+++ b/source3/librpc/crypto/gse_krb5.c
@@ -373,7 +373,7 @@ static krb5_error_code fill_mem_keytab_from_system_keytab(krb5_context krbctx,
NULL, NULL, NULL, NULL };
char *entry_princ_s = NULL;
fstring my_name, my_fqdn;
- int i;
+ unsigned i;
int err;
/* Generate the list of principal names which we expect
diff --git a/source3/modules/vfs_snapper.c b/source3/modules/vfs_snapper.c
index 5c1821d..a0d3d91 100644
--- a/source3/modules/vfs_snapper.c
+++ b/source3/modules/vfs_snapper.c
@@ -1842,12 +1842,13 @@ static NTSTATUS snapper_get_snap_at_time_call(TALLOC_CTX *mem_ctx,
}
if (num_snaps == 0) {
- DEBUG(4, ("no snapshots found with time: %lu\n", snaptime));
+ DEBUG(4, ("no snapshots found with time: %lu\n",
+ (unsigned long)snaptime));
status = NT_STATUS_INVALID_PARAMETER;
goto err_snap_array_free;
} else if (num_snaps > 0) {
DEBUG(4, ("got %u snapshots for single time %lu, using top\n",
- num_snaps, snaptime));
+ num_snaps, (unsigned long)snaptime));
}
status = snapper_snap_id_to_path(mem_ctx, base_path, snaps[0].id,
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 9306444..3e1a15e 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -1943,7 +1943,7 @@ int getservicebyname(const char *pszServiceName, struct loadparm_service *pservi
(data.dptr != NULL) &&
(data.dsize == sizeof(iService)))
{
- iService = *(int *)data.dptr;
+ memcpy(&iService, data.dptr, sizeof(iService));
}
TALLOC_FREE(canon_name);
diff --git a/source4/torture/smb2/rename.c b/source4/torture/smb2/rename.c
index 23fe4f9..1a490f3 100644
--- a/source4/torture/smb2/rename.c
+++ b/source4/torture/smb2/rename.c
@@ -120,7 +120,7 @@ done:
torture_comment(torture, "Cleaning up\n");
- if (h1.data) {
+ if (h1.data[0] || h1.data[1]) {
ZERO_STRUCT(cl.smb2);
cl.smb2.level = RAW_CLOSE_SMB2;
cl.smb2.in.file.handle = h1;
@@ -199,7 +199,7 @@ done:
torture_comment(torture, "Cleaning up\n");
- if (h1.data) {
+ if (h1.data[0] || h1.data[1]) {
ZERO_STRUCT(cl.smb2);
cl.smb2.level = RAW_CLOSE_SMB2;
cl.smb2.in.file.handle = h1;
@@ -288,7 +288,7 @@ done:
torture_comment(torture, "Cleaning up\n");
- if (h1.data) {
+ if (h1.data[0] || h1.data[1]) {
ZERO_STRUCT(cl.smb2);
cl.smb2.level = RAW_CLOSE_SMB2;
cl.smb2.in.file.handle = h1;
@@ -405,13 +405,13 @@ done:
torture_comment(torture, "Cleaning up\n");
- if (fh.data) {
+ if (fh.data[0] || fh.data[1]) {
ZERO_STRUCT(cl.smb2);
cl.smb2.level = RAW_CLOSE_SMB2;
cl.smb2.in.file.handle = fh;
status = smb2_close(tree1, &(cl.smb2));
}
- if (dh.data) {
+ if (dh.data[0] || dh.data[1]) {
ZERO_STRUCT(cl.smb2);
cl.smb2.level = RAW_CLOSE_SMB2;
cl.smb2.in.file.handle = dh;
@@ -529,13 +529,13 @@ done:
torture_comment(torture, "Cleaning up\n");
- if (fh.data) {
+ if (fh.data[0] || fh.data[1]) {
ZERO_STRUCT(cl.smb2);
cl.smb2.level = RAW_CLOSE_SMB2;
cl.smb2.in.file.handle = fh;
status = smb2_close(tree1, &(cl.smb2));
}
- if (dh.data) {
+ if (dh.data[0] || dh.data[1]) {
ZERO_STRUCT(cl.smb2);
cl.smb2.level = RAW_CLOSE_SMB2;
cl.smb2.in.file.handle = dh;
@@ -663,13 +663,13 @@ done:
torture_comment(torture, "Cleaning up\n");
- if (fh.data) {
+ if (fh.data[0] || fh.data[1]) {
ZERO_STRUCT(cl.smb2);
cl.smb2.level = RAW_CLOSE_SMB2;
cl.smb2.in.file.handle = fh;
status = smb2_close(tree1, &(cl.smb2));
}
- if (dh.data) {
+ if (dh.data[0] || dh.data[1]) {
ZERO_STRUCT(cl.smb2);
cl.smb2.level = RAW_CLOSE_SMB2;
cl.smb2.in.file.handle = dh;
@@ -787,13 +787,13 @@ done:
torture_comment(torture, "Cleaning up\n");
- if (fh.data) {
+ if (fh.data[0] || fh.data[1]) {
ZERO_STRUCT(cl.smb2);
cl.smb2.level = RAW_CLOSE_SMB2;
cl.smb2.in.file.handle = fh;
status = smb2_close(tree1, &(cl.smb2));
}
- if (dh.data) {
+ if (dh.data[0] || dh.data[1]) {
ZERO_STRUCT(cl.smb2);
cl.smb2.level = RAW_CLOSE_SMB2;
cl.smb2.in.file.handle = dh;
@@ -911,13 +911,13 @@ done:
torture_comment(torture, "Cleaning up\n");
- if (fh.data) {
+ if (fh.data[0] || fh.data[1]) {
ZERO_STRUCT(cl.smb2);
cl.smb2.level = RAW_CLOSE_SMB2;
cl.smb2.in.file.handle = fh;
status = smb2_close(tree1, &(cl.smb2));
}
- if (dh.data) {
+ if (dh.data[0] || dh.data[1]) {
ZERO_STRUCT(cl.smb2);
cl.smb2.level = RAW_CLOSE_SMB2;
cl.smb2.in.file.handle = dh;
@@ -1011,7 +1011,7 @@ done:
torture_comment(torture, "Cleaning up\n");
- if (h1.data) {
+ if (h1.data[0] || h1.data[1]) {
ZERO_STRUCT(cl.smb2);
cl.smb2.level = RAW_CLOSE_SMB2;
cl.smb2.in.file.handle = h1;
diff --git a/source4/torture/vfs/fruit.c b/source4/torture/vfs/fruit.c
index 020bd1f..d5de9d5 100644
--- a/source4/torture/vfs/fruit.c
+++ b/source4/torture/vfs/fruit.c
@@ -2841,7 +2841,7 @@ static bool test_rename_dir_openfile(struct torture_context *torture,
torture_comment(torture, "Cleaning up\n");
- if (h1.data) {
+ if (h1.data[0] || h1.data[1]) {
ZERO_STRUCT(cl.smb2);
cl.smb2.level = RAW_CLOSE_SMB2;
cl.smb2.in.file.handle = h1;
--
Samba Shared Repository
More information about the samba-cvs
mailing list