From: Volker Lendecke Date: Mon, 24 Apr 2023 14:46:17 +0000 (+0200) Subject: rpc_server: Fix talloc hierarchy in _srvsvc_NetSrvGetInfo() X-Git-Tag: talloc-2.4.1~343 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c64699aeb0bb67caddb830004f4db237b3dcfda8;p=thirdparty%2Fsamba.git rpc_server: Fix talloc hierarchy in _srvsvc_NetSrvGetInfo() Make ->comment a proper talloc child of the right structure. Signed-off-by: Volker Lendecke Reviewed-by: Jeremy Allison --- diff --git a/source3/rpc_server/srvsvc/srv_srvsvc_nt.c b/source3/rpc_server/srvsvc/srv_srvsvc_nt.c index 7ca35856d96..bfc9168ddbe 100644 --- a/source3/rpc_server/srvsvc/srv_srvsvc_nt.c +++ b/source3/rpc_server/srvsvc/srv_srvsvc_nt.c @@ -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;