revert the change from r1.414 in HEAD that removed the

ability to use variables in paths for the [homes] service.

diff --git a/source/param/loadparm.c b/source/param/loadparm.c
index 348abcc9e736361ed1ce89a7de210f9967765e16..3d0aebf230be91ed7912c96c6dc35b1a49820f3a 100644 (file)
--- a/source/param/loadparm.c
+++ b/source/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;