The branch, master has been updated
via 5943f92 s4-backupkey: Don't use deprecated data structures
via f4da068 s4-torture: Rename issuer unique id in backupkey test
via 3de5943 s3-vfs_snapper: Fix a possible use without init warning
via f7e2399 s4-param: Make sure newname is not used uninitialized
from b486398 smbd: Move a message_send_all to the cleanupd
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 5943f92d2a58473f0526bd564dead78e1528b5be
Author: Andreas Schneider <[email protected]>
Date: Wed Nov 11 11:49:12 2015 +0100
s4-backupkey: Don't use deprecated data structures
Signed-off-by: Andreas Schneider <[email protected]>
Reviewed-by: Michael Adam <[email protected]>
Autobuild-User(master): Andreas Schneider <[email protected]>
Autobuild-Date(master): Tue Nov 17 19:52:33 CET 2015 on sn-devel-104
commit f4da06803b07de76ed26355b17f81dbdfd1dc926
Author: Andreas Schneider <[email protected]>
Date: Thu Nov 12 11:35:39 2015 +0100
s4-torture: Rename issuer unique id in backupkey test
Signed-off-by: Andreas Schneider <[email protected]>
Reviewed-by: Michael Adam <[email protected]>
commit 3de59437c3195f61281fb765b3c944258a259d1d
Author: Andreas Schneider <[email protected]>
Date: Fri Nov 13 14:14:10 2015 +0100
s3-vfs_snapper: Fix a possible use without init warning
Signed-off-by: Andreas Schneider <[email protected]>
Reviewed-by: Michael Adam <[email protected]>
commit f7e2399926a0c6531acaa8f4567b6fa67f69c6de
Author: Andreas Schneider <[email protected]>
Date: Fri Nov 13 13:40:25 2015 +0100
s4-param: Make sure newname is not used uninitialized
Signed-off-by: Andreas Schneider <[email protected]>
Reviewed-by: Michael Adam <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
source3/modules/vfs_snapper.c | 2 +-
source4/param/share_ldb.c | 2 +-
source4/rpc_server/backupkey/dcesrv_backupkey.c | 2 +-
source4/torture/rpc/backupkey.c | 12 ++++++------
4 files changed, 9 insertions(+), 9 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/modules/vfs_snapper.c b/source3/modules/vfs_snapper.c
index a25ae95..ef8951d 100644
--- a/source3/modules/vfs_snapper.c
+++ b/source3/modules/vfs_snapper.c
@@ -1404,7 +1404,7 @@ static NTSTATUS snapper_create_snap_call(TALLOC_CTX
*mem_ctx,
NTSTATUS status;
DBusMessage *req_msg;
DBusMessage *rsp_msg;
- uint32_t snap_id;
+ uint32_t snap_id = 0;
char *snap_path;
status = snapper_create_snap_pack(mem_ctx,
diff --git a/source4/param/share_ldb.c b/source4/param/share_ldb.c
index 0257cd1..cf8c5bb 100644
--- a/source4/param/share_ldb.c
+++ b/source4/param/share_ldb.c
@@ -445,7 +445,7 @@ static NTSTATUS sldb_set(struct share_context *ctx, const
char *name, struct sha
TALLOC_CTX *tmp_ctx;
NTSTATUS ret;
bool do_rename = false;
- char *newname;
+ char *newname = NULL;
int err, i;
if (!name) {
diff --git a/source4/rpc_server/backupkey/dcesrv_backupkey.c
b/source4/rpc_server/backupkey/dcesrv_backupkey.c
index ccd95d2..8636e0f 100644
--- a/source4/rpc_server/backupkey/dcesrv_backupkey.c
+++ b/source4/rpc_server/backupkey/dcesrv_backupkey.c
@@ -816,7 +816,7 @@ static WERROR create_heimdal_rsa_key(TALLOC_CTX *ctx,
hx509_context *hctx,
size_t len;
int bits = 2048;
int RSA_returned_bits;
- gnutls_x509_privkey gtls_key;
+ gnutls_x509_privkey_t gtls_key;
WERROR werr;
*rsa = NULL;
diff --git a/source4/torture/rpc/backupkey.c b/source4/torture/rpc/backupkey.c
index b86fccd..557aaae 100644
--- a/source4/torture/rpc/backupkey.c
+++ b/source4/torture/rpc/backupkey.c
@@ -415,7 +415,7 @@ static struct GUID *get_cert_guid(struct torture_context
*tctx,
{
hx509_context hctx;
hx509_cert cert;
- heim_bit_string subjectuniqid;
+ heim_bit_string issuer_unique_id;
DATA_BLOB data;
int hret;
uint32_t size;
@@ -430,7 +430,7 @@ static struct GUID *get_cert_guid(struct torture_context
*tctx,
hx509_context_free(&hctx);
return NULL;
}
- hret = hx509_cert_get_issuer_unique_id(hctx, cert, &subjectuniqid);
+ hret = hx509_cert_get_issuer_unique_id(hctx, cert, &issuer_unique_id);
if (hret) {
torture_comment(tctx, "error while getting the
issuer_uniq_id\n");
hx509_cert_free(cert);
@@ -438,17 +438,17 @@ static struct GUID *get_cert_guid(struct torture_context
*tctx,
return NULL;
}
- /* The subjectuniqid is a bit string,
+ /* The issuer_unique_id is a bit string,
* which means that the real size has to be divided by 8
* to have the number of bytes
*/
hx509_cert_free(cert);
hx509_context_free(&hctx);
- size = subjectuniqid.length / 8;
- data = data_blob_const(subjectuniqid.data, size);
+ size = issuer_unique_id.length / 8;
+ data = data_blob_const(issuer_unique_id.data, size);
status = GUID_from_data_blob(&data, guid);
- der_free_bit_string(&subjectuniqid);
+ der_free_bit_string(&issuer_unique_id);
if (!NT_STATUS_IS_OK(status)) {
return NULL;
}
--
Samba Shared Repository
