s3-lib: Remove unused standard_sub_conn()

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 6108a408f1ac342b4951a1e9b7252e47bdc2562c..f7f74e17f7988628935342b317dab53e621c4430 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -265,7 +265,6 @@ void standard_sub_advanced(const char *servicename, const char *user,
                           const char *connectpath, gid_t gid,
                           const char *smb_name, const char *domain_name,
                           char *str, size_t len);
-char *standard_sub_conn(TALLOC_CTX *ctx, connection_struct *conn, const char *str);
 
 /* The following definitions come from lib/sysacls.c  */
 

diff --git a/source3/lib/substitute.c b/source3/lib/substitute.c
index 7acb0217ff3cac3993aadde62d60b02469d8b409..08cc03eeb275aba1cbc794390435780c6aacdf44 100644 (file)
--- a/source3/lib/substitute.c
+++ b/source3/lib/substitute.c
@@ -779,25 +779,6 @@ void standard_sub_advanced(const char *servicename, const char *user,
        TALLOC_FREE( s );
 }
 
-/****************************************************************************
- Do some standard substitutions in a string.
-****************************************************************************/
-
-char *standard_sub_conn(TALLOC_CTX *ctx, connection_struct *conn, const char *str)
-{
-       /* Make clear that we require the optional unix_token and unix_info in the source3 code */
-       SMB_ASSERT(conn->session_info->unix_token);
-       SMB_ASSERT(conn->session_info->unix_info);
-       return talloc_sub_advanced(ctx,
-                               lp_servicename(SNUM(conn)),
-                               conn->session_info->unix_info->unix_name,
-                               conn->connectpath,
-                               conn->session_info->unix_token->gid,
-                               get_smb_user_name(),
-                               "",
-                               str);
-}
-
 /******************************************************************************
  version of standard_sub_basic() for string lists; uses talloc_sub_basic()
  for the work