]> git.ipfire.org Git - ipfire-2.x.git/blob - src/patches/samba/samba-3.6.23-libsmbclient.patch
Merge remote-tracking branch 'origin/master' into next
[ipfire-2.x.git] / src / patches / samba / samba-3.6.23-libsmbclient.patch
1 From b2b00b1d7871f7557fe7e8f616fa46a8e5ebd298 Mon Sep 17 00:00:00 2001
2 From: Andreas Schneider <asn@samba.org>
3 Date: Wed, 28 May 2014 16:02:15 +0200
4 Subject: [PATCH] PATCHSET10: s3-libsmbclient: Always initialize globals.
5
6 This fixes cases where we dereference NULL pointers of globals which
7 were not initialized.
8 ---
9 source3/libsmb/libsmb_context.c | 4 ++--
10 1 file changed, 2 insertions(+), 2 deletions(-)
11
12 diff --git a/source3/libsmb/libsmb_context.c b/source3/libsmb/libsmb_context.c
13 index 6c20d65..888c2ef 100644
14 --- a/source3/libsmb/libsmb_context.c
15 +++ b/source3/libsmb/libsmb_context.c
16 @@ -76,7 +76,7 @@ SMBC_module_init(void * punused)
17 * defaults ...
18 */
19
20 - if (!lp_load(get_dyn_CONFIGFILE(), True, False, False, False)) {
21 + if (!lp_load(get_dyn_CONFIGFILE(), True, False, False, True)) {
22 DEBUG(5, ("Could not load config file: %s\n",
23 get_dyn_CONFIGFILE()));
24 } else if (home) {
25 @@ -89,7 +89,7 @@ SMBC_module_init(void * punused)
26 if (asprintf(&conf,
27 "%s/.smb/smb.conf.append",
28 home) > 0) {
29 - if (!lp_load(conf, True, False, False, False)) {
30 + if (!lp_load(conf, True, False, False, True)) {
31 DEBUG(10,
32 ("Could not append config file: "
33 "%s\n",
34 --
35 1.9.3
36