sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

param: attempt to consolidate handle_logfile between the two loadparms

Browse Source 
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-on: https://gerrit.samba.org/104
Reviewed-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Garming Sam 2014-02-17 16:38:59 +13:00 committed by Jeremy Allison
parent e06acfadd0
commit a39d569336
2 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/param/loadparm.c
View File

@ -102,8 +102,6 @@ static bool handle_realm(struct loadparm_context *lp_ctx, int unused,
const char *pszParmValue, char **ptr);
static bool handle_copy(struct loadparm_context *lp_ctx, int unused,
const char *pszParmValue, char **ptr);
static bool handle_logfile(struct loadparm_context *lp_ctx, int unused,
const char *pszParmValue, char **ptr);
#include "lib/param/param_table.c"
@ -1146,13 +1144,16 @@ bool handle_debug_list(struct loadparm_context *lp_ctx, int unused,
return debug_parse_levels(pszParmValue);
}
static bool handle_logfile(struct loadparm_context *lp_ctx, int unused,
const char *pszParmValue, char **ptr)
bool handle_logfile(struct loadparm_context *lp_ctx, int unused,
const char *pszParmValue, char **ptr)
{
debug_set_logfile(pszParmValue);
if (lp_ctx->global) {
if (lp_ctx->s3_fns != NULL) {
lp_ctx->s3_fns->lp_string_set(ptr, pszParmValue);
} else {
debug_set_logfile(pszParmValue);
lpcfg_string_set(lp_ctx, ptr, pszParmValue);
}
return true;
}

6
source3/param/loadparm.c
View File

@ -272,12 +272,6 @@ static bool handle_dos_charset(struct loadparm_context *unused, int snum, const
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);
/* these are parameter handlers which are not needed in the
* source3 code
*/
#define handle_logfile NULL
static void set_allowed_client_auth(void);
static void add_to_file_list(const char *fname, const char *subfname);