summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2007-09-04 10:15:04 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:30:29 -0500
commitff0947fbed841065fce85c64ff4b2a2e8f24f056 (patch)
treedf5c9cadb1d89cc0ee6b5fdf712743443b209d7c /source3/smbd
parentfaefb22c61568c678476b4dad36bdc5ce3afb499 (diff)
downloadsamba-ff0947fbed841065fce85c64ff4b2a2e8f24f056.tar.gz
samba-ff0947fbed841065fce85c64ff4b2a2e8f24f056.tar.bz2
samba-ff0947fbed841065fce85c64ff4b2a2e8f24f056.zip
r24949: Remove some static buffers
(This used to be commit df648d47ff3c4e24f439fda839653bda98323100)
Diffstat (limited to 'source3/smbd')
-rw-r--r--source3/smbd/lanman.c12
1 files changed, 5 insertions, 7 deletions
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);
}
/*******************************************************************