The branch, master has been updated
via 276a1a7... s3/s4 - remove "talloc_tos()" from common code since s4
doesn't support it
from c38f94e... s4:dsdb_load_partition_usn - free the right memory
context (tmp_ctx)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 276a1a7fec1432bde870448f247ef710554c3ab8
Author: Matthias Dieter Wallnöfer <[email protected]>
Date: Mon Jun 21 12:33:57 2010 +0200
s3/s4 - remove "talloc_tos()" from common code since s4 doesn't support it
Please don't use this in common code parts until we change the policy
regarding
it.
-----------------------------------------------------------------------
Summary of changes:
libcli/named_pipe_auth/npa_tstream.c | 2 +-
libcli/security/display_sec.c | 13 +++++++++----
2 files changed, 10 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/libcli/named_pipe_auth/npa_tstream.c
b/libcli/named_pipe_auth/npa_tstream.c
index 273c412..3518584 100644
--- a/libcli/named_pipe_auth/npa_tstream.c
+++ b/libcli/named_pipe_auth/npa_tstream.c
@@ -73,7 +73,7 @@ struct tevent_req *tstream_npa_connect_send(TALLOC_CTX
*mem_ctx,
struct tevent_req *subreq;
int ret;
enum ndr_err_code ndr_err;
- char *lower_case_npipe = strlower_talloc(talloc_tos(), npipe);
+ char *lower_case_npipe = strlower_talloc(mem_ctx, npipe);
if (!lower_case_npipe) {
return NULL;
diff --git a/libcli/security/display_sec.c b/libcli/security/display_sec.c
index bec657d..6a82067 100644
--- a/libcli/security/display_sec.c
+++ b/libcli/security/display_sec.c
@@ -159,15 +159,20 @@ void display_sec_ace_flags(uint8_t flags)
****************************************************************************/
static void disp_sec_ace_object(struct security_ace_object *object)
{
+ char *str;
if (object->flags & SEC_ACE_OBJECT_TYPE_PRESENT) {
+ str = GUID_string(NULL, &object->type.type);
+ if (str == NULL) return;
printf("Object type: SEC_ACE_OBJECT_TYPE_PRESENT\n");
- printf("Object GUID: %s\n", GUID_string(talloc_tos(),
- &object->type.type));
+ printf("Object GUID: %s\n", str);
+ talloc_free(str);
}
if (object->flags & SEC_ACE_INHERITED_OBJECT_TYPE_PRESENT) {
+ str = GUID_string(NULL, &object->inherited_type.inherited_type);
+ if (str == NULL) return;
printf("Object type: SEC_ACE_INHERITED_OBJECT_TYPE_PRESENT\n");
- printf("Object GUID: %s\n", GUID_string(talloc_tos(),
- &object->inherited_type.inherited_type));
+ printf("Object GUID: %s\n", str);
+ talloc_free(str);
}
}
--
Samba Shared Repository
