From ff0947fbed841065fce85c64ff4b2a2e8f24f056 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Tue, 4 Sep 2007 10:15:04 +0000 Subject: r24949: Remove some static buffers (This used to be commit df648d47ff3c4e24f439fda839653bda98323100) --- source3/smbd/lanman.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'source3/smbd') diff --git a/source3/smbd/lanman.c b/source3/smbd/lanman.c index 581ac90aeb..9eb2a283cc 100644 --- a/source3/smbd/lanman.c +++ b/source3/smbd/lanman.c @@ -116,18 +116,16 @@ static int StrlenExpanded(connection_struct *conn, int snum, char *s) static char *Expand(connection_struct *conn, int snum, char *s) { - static pstring buf; + pstring buf; if (!s) { return NULL; } StrnCpy(buf,s,sizeof(buf)/2); pstring_sub(buf,"%S",lp_servicename(snum)); - standard_sub_advanced(lp_servicename(SNUM(conn)), conn->user, - conn->connectpath, conn->gid, - get_current_username(), - current_user_info.domain, - buf, sizeof(buf)); - return &buf[0]; + return talloc_sub_advanced(talloc_tos(), lp_servicename(SNUM(conn)), + conn->user, conn->connectpath, conn->gid, + get_current_username(), + current_user_info.domain, buf); } /******************************************************************* -- cgit