summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2002-06-15 13:05:37 +0000
committerAndrew Bartlett <abartlet@samba.org>2002-06-15 13:05:37 +0000
commit249368f937406e1c714fff3d44775c414b32ff21 (patch)
tree0d1406b3b5851384bee9df102cffef37975744fd
parent3c3814da252cdf45e33446c553e0ea009ea9c9bd (diff)
downloadsamba-249368f937406e1c714fff3d44775c414b32ff21.tar.gz
samba-249368f937406e1c714fff3d44775c414b32ff21.tar.bz2
samba-249368f937406e1c714fff3d44775c414b32ff21.zip
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)
-rw-r--r--source3/lib/substitute.c36
-rw-r--r--source3/param/loadparm.c7
2 files changed, 3 insertions, 40 deletions
diff --git a/source3/lib/substitute.c b/source3/lib/substitute.c
index eea720c014..439263dd23 100644
--- a/source3/lib/substitute.c
+++ b/source3/lib/substitute.c
@@ -343,42 +343,6 @@ void standard_sub_conn(connection_struct *conn, char *str)
}
/****************************************************************************
- Like standard_sub but for a homes share where snum still points to the [homes]
- share. No user specific snum created yet so servicename should be the username.
-****************************************************************************/
-
-void standard_sub_home(int snum, const char *share,
- const char *user, const char *homedir, pstring str)
-{
- char *p, *s;
-
- for (s=str; (p=strchr_m(s, '%'));s=p) {
- int l = sizeof(pstring) - (int)(p-str);
-
- switch (*(p+1)) {
- case 'H':
- string_sub(p,"%H", homedir, l);
- break;
-
- case 'S':
- string_sub(p,"%S", share, l);
- break;
- case 'p':
- string_sub(p,"%p", automount_path(user), l);
- break;
- case '\0':
- p++;
- break; /* don't run off the end of the string */
-
- default: p+=2;
- break;
- }
- }
-
- standard_sub_advanced(snum, user, "", -1, current_user_info.smb_name, str);
-}
-
-/****************************************************************************
Like standard_sub but by snum.
****************************************************************************/
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);
}