From a591de28659919d2afd7ed55106cded6a0d9ab35 Mon Sep 17 00:00:00 2001 From: Ralph Boehme Date: Thu, 31 Oct 2019 10:19:13 +0100 Subject: s3: remove unused function standard_sub_advanced() BUG: https://bugzilla.samba.org/show_bug.cgi?id=13745 Signed-off-by: Ralph Boehme Reviewed-by: Andreas Schneider --- source3/include/proto.h | 4 ---- source3/lib/substitute.c | 16 ---------------- 2 files changed, 20 deletions(-) diff --git a/source3/include/proto.h b/source3/include/proto.h index cdec671dac3..856b41272ad 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -185,10 +185,6 @@ char *talloc_sub_advanced(TALLOC_CTX *mem_ctx, const char *connectpath, gid_t gid, const char *smb_name, const char *domain_name, const char *str); -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); /* The following definitions come from lib/sysquotas.c */ diff --git a/source3/lib/substitute.c b/source3/lib/substitute.c index f8ca6f41cc1..8fd4fbf9519 100644 --- a/source3/lib/substitute.c +++ b/source3/lib/substitute.c @@ -863,22 +863,6 @@ char *talloc_sub_advanced(TALLOC_CTX *ctx, return ret_string; } -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 *s = talloc_sub_advanced(talloc_tos(), - servicename, user, connectpath, - gid, smb_name, domain_name, str); - - if (!s) { - return; - } - strlcpy( str, s, len ); - TALLOC_FREE( s ); -} - /****************************************************************************** version of standard_sub_basic() for string lists; uses talloc_sub_basic() for the work -- cgit v1.2.1