summaryrefslogtreecommitdiff
path: root/source3/lib/substitute.c
diff options
context:
space:
mode:
Diffstat (limited to 'source3/lib/substitute.c')
-rw-r--r--source3/lib/substitute.c22
1 files changed, 2 insertions, 20 deletions
diff --git a/source3/lib/substitute.c b/source3/lib/substitute.c
index 2550d00d14..026df0f67f 100644
--- a/source3/lib/substitute.c
+++ b/source3/lib/substitute.c
@@ -297,13 +297,8 @@ void standard_sub_basic(const char *smb_name, char *str,size_t len)
case 'L' :
if (local_machine_name && *local_machine_name)
string_sub(p,"%L", local_machine_name,l);
- else {
- pstring temp_name;
-
- pstrcpy(temp_name, global_myname);
- strlower(temp_name);
- string_sub(p,"%L", temp_name,l);
- }
+ else
+ string_sub(p,"%L", global_myname,l);
break;
case 'M' :
string_sub(p,"%M", client_name(),l);
@@ -680,19 +675,6 @@ void standard_sub_conn(connection_struct *conn, char *str, size_t len)
conn->gid, current_user_info.smb_name, str, len);
}
-char *talloc_sub_conn(TALLOC_CTX *mem_ctx, connection_struct *conn, char *str)
-{
- return talloc_sub_advanced(mem_ctx, SNUM(conn), conn->user,
- conn->connectpath, conn->gid,
- current_user_info.smb_name, str);
-}
-
-char *alloc_sub_conn(connection_struct *conn, char *str)
-{
- return alloc_sub_advanced(SNUM(conn), conn->user, conn->connectpath,
- conn->gid, current_user_info.smb_name, str);
-}
-
/****************************************************************************
Like standard_sub but by snum.
****************************************************************************/