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 273c4123e19d7c9fa7f898e1e68938a7445736e0..351858408c05f1681bc20e940e145c79c0c9e9ca 100644 (file)
--- 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 bec657da868756d393aaedeeb73b09d5070d0edb..6a820673b641fd7112b58f385f1a8af57cadd991 100644 (file)
--- 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);
        }
 }