diff options
| -rw-r--r-- | .bzrignore | 1 | ||||
| -rw-r--r-- | source4/libcli/raw/rawacl.c | 6 | ||||
| -rw-r--r-- | source4/librpc/ndr/ndr.c | 14 | ||||
| -rwxr-xr-x | source4/script/tests/test_local.sh | 2 |
4 files changed, 5 insertions, 18 deletions
diff --git a/.bzrignore b/.bzrignore index fc9b464621..fcdd5ed3c3 100644 --- a/.bzrignore +++ b/.bzrignore @@ -161,3 +161,4 @@ source/pidl/pm_to_blib source/coverage source/st source/samba.info +source/pidl/cover_db diff --git a/source4/libcli/raw/rawacl.c b/source4/libcli/raw/rawacl.c index 6f35b7f829..1a2d75d274 100644 --- a/source4/libcli/raw/rawacl.c +++ b/source4/libcli/raw/rawacl.c @@ -131,12 +131,12 @@ struct smbcli_request *smb_raw_set_secdesc_send(struct smbcli_tree *tree, nt.in.params.data = params; nt.in.params.length = 8; - ndr = ndr_push_init(); + ndr = ndr_push_init_ctx(NULL); if (!ndr) return NULL; status = ndr_push_security_descriptor(ndr, NDR_SCALARS|NDR_BUFFERS, io->set_secdesc.in.sd); if (!NT_STATUS_IS_OK(status)) { - ndr_push_free(ndr); + talloc_free(ndr); return NULL; } @@ -144,7 +144,7 @@ struct smbcli_request *smb_raw_set_secdesc_send(struct smbcli_tree *tree, req = smb_raw_nttrans_send(tree, &nt); - ndr_push_free(ndr); + talloc_free(ndr); return req; } diff --git a/source4/librpc/ndr/ndr.c b/source4/librpc/ndr/ndr.c index 6ed533776a..028d66d7b7 100644 --- a/source4/librpc/ndr/ndr.c +++ b/source4/librpc/ndr/ndr.c @@ -134,20 +134,6 @@ _PUBLIC_ struct ndr_push *ndr_push_init_ctx(TALLOC_CTX *mem_ctx) return ndr; } - -/* create a ndr_push structure, ready for some marshalling */ -_PUBLIC_ struct ndr_push *ndr_push_init(void) -{ - return ndr_push_init_ctx(NULL); -} - -/* free a ndr_push structure */ -_PUBLIC_ void ndr_push_free(struct ndr_push *ndr) -{ - talloc_free(ndr); -} - - /* return a DATA_BLOB structure for the current ndr_push marshalled data */ _PUBLIC_ DATA_BLOB ndr_push_blob(struct ndr_push *ndr) { diff --git a/source4/script/tests/test_local.sh b/source4/script/tests/test_local.sh index ec152432da..adeec2abc0 100755 --- a/source4/script/tests/test_local.sh +++ b/source4/script/tests/test_local.sh @@ -4,7 +4,7 @@ local_tests="LOCAL-REPLACE LOCAL-TALLOC LOCAL-STRLIST" local_tests="$local_tests LOCAL-IDTREE LOCAL-EVENT" local_tests="$local_tests LOCAL-SOCKET LOCAL-MESSAGING LOCAL-IRPC" local_tests="$local_tests LOCAL-NDR LOCAL-BINDING LOCAL-FILE LOCAL-REGISTRY" -local_tests="$local_tests LOCAL-SDDL LOCAL-PAC LOCAL-DBSPEED" +local_tests="$local_tests LOCAL-SDDL LOCAL-PAC LOCAL-DBSPEED LOCAL-TDR " local_tests="$local_tests LOCAL-NTLMSSP LOCAL-CRYPTO-MD4" local_tests="$local_tests LOCAL-CRYPTO-MD5 LOCAL-CRYPTO-HMACMD5" local_tests="$local_tests LOCAL-CRYPTO-SHA1 LOCAL-CRYPTO-HMACSHA1" |