diff options
| author | Garming Sam <garming@catalyst.net.nz> | 2014-03-27 15:03:37 +1300 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2014-07-31 08:17:11 +0200 |
| commit | 397a3ece0bcb0b932817643878dcd669668d31ec (patch) | |
| tree | 280a6e47aa508b700999cad4cc5ffd53557193d4 /lib/param | |
| parent | 308d802f62839c7df27fd6384f33e36f4273f02a (diff) | |
param: change init_printer_values to take an lp ctx
Change-Id: I55cda94bbf1daf276ec0c45b056bd81645eaa25f
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
Diffstat (limited to 'lib/param')
| -rw-r--r-- | lib/param/loadparm.c | 4 | ||||
| -rw-r--r-- | lib/param/loadparm.h | 2 | ||||
| -rw-r--r-- | lib/param/s3_param.h | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c index 75ddb221c1..683060c99c 100644 --- a/lib/param/loadparm.c +++ b/lib/param/loadparm.c @@ -1267,10 +1267,10 @@ 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->globals->ctx, s); + lp_ctx->s3_fns->init_printer_values(lp_ctx, lp_ctx->globals->ctx, s); } else { s = service; - lp_ctx->s3_fns->init_printer_values(s, s); + lp_ctx->s3_fns->init_printer_values(lp_ctx, s, s); } } diff --git a/lib/param/loadparm.h b/lib/param/loadparm.h index 79f12cb8ed..cfe1cce763 100644 --- a/lib/param/loadparm.h +++ b/lib/param/loadparm.h @@ -284,7 +284,7 @@ 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(TALLOC_CTX *, struct loadparm_service *); +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 b3dc3f8087..c8e20a88e3 100644 --- a/lib/param/s3_param.h +++ b/lib/param/s3_param.h @@ -16,7 +16,8 @@ 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)(TALLOC_CTX *, struct loadparm_service *); + 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 *); |