From: Matthias Dieter Wallnöfer <mdw@samba.org>
Date: Mon, 21 Jun 2010 10:33:57 +0000 (+0200)
Subject: s3/s4 - remove "talloc_tos()" from common code since s4 doesn't support it
X-Git-Tag: samba-3.6.0pre1~812
X-Git-Url: http://git.samba.org/samba.git/?p=ira%2Fwip.git;a=commitdiff_plain;h=276a1a7fec1432bde870448f247ef710554c3ab8

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.
---

diff --git a/libcli/named_pipe_auth/npa_tstream.c b/libcli/named_pipe_auth/npa_tstream.c
index 273c4123e19..351858408c0 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 bec657da868..6a820673b64 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);
 	}
 }