param: get rid of unnecessary get_default_loadparm_service pointer

Change-Id: I9f512be671e5cd738c43fd97c9c3e0b4ee7a2736
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>

diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
index aff8986a5f652c14c095fd113765d88787691beb..2b73d40f6c3f35c794599abcf60eea3bd6e7caf5 100644 (file)
--- a/lib/param/loadparm.c
+++ b/lib/param/loadparm.c
@@ -74,9 +74,6 @@
 
 struct loadparm_service *lpcfg_default_service(struct loadparm_context *lp_ctx)
 {
-       if (lp_ctx->s3_fns) {
-               return lp_ctx->s3_fns->get_default_loadparm_service();
-       }
        return lp_ctx->sDefault;
 }
 

diff --git a/lib/param/s3_param.h b/lib/param/s3_param.h
index 539f0d63c564ba63693fabb62c73b8372d7493fa..f31c5bcbaa953006d96c9f79050f275d74a3a2c0 100644 (file)
--- a/lib/param/s3_param.h
+++ b/lib/param/s3_param.h
@@ -5,7 +5,6 @@ struct loadparm_s3_helpers
 {
        void * (*get_parm_ptr)(struct loadparm_service *service, struct parm_struct *parm);
        struct loadparm_service * (*get_service)(const char *service_name);
-       struct loadparm_service * (*get_default_loadparm_service)(void);
        struct loadparm_service * (*get_servicebynum)(int snum);
        int (*getservicebyname)(const char *, struct loadparm_service *);
        int (*get_numservices)(void);

diff --git a/source3/param/loadparm_ctx.c b/source3/param/loadparm_ctx.c
index 5782a9614b7f645e37731a4d9e5cec01fd59bca6..fdad041e677ac50dd818e1e3e8bed86833e755a8 100644 (file)
--- a/source3/param/loadparm_ctx.c
+++ b/source3/param/loadparm_ctx.c
@@ -62,7 +62,6 @@ static struct loadparm_s3_helpers s3_fns =
        .get_service = lp_service_for_s4_ctx,
        .get_servicebynum = lp_servicebynum_for_s4_ctx,
        .getservicebyname = getservicebyname,
-       .get_default_loadparm_service = lp_default_loadparm_service,
        .get_numservices = lp_numservices,
        .load = lp_load_for_s4_ctx,
        .store_cmdline = store_lp_set_cmdline,