From 249368f937406e1c714fff3d44775c414b32ff21 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Sat, 15 Jun 2002 13:05:37 +0000 Subject: Simplify this code further. Just substitute %H, and let the normal code paths handle the rest later. Andrew Bartlett (This used to be commit 09754ec797c4232d2016c7eff2e74044f28ebb7c) --- source3/param/loadparm.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'source3/param') diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 3c0820491d..5be1fb2762 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -1902,8 +1902,7 @@ BOOL lp_add_home(const char *pszHomename, int iDefaultService, pstrcpy(newHomedir, pszHomedir); } else { pstrcpy(newHomedir, lp_pathname(iDefaultService)); - standard_sub_home(iDefaultService, pszHomename, user, - pszHomedir, newHomedir); + string_sub(newHomedir,"%H", pszHomedir, sizeof(newHomedir)); } string_set(&ServicePtrs[i]->szPath, newHomedir); @@ -1912,7 +1911,7 @@ BOOL lp_add_home(const char *pszHomename, int iDefaultService, { pstring comment; slprintf(comment, sizeof(comment) - 1, - "Home directory of %s", pszHomename); + "Home directory of %s", user); string_set(&ServicePtrs[i]->comment, comment); } ServicePtrs[i]->bAvailable = sDefault.bAvailable; @@ -1921,7 +1920,7 @@ BOOL lp_add_home(const char *pszHomename, int iDefaultService, DEBUG(3, ("adding home's share [%s] for user %s at %s\n", pszHomename, user, newHomedir)); - + return (True); } -- cgit