sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-27 03:21:53 +03:00
Code

r10970: Fix bug #3166 - null pointer dereference if $HOME not

Browse Source 
defined. Also clarified confusing error messages.
Jeremy.
This commit is contained in:
Jeremy Allison 2005-10-13 18:08:25 +00:00 committed by Gerald (Jerry) Carter
parent 49b8d7d7f5
commit e2639ac9ff
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
source/libsmb/libsmbclient.c
View File

@ -5539,6 +5539,7 @@ SMBCCTX * smbc_init_context(SMBCCTX * context)
if (!smbc_initialized) {
/* Do some library wide intialisations the first time we get called */
BOOL conf_loaded = False;
/* Set this to what the user wants */
DEBUGLEVEL = context->debug;
@ -5547,16 +5548,22 @@ SMBCCTX * smbc_init_context(SMBCCTX * context)
/* Here we would open the smb.conf file if needed ... */
home = getenv("HOME");
slprintf(conf, sizeof(conf), "%s/.smb/smb.conf", home);
load_interfaces(); /* Load the list of interfaces ... */
in_client = True; /* FIXME, make a param */
if (!lp_load(conf, True, False, False)) {
home = getenv("HOME");
if (home) {
slprintf(conf, sizeof(conf), "%s/.smb/smb.conf", home);
if (lp_load(conf, True, False, False)) {
conf_loaded = True;
} else {
DEBUG(5, ("Could not load config file: %s\n",
conf));
}
}
if (!conf_loaded) {
/*
* Well, if that failed, try the dyn_CONFIGFILE
* Which points to the standard locn, and if that
@ -5565,10 +5572,9 @@ SMBCCTX * smbc_init_context(SMBCCTX * context)
*/
if (!lp_load(dyn_CONFIGFILE, True, False, False)) {
DEBUG(5, ("Could not load either config file: "
"%s or %s\n",
conf, dyn_CONFIGFILE));
} else {
DEBUG(5, ("Could not load config file: %s\n",
dyn_CONFIGFILE));
} else if (home) {
/*
* We loaded the global config file. Now lets
* load user-specific modifications to the