diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-02-09 12:51:22 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-02-17 12:19:29 +0100 |
| commit | b190e3cd79a7de79c62ad58fdc9d768ae96dc5e9 (patch) | |
| tree | a595ea61c58509f6606bb18c855e3dfe11b51014 | |
| parent | 846a697e20478798288afb43cdb7a9f389a15c69 (diff) | |
| download | samba-b190e3cd79a7de79c62ad58fdc9d768ae96dc5e9.tar.gz samba-b190e3cd79a7de79c62ad58fdc9d768ae96dc5e9.tar.bz2 samba-b190e3cd79a7de79c62ad58fdc9d768ae96dc5e9.zip | |
s3-lib: Remove unused standard_sub_conn()
| -rw-r--r-- | source3/include/proto.h | 1 | ||||
| -rw-r--r-- | source3/lib/substitute.c | 19 |
2 files changed, 0 insertions, 20 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index 6108a408f1..f7f74e17f7 100644 --- 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 7acb0217ff..08cc03eeb2 100644 --- 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 |