summaryrefslogtreecommitdiff
path: root/source3/param
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2003-09-05 14:53:10 +0000
committerGerald Carter <jerry@samba.org>2003-09-05 14:53:10 +0000
commitcadff241823b9c2a239f5a5686629c280d2c2a48 (patch)
tree4b6580964fe4171b872f82005e3d213c099e58bf /source3/param
parent3c87804ccce2dead0b35388a4029149998f477a5 (diff)
downloadsamba-cadff241823b9c2a239f5a5686629c280d2c2a48.tar.gz
samba-cadff241823b9c2a239f5a5686629c280d2c2a48.tar.bz2
samba-cadff241823b9c2a239f5a5686629c280d2c2a48.zip
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)
Diffstat (limited to 'source3/param')
-rw-r--r--source3/param/loadparm.c9
1 files changed, 2 insertions, 7 deletions
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;