]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
rpc_server: Fix talloc hierarchy in _srvsvc_NetSrvGetInfo()
authorVolker Lendecke <vl@samba.org>
Mon, 24 Apr 2023 14:46:17 +0000 (16:46 +0200)
committerJeremy Allison <jra@samba.org>
Fri, 16 Jun 2023 16:14:31 +0000 (16:14 +0000)
Make ->comment a proper talloc child of the right structure.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
source3/rpc_server/srvsvc/srv_srvsvc_nt.c

index 7ca35856d96551b5f09864b4cee25a19ca33279e..bfc9168ddbe4ee736cc58ef453572e34ec03b4b2 100644 (file)
@@ -1501,8 +1501,9 @@ WERROR _srvsvc_NetSrvGetInfo(struct pipes_struct *p,
                info102->version_major  = SAMBA_MAJOR_NBT_ANNOUNCE_VERSION;
                info102->version_minor  = SAMBA_MINOR_NBT_ANNOUNCE_VERSION;
                info102->server_type    = lp_default_server_announce();
-               info102->comment        = string_truncate(lp_server_string(talloc_tos(), lp_sub),
-                                               MAX_SERVER_STRING_LENGTH);
+               info102->comment =
+                       string_truncate(lp_server_string(info102, lp_sub),
+                                       MAX_SERVER_STRING_LENGTH);
                info102->users          = 0xffffffff;
                info102->disc           = 0xf;
                info102->hidden         = 0;
@@ -1527,8 +1528,9 @@ WERROR _srvsvc_NetSrvGetInfo(struct pipes_struct *p,
                info101->version_major  = SAMBA_MAJOR_NBT_ANNOUNCE_VERSION;
                info101->version_minor  = SAMBA_MINOR_NBT_ANNOUNCE_VERSION;
                info101->server_type    = lp_default_server_announce();
-               info101->comment        = string_truncate(lp_server_string(talloc_tos(), lp_sub),
-                                               MAX_SERVER_STRING_LENGTH);
+               info101->comment =
+                       string_truncate(lp_server_string(info101, lp_sub),
+                                       MAX_SERVER_STRING_LENGTH);
 
                r->out.info->info101 = info101;
                break;