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/lib/substitute.c | 36 ------------------------------------ 1 file changed, 36 deletions(-) (limited to 'source3/lib') 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 @@ -342,42 +342,6 @@ void standard_sub_conn(connection_struct *conn, char *str) standard_sub_advanced(SNUM(conn), conn->user, conn->connectpath, conn->gid, current_user_info.smb_name, 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. ****************************************************************************/ -- cgit