sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

param: remove init printer values from s3-helpers

Browse Source 
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>
This commit is contained in:
Garming Sam 2014-03-27 15:32:42 +13:00 committed by Michael Adam
parent f605832d8e
commit 71eb59200a
4 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/param/loadparm.c
View File

@ -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);
}
}

1
lib/param/loadparm.h
View File

@ -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);

2
lib/param/s3_param.h
View File

@ -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 *);

1
source3/param/loadparm_ctx.c
View File

@ -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,