The branch, master has been updated
via 3e9e5e6 registry: Fix an aligment increase warning
via 53486f0 smbd: Fix a typo
from 1b39c68 vfs: Add a brief vfs_ceph manpage.
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 3e9e5e6d6f1a1ccabdf3f1860e8608ffec197e86
Author: Volker Lendecke <v...@samba.org>
Date: Wed Jan 21 11:44:58 2015 +0100
registry: Fix an aligment increase warning
Signed-off-by: Volker Lendecke <v...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
Autobuild-User(master): Jeremy Allison <j...@samba.org>
Autobuild-Date(master): Thu Feb 26 05:35:33 CET 2015 on sn-devel-104
commit 53486f00e963156702b76f72390940c4144eff31
Author: Volker Lendecke <v...@samba.org>
Date: Wed Feb 25 13:00:49 2015 +0000
smbd: Fix a typo
Signed-off-by: Volker Lendecke <v...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
-----------------------------------------------------------------------
Summary of changes:
source3/registry/reg_objects.c | 2 +-
source3/smbd/smb2_negprot.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/registry/reg_objects.c b/source3/registry/reg_objects.c
index baa3000..1c9e79d 100644
--- a/source3/registry/reg_objects.c
+++ b/source3/registry/reg_objects.c
@@ -188,7 +188,7 @@ static WERROR regsubkey_ctr_index_for_keyname(struct
regsubkey_ctr *ctr,
}
if (idx != NULL) {
- *idx = *(uint32_t *)data.dptr;
+ memcpy(idx, data.dptr, sizeof(*idx));
}
talloc_free(data.dptr);
diff --git a/source3/smbd/smb2_negprot.c b/source3/smbd/smb2_negprot.c
index 9a1ca9c..9987967 100644
--- a/source3/smbd/smb2_negprot.c
+++ b/source3/smbd/smb2_negprot.c
@@ -263,7 +263,7 @@ NTSTATUS smbd_smb2_request_process_negprot(struct
smbd_smb2_request *req)
xconn->smb2.credits.multicredit = true;
/*
- * We allow up to allmost 16MB.
+ * We allow up to almost 16MB.
*
* The maximum PDU size is 0xFFFFFF (16776960)
* and we need some space for the header.
--
Samba Shared Repository
