From cadff241823b9c2a239f5a5686629c280d2c2a48 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Fri, 5 Sep 2003 14:53:10 +0000 Subject: revert the change from r1.414 in HEAD that removed the ability to use variables in paths for the [homes] service. (This used to be commit 8fd13b63103b3c144bdd170edcb3b642dfd9bb54) --- source3/param/loadparm.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'source3') diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 348abcc9e7..3d0aebf230 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -2296,13 +2296,8 @@ BOOL lp_add_home(const char *pszHomename, int iDefaultService, if (!(*(ServicePtrs[iDefaultService]->szPath)) || strequal(ServicePtrs[iDefaultService]->szPath, lp_pathname(GLOBAL_SECTION_SNUM))) { pstrcpy(newHomedir, pszHomedir); - } else { - pstrcpy(newHomedir, lp_pathname(iDefaultService)); - string_sub(newHomedir,"%H", pszHomedir, sizeof(newHomedir)); - string_sub(newHomedir,"%S", pszHomename, sizeof(newHomedir)); - } - - string_set(&ServicePtrs[i]->szPath, newHomedir); + string_set(&ServicePtrs[i]->szPath, newHomedir); + } if (!(*(ServicePtrs[i]->comment))) { pstring comment; -- cgit