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

few fixes from Elrond(elrond@samba-tng.org) and Billy O'Connor(billy@oconnoronline.net)

Browse Source
This commit is contained in:
Simo Sorce 0001-01-01 00:00:00 +00:00
parent 30a0e72572
commit 88718883e0
3 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source/include/debug.h
View File

@ -85,11 +85,12 @@ extern int DEBUGLEVEL;
#define DBGC_PRINTDRIVERS 2
#define DBGC_LANMAN 3
#define DBGC_SMB 4
#define DBGC_RPC_SRV 5
#define DBGC_RPC_CLI 6
#define DBGC_PASSDB 7
#define DBGC_AUTH 8
#define DBGC_WINBIND 9
#define DBGC_RPC 5
#define DBGC_RPC_SRV 6
#define DBGC_RPC_CLI 7
#define DBGC_PASSDB 8
#define DBGC_AUTH 9
#define DBGC_WINBIND 10
/* So you can define DBGC_CLASS before including debug.h */

12
source/lib/debug.c
View File

@ -150,10 +150,11 @@ static const char *default_classname_table[] = {
"lanman", /* DBGC_LANMAN */
"smb", /* DBGC_SMB */
"rpc", /* DBGC_RPC */
"rpc_hdr", /* DBGC_RPC_HDR */
"rpc_srv", /* DBGC_RPC_SRV */
"rpc_cli", /* DBGC_RPC_CLI */
"passdb", /* DBGC_PASSDB */
"auth", /* DBGC_AUTH */
"bdc", /* DBGC_BDC */
"winbind", /* DBGC_WINBIND */
NULL
};
@ -171,7 +172,7 @@ utility lists registered debug class names's
#define MAX_CLASS_NAME_SIZE 1024
char *debug_list_class_names_and_levels(void)
static char *debug_list_class_names_and_levels(void)
{
int i, dim;
char **list;
@ -416,8 +417,11 @@ BOOL debug_parse_levels(const char *params_str)
{
char **params;
/* Just in case */
debug_init();
if (AllowDebugChange == False)
return True;
return True;
params = lp_list_make(params_str);

14
source/param/loadparm.c
View File

@ -3422,13 +3422,19 @@ static void lp_save_defaults(void)
break;
case P_STRING:
case P_USTRING:
parm_table[i].def.svalue =
strdup(*(char **)parm_table[i].ptr);
if (parm_table[i].ptr) {
parm_table[i].def.svalue = strdup(*(char **)parm_table[i].ptr);
} else {
parm_table[i].def.svalue = NULL;
}
break;
case P_GSTRING:
case P_UGSTRING:
parm_table[i].def.svalue =
strdup((char *)parm_table[i].ptr);
if (parm_table[i].ptr) {
parm_table[i].def.svalue = strdup((char *)parm_table[i].ptr);
} else {
parm_table[i].def.svalue = NULL;
}
break;
case P_BOOL:
case P_BOOLREV: