diff options
| author | Garming Sam <garming@catalyst.net.nz> | 2014-02-21 17:59:41 +1300 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2014-05-07 19:49:16 +0200 |
| commit | dce3bcd00ff0e63548b9d2849238d0ba68137481 (patch) | |
| tree | 5ed0b91c501a087053f8eb38d2d1ddc10eacbb32 /source3 | |
| parent | 74e0a37fd34791099a32591ab607e9444fd441fe (diff) | |
| download | samba-dce3bcd00ff0e63548b9d2849238d0ba68137481.tar.gz samba-dce3bcd00ff0e63548b9d2849238d0ba68137481.tar.xz samba-dce3bcd00ff0e63548b9d2849238d0ba68137481.zip | |
param: move handle printing into lib/param
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/param/loadparm.c | 29 | ||||
| -rw-r--r-- | source3/param/loadparm_ctx.c | 1 |
2 files changed, 2 insertions, 28 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index ff1f7250cbf..968a87e136f 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -265,7 +265,6 @@ static bool handle_idmap_backend(struct loadparm_context *unused, int snum, cons static bool handle_idmap_uid(struct loadparm_context *unused, int snum, const char *pszParmValue, char **ptr); static bool handle_idmap_gid(struct loadparm_context *unused, int snum, const char *pszParmValue, char **ptr); static bool handle_netbios_aliases(struct loadparm_context *unused, int snum, const char *pszParmValue, char **ptr ); -static bool handle_printing(struct loadparm_context *unused, int snum, const char *pszParmValue, char **ptr); static bool handle_ldap_debug_level(struct loadparm_context *unused, int snum, const char *pszParmValue, char **ptr); static void set_allowed_client_auth(void); @@ -321,7 +320,7 @@ bool lp_string_set(char **dest, const char *src) { Initialise the sDefault parameter structure for the printer values. ***************************************************************************/ -static void init_printer_values(TALLOC_CTX *ctx, struct loadparm_service *pService) +void init_printer_values(TALLOC_CTX *ctx, struct loadparm_service *pService) { /* choose defaults depending on the type of printing */ switch (pService->printing) { @@ -2635,32 +2634,6 @@ const char *lp_ldap_idmap_suffix(TALLOC_CTX *ctx) return lp_string(ctx, Globals.ldap_suffix); } -/*************************************************************************** -***************************************************************************/ - -static bool handle_printing(struct loadparm_context *unused, int snum, const char *pszParmValue, char **ptr) -{ - static int parm_num = -1; - struct loadparm_service *s; - - if ( parm_num == -1 ) - parm_num = lpcfg_map_parameter( "printing" ); - - if (!lp_set_enum_parm(&parm_table[parm_num], pszParmValue, (int*)ptr)) { - return false; - } - - if ( snum < 0 ) { - s = &sDefault; - init_printer_values(Globals.ctx, s); - } else { - s = ServicePtrs[snum]; - init_printer_values(s, s); - } - - return true; -} - /** return the parameter pointer for a parameter */ diff --git a/source3/param/loadparm_ctx.c b/source3/param/loadparm_ctx.c index b6e185e653a..b1e318f6d35 100644 --- a/source3/param/loadparm_ctx.c +++ b/source3/param/loadparm_ctx.c @@ -72,6 +72,7 @@ static struct loadparm_s3_helpers s3_fns = .lp_string = lp_string, .lp_string_set = lp_string_set, .lp_include = lp_include, + .init_printer_values = init_printer_values, }; const struct loadparm_s3_helpers *loadparm_s3_helpers(void) |