The branch, master has been updated
via 117e87d librpc:ndr:witness: remove an unneeded block, reducing
indentation.
via dd0f79d librpc:ndr:witness: move variables into scope
via 76f8d0f smbd:trans2: treat new SMB_SIGNING_DESIRED in case
via fd16861 librpc:ndr:witness: fix CID 1311245: Memory - illegal
accesses (UNINIT)
from 0afea2c WHATSNEW: Spotlight
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 117e87d8040c6a7e625aa2c52cbc7ab350bf669a
Author: Michael Adam <[email protected]>
Date: Tue Jul 7 09:50:21 2015 +0200
librpc:ndr:witness: remove an unneeded block, reducing indentation.
Check with "git diff -w".
Signed-off-by: Michael Adam <[email protected]>
Reviewed-by: Guenther Deschner <[email protected]>
Autobuild-User(master): Günther Deschner <[email protected]>
Autobuild-Date(master): Tue Jul 7 23:37:05 CEST 2015 on sn-devel-104
commit dd0f79df94d6aabe5a55211c17df8955ddff4e02
Author: Michael Adam <[email protected]>
Date: Tue Jul 7 09:47:51 2015 +0200
librpc:ndr:witness: move variables into scope
Signed-off-by: Michael Adam <[email protected]>
Reviewed-by: Guenther Deschner <[email protected]>
commit 76f8d0fbada15c9466f66a2d9961bebd1425d141
Author: Michael Adam <[email protected]>
Date: Tue Jul 7 17:15:00 2015 +0200
smbd:trans2: treat new SMB_SIGNING_DESIRED in case
Signed-off-by: Michael Adam <[email protected]>
Reviewed-by: Guenther Deschner <[email protected]>
commit fd16861839ec6f5c255db78288ef13a7bc110839
Author: Michael Adam <[email protected]>
Date: Tue Jul 7 08:52:20 2015 +0200
librpc:ndr:witness: fix CID 1311245: Memory - illegal accesses (UNINIT)
Signed-off-by: Michael Adam <[email protected]>
Reviewed-by: Guenther Deschner <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
librpc/ndr/ndr_witness.c | 80 ++++++++++++++++++++++++------------------------
source3/smbd/trans2.c | 1 +
2 files changed, 41 insertions(+), 40 deletions(-)
Changeset truncated at 500 lines:
diff --git a/librpc/ndr/ndr_witness.c b/librpc/ndr/ndr_witness.c
index 40586f4..288e640 100644
--- a/librpc/ndr/ndr_witness.c
+++ b/librpc/ndr/ndr_witness.c
@@ -60,51 +60,51 @@ _PUBLIC_ enum ndr_err_code
ndr_push_witness_notifyResponse(struct ndr_push *ndr,
_PUBLIC_ enum ndr_err_code ndr_pull_witness_notifyResponse(struct ndr_pull
*ndr, int ndr_flags, struct witness_notifyResponse *r)
{
- uint32_t size_messages_0 = 0;
- uint32_t cntr_messages_0;
- TALLOC_CTX *_mem_save_messages_0;
- {
- uint32_t _flags_save_STRUCT = ndr->flags;
- ndr_set_flags(&ndr->flags, LIBNDR_PRINT_ARRAY_HEX);
- NDR_PULL_CHECK_FLAGS(ndr, ndr_flags);
- if (ndr_flags & NDR_SCALARS) {
- NDR_CHECK(ndr_pull_align(ndr, 4));
- NDR_CHECK(ndr_pull_witness_notifyResponse_type(ndr,
NDR_SCALARS, &r->type));
- NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS,
&r->length));
- NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->num));
- {
- uint32_t
_flags_save_witness_notifyResponse_message = ndr->flags;
- uint32_t _ptr_messages;
- ndr_set_flags(&ndr->flags,
LIBNDR_FLAG_REMAINING);
- NDR_CHECK(ndr_pull_generic_ptr(ndr,
&_ptr_messages));
- if (_ptr_messages) {
- NDR_PULL_ALLOC(ndr, r->messages);
- } else {
- r->messages = NULL;
- }
- if (r->messages) {
- size_messages_0 = r->num;
- NDR_PULL_ALLOC_N(ndr, r->messages,
size_messages_0);
- _mem_save_messages_0 =
NDR_PULL_GET_MEM_CTX(ndr);
- NDR_PULL_SET_MEM_CTX(ndr, r->messages,
0);
- {
- struct ndr_pull *_ndr_messages;
-
NDR_CHECK(ndr_pull_subcontext_start(ndr, &_ndr_messages, 4, r->length));
- for (cntr_messages_0 = 0;
cntr_messages_0 < (size_messages_0); cntr_messages_0++) {
-
NDR_CHECK(ndr_pull_set_switch_value(_ndr_messages,
&r->messages[cntr_messages_0], r->type));
-
NDR_CHECK(ndr_pull_witness_notifyResponse_message(_ndr_messages, NDR_SCALARS,
&r->messages[cntr_messages_0]));
- }
-
NDR_CHECK(ndr_pull_subcontext_end(ndr, _ndr_messages, 4, r->length));
+ uint32_t _flags_save_STRUCT = ndr->flags;
+ ndr_set_flags(&ndr->flags, LIBNDR_PRINT_ARRAY_HEX);
+ NDR_PULL_CHECK_FLAGS(ndr, ndr_flags);
+ if (ndr_flags & NDR_SCALARS) {
+ NDR_CHECK(ndr_pull_align(ndr, 4));
+ NDR_CHECK(ndr_pull_witness_notifyResponse_type(ndr,
NDR_SCALARS, &r->type));
+ NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->length));
+ NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->num));
+ {
+ uint32_t _flags_save_witness_notifyResponse_message =
ndr->flags;
+ uint32_t _ptr_messages;
+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_REMAINING);
+ NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_messages));
+ if (_ptr_messages) {
+ NDR_PULL_ALLOC(ndr, r->messages);
+ } else {
+ r->messages = NULL;
+ }
+ if (r->messages) {
+ uint32_t size_messages_0 = 0;
+ uint32_t cntr_messages_0;
+ TALLOC_CTX *_mem_save_messages_0;
+
+ size_messages_0 = r->num;
+ NDR_PULL_ALLOC_N(ndr, r->messages,
size_messages_0);
+ _mem_save_messages_0 =
NDR_PULL_GET_MEM_CTX(ndr);
+ NDR_PULL_SET_MEM_CTX(ndr, r->messages, 0);
+ {
+ struct ndr_pull *_ndr_messages;
+
NDR_CHECK(ndr_pull_subcontext_start(ndr, &_ndr_messages, 4, r->length));
+ for (cntr_messages_0 = 0;
cntr_messages_0 < (size_messages_0); cntr_messages_0++) {
+
NDR_CHECK(ndr_pull_set_switch_value(_ndr_messages,
&r->messages[cntr_messages_0], r->type));
+
NDR_CHECK(ndr_pull_witness_notifyResponse_message(_ndr_messages, NDR_SCALARS,
&r->messages[cntr_messages_0]));
}
+ NDR_CHECK(ndr_pull_subcontext_end(ndr,
_ndr_messages, 4, r->length));
}
NDR_PULL_SET_MEM_CTX(ndr, _mem_save_messages_0,
0);
- ndr->flags =
_flags_save_witness_notifyResponse_message;
}
- NDR_CHECK(ndr_pull_trailer_align(ndr, 4));
+ ndr->flags = _flags_save_witness_notifyResponse_message;
}
- if (ndr_flags & NDR_BUFFERS) {
- }
- ndr->flags = _flags_save_STRUCT;
+ NDR_CHECK(ndr_pull_trailer_align(ndr, 4));
}
+ if (ndr_flags & NDR_BUFFERS) {
+ }
+ ndr->flags = _flags_save_STRUCT;
+
return NDR_ERR_SUCCESS;
}
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index 88c69a9..8816402 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -3639,6 +3639,7 @@ cBytesSector=%u, cUnitTotal=%u, cUnitAvail=%d\n",
(unsigned int)bsize, (unsigned
case SMB_SIGNING_OFF:
encrypt_caps = 0;
break;
+ case SMB_SIGNING_DESIRED:
case SMB_SIGNING_IF_REQUIRED:
case SMB_SIGNING_DEFAULT:
encrypt_caps =
CIFS_UNIX_TRANSPORT_ENCRYPTION_CAP;
--
Samba Shared Repository
