param: remove init printer values from s3-helpers

Change-Id: I2c4a85b4f5039158924982a277be20ebc2d6302e
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 b234ef66ae9beb9f82896108caf1f2d6d4826ad5..13d3425eeb7c0dde9042070dcf9aecc034f48dd1 100644 (file)
--- a/lib/param/loadparm.c
+++ b/lib/param/loadparm.c
@@ -1254,7 +1254,6 @@ bool handle_printing(struct loadparm_context *lp_ctx, struct loadparm_service *s
                            const char *pszParmValue, char **ptr)
 {
        static int parm_num = -1;
-       struct loadparm_service *s;
 
        if (parm_num == -1) {
                parm_num = lpcfg_map_parameter("printing");
@@ -1266,11 +1265,9 @@ bool handle_printing(struct loadparm_context *lp_ctx, struct loadparm_service *s
 
        if (lp_ctx->s3_fns) {
                if (service == NULL) {
-                       s = lp_ctx->sDefault;
-                       lp_ctx->s3_fns->init_printer_values(lp_ctx, lp_ctx->globals->ctx, s);
+                       init_printer_values(lp_ctx, lp_ctx->globals->ctx, lp_ctx->sDefault);
                } else {
-                       s = service;
-                       lp_ctx->s3_fns->init_printer_values(lp_ctx, s, s);
+                       init_printer_values(lp_ctx, service, service);
                }
        }
 

diff --git a/lib/param/loadparm.h b/lib/param/loadparm.h
index cfe1cce763800615c81daecd9614ded635505642..d4177e5bfe0abcfa75f549362942c17816dc980d 100644 (file)
--- a/lib/param/loadparm.h
+++ b/lib/param/loadparm.h
@@ -284,7 +284,6 @@ bool lp_string_set(char **, const char *);
 int getservicebyname(const char *, struct loadparm_service *);
 bool lp_include(struct loadparm_context *, struct loadparm_service *,
                const char *, char **);
-void init_printer_values(struct loadparm_context *, TALLOC_CTX *, struct loadparm_service *);
 bool lp_do_section(const char *pszSectionName, void *userdata);
 bool store_lp_set_cmdline(const char *pszParmName, const char *pszParmValue);
 

diff --git a/lib/param/s3_param.h b/lib/param/s3_param.h
index c8e20a88e3599e164b8351374abce59c986ab3fb..b83a528ba2291da7c8868f4bf2af21feb6cb8630 100644 (file)
--- a/lib/param/s3_param.h
+++ b/lib/param/s3_param.h
@@ -16,8 +16,6 @@ struct loadparm_s3_helpers
        char * (*lp_string)(TALLOC_CTX *ctx, const char *in);
        bool (*lp_include)(struct loadparm_context*, struct loadparm_service *,
                        const char *, char **);
-       void (*init_printer_values)(struct loadparm_context *, TALLOC_CTX *,
-                                   struct loadparm_service *);
        void (*init_ldap_debugging)(void);
        bool (*set_netbios_aliases)(const char **);
        bool (*lp_do_parameter)(int, const char *, const char *);

diff --git a/source3/param/loadparm_ctx.c b/source3/param/loadparm_ctx.c
index 00ae19dacdc7552e854deb1bd0fc8715ddcc8458..a8539d636a056d972d5ad3adeaefd6f62d3e34f1 100644 (file)
--- a/source3/param/loadparm_ctx.c
+++ b/source3/param/loadparm_ctx.c
@@ -70,7 +70,6 @@ static struct loadparm_s3_helpers s3_fns =
        .dump = lp_dump,
        .lp_string = lp_string,
        .lp_include = lp_include,
-       .init_printer_values = init_printer_values,
        .init_ldap_debugging = init_ldap_debugging,
        .set_netbios_aliases = set_netbios_aliases,
        .lp_do_parameter = lp_do_parameter,