From: Andrew Bartlett <abartlet@samba.org>
Date: Wed, 10 Mar 2021 02:59:10 +0000 (+1300)
Subject: lib/param: Remove lpcfg_volume_label() and only caller in NTVFS file server
X-Git-Tag: tevent-0.11.0~1610
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5cdc065211ef26f0c262751f17c3511a2dcca950;p=thirdparty%2Fsamba.git

lib/param: Remove lpcfg_volume_label() and only caller in NTVFS file server

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
---

diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
index 90f420c0b1b..0c4c3d0f555 100644
--- a/lib/param/loadparm.c
+++ b/lib/param/loadparm.c
@@ -3280,18 +3280,6 @@ const char *lpcfg_servicename(const struct loadparm_service *service)
 	return service ? lpcfg_string((const char *)service->szService) : NULL;
 }
 
-/**
- * A useful volume label function.
- */
-const char *lpcfg_volume_label(struct loadparm_service *service, struct loadparm_service *sDefault)
-{
-	const char *ret;
-	ret = lpcfg_string((const char *)((service != NULL && service->volume != NULL) ?
-				       service->volume : sDefault->volume));
-	if (!*ret)
-		return lpcfg_servicename(service);
-	return ret;
-}
 struct smb_iconv_handle *lpcfg_iconv_handle(struct loadparm_context *lp_ctx)
 {
 	if (lp_ctx == NULL) {
diff --git a/lib/param/param.h b/lib/param/param.h
index 2ccb6b9b41c..07b387a8108 100644
--- a/lib/param/param.h
+++ b/lib/param/param.h
@@ -179,10 +179,6 @@ struct loadparm_service *lpcfg_servicebynum(struct loadparm_context *lp_ctx,
 struct loadparm_service *lpcfg_service(struct loadparm_context *lp_ctx,
 				    const char *service_name);
 
-/**
- * A useful volume label function.
- */
-const char *lp_cfg_volume_label(struct loadparm_service *service, struct loadparm_service *sDefault);
 struct smb_iconv_handle *lpcfg_iconv_handle(struct loadparm_context *lp_ctx);
 void lpcfg_smbcli_options(struct loadparm_context *lp_ctx,
 			 struct smbcli_options *options);
diff --git a/source4/param/share.h b/source4/param/share.h
index 9fa37289d28..f9a749af523 100644
--- a/source4/param/share.h
+++ b/source4/param/share.h
@@ -93,7 +93,6 @@ NTSTATUS share_init(void);
 #define SHARE_HOSTS_DENY	"hosts-deny"
 #define SHARE_NTVFS_HANDLER	"ntvfs-handler"
 #define SHARE_TYPE		"type"
-#define SHARE_VOLUME		"volume"
 #define SHARE_CSC_POLICY	"csc-policy"
 #define SHARE_AVAILABLE		"available"
 #define SHARE_BROWSEABLE	"browseable"
diff --git a/source4/param/share_classic.c b/source4/param/share_classic.c
index d938cb29f55..653723e3b0a 100644
--- a/source4/param/share_classic.c
+++ b/source4/param/share_classic.c
@@ -84,10 +84,6 @@ static char *sclassic_string_option(TALLOC_CTX *mem_ctx,
 		return lpcfg_comment(s, lpcfg_default_service(lp_ctx), mem_ctx);
 	}
 
-	if (strcmp(opt_name, SHARE_VOLUME) == 0) {
-		return talloc_strdup(mem_ctx, lpcfg_volume_label(s, lpcfg_default_service(lp_ctx)));
-	}
-
 	if (strcmp(opt_name, SHARE_TYPE) == 0) {
 		if (lpcfg_printable(s, lpcfg_default_service(lp_ctx))) {
 			return talloc_strdup(mem_ctx, "PRINTER");