The branch, master has been updated
via feac8bf s3:winbindd/idmap_autorid_tdb fix a compiler warning
via f0a260c s3:vfs_fruit fix a compiler warning
via 8ca0f14 s4:torture/ntlmssp fix a compiler warning
via fc8e507 s4:heimdal fix a compile warning
via c55e8f2 util: Update GPL header of talloc_stack.h
via 0a5cb63 ctdb: Install helpers under libexecdir
from 2deba05 ctdb-ipalloc: Remove most uses of struct
ctdb_public_ip_list_old
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit feac8bfd37e4ed28f2df48756e4fffa80867ad38
Author: Christian Ambach <a...@samba.org>
Date: Mon Feb 8 23:22:55 2016 +0100
s3:winbindd/idmap_autorid_tdb fix a compiler warning
about a potentially uninitialized variable
Signed-off-by: Christian Ambach <a...@samba.org>
Reviewed-by: Andreas Schneider <a...@samba.org>
Autobuild-User(master): Andreas Schneider <a...@cryptomilk.org>
Autobuild-Date(master): Fri Feb 12 12:07:07 CET 2016 on sn-devel-144
commit f0a260cc1b1b3013682740238ddc5ade305fcd29
Author: Christian Ambach <a...@samba.org>
Date: Mon Feb 8 23:22:26 2016 +0100
s3:vfs_fruit fix a compiler warning
about a potentially uninitialized variable
Signed-off-by: Christian Ambach <a...@samba.org>
Reviewed-by: Andreas Schneider <a...@samba.org>
commit 8ca0f14b5c4ac85e40c9c96f8f5ebb569335f031
Author: Christian Ambach <a...@samba.org>
Date: Mon Feb 8 23:20:19 2016 +0100
s4:torture/ntlmssp fix a compiler warning
about invalid array subscript
Signed-off-by: Christian Ambach <a...@samba.org>
Reviewed-by: Andreas Schneider <a...@samba.org>
commit fc8e507b48a23e02b7d73e040eb5ac7d3e4232a7
Author: Christian Ambach <a...@samba.org>
Date: Sat Feb 6 10:49:53 2016 +0100
s4:heimdal fix a compile warning
about a potentially uninitialized variable
Signed-off-by: Christian Ambach <a...@samba.org>
Reviewed-by: Andreas Schneider <a...@samba.org>
commit c55e8f2a1ab5b7b6fc8e53e767e63abc69109b63
Author: Andreas Schneider <a...@samba.org>
Date: Thu Feb 11 09:54:45 2016 +0100
util: Update GPL header of talloc_stack.h
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Volker Lendecke <v...@samba.org>
commit 0a5cb637d4e25ab94f8dcfd8ab2d205eac90bec3
Author: Martin Schwenke <mar...@meltin.net>
Date: Fri Feb 12 10:12:13 2016 +1100
ctdb: Install helpers under libexecdir
Signed-off-by: Martin Schwenke <mar...@meltin.net>
Reviewed-by: Andreas Schneider <a...@samba.org>
-----------------------------------------------------------------------
Summary of changes:
ctdb/config/events.d/11.natgw | 2 +-
ctdb/config/functions | 4 ++++
ctdb/config/statd-callout | 9 +++++----
ctdb/packaging/RPM/ctdb.spec.in | 11 ++++++-----
ctdb/tests/eventscripts/scripts/local.sh | 1 +
ctdb/wscript | 19 +++++++++++--------
lib/util/talloc_stack.h | 5 ++---
source3/modules/vfs_fruit.c | 2 +-
source3/winbindd/idmap_autorid_tdb.c | 2 +-
source4/heimdal/lib/krb5/fcache.c | 4 ++--
source4/torture/ndr/ntlmssp.c | 3 ---
11 files changed, 34 insertions(+), 28 deletions(-)
Changeset truncated at 500 lines:
diff --git a/ctdb/config/events.d/11.natgw b/ctdb/config/events.d/11.natgw
index 956f77b..25cf27f 100755
--- a/ctdb/config/events.d/11.natgw
+++ b/ctdb/config/events.d/11.natgw
@@ -168,7 +168,7 @@ natgw_set_slave ()
natgw_ensure_master ()
{
- set -- $(ctdb_natgw master)
+ set -- $("${CTDB_HELPER_BINDIR}/ctdb_natgw" master)
natgwmaster="${1:--1}" # Default is -1 if natgwlist fails
natgwip="$2"
diff --git a/ctdb/config/functions b/ctdb/config/functions
index b714c63..eab5563 100755
--- a/ctdb/config/functions
+++ b/ctdb/config/functions
@@ -20,6 +20,10 @@ if [ -z "$CTDB_SYS_ETCDIR" ] ; then
CTDB_SYS_ETCDIR="/etc"
fi
+if [ -z "$CTDB_HELPER_BINDIR" ] ; then
+ CTDB_HELPER_BINDIR="/usr/local/libexec/ctdb"
+fi
+
#######################################
# pull in a system config file, if any
diff --git a/ctdb/config/statd-callout b/ctdb/config/statd-callout
index f56e50f..a923d8a 100755
--- a/ctdb/config/statd-callout
+++ b/ctdb/config/statd-callout
@@ -168,6 +168,7 @@ case "$1" in
statd_state=$(ctdb catdb ctdb.tdb | sed -n "$sed_expr" | sort)
[ -n "$statd_state" ] || exit 0
+ smnotify="${CTDB_HELPER_BINDIR}/smnotify"
prev=""
echo "$statd_state" | {
# This all needs to be in the same command group at the
@@ -186,12 +187,12 @@ case "$1" in
# Reset stateval for each serverip
[ "$sip" = "$prev" ] || stateval="$state_even"
# Send notifies for server shutdown
- smnotify --client=$cip --ip=$sip --server=$sip
--stateval=$stateval
- smnotify --client=$cip --ip=$sip --server=$NFS_HOSTNAME
--stateval=$stateval
+ "$smnotify" --client=$cip --ip=$sip --server=$sip
--stateval=$stateval
+ "$smnotify" --client=$cip --ip=$sip --server=$NFS_HOSTNAME
--stateval=$stateval
# Send notifies for server startup
stateval=$(($stateval + 1))
- smnotify --client=$cip --ip=$sip --server=$sip
--stateval=$stateval
- smnotify --client=$cip --ip=$sip --server=$NFS_HOSTNAME
--stateval=$stateval
+ "$smnotify" --client=$cip --ip=$sip --server=$sip
--stateval=$stateval
+ "$smnotify" --client=$cip --ip=$sip --server=$NFS_HOSTNAME
--stateval=$stateval
done
echo "$items" | ctdb ptrans "ctdb.tdb"
diff --git a/ctdb/packaging/RPM/ctdb.spec.in b/ctdb/packaging/RPM/ctdb.spec.in
index 420ec52..1547dfb 100644
--- a/ctdb/packaging/RPM/ctdb.spec.in
+++ b/ctdb/packaging/RPM/ctdb.spec.in
@@ -195,15 +195,16 @@ rm -rf $RPM_BUILD_ROOT
%{_sbindir}/ctdbd
%{_sbindir}/ctdbd_wrapper
%{_bindir}/ctdb
-%{_bindir}/ctdb_lock_helper
-%{_bindir}/ctdb_event_helper
-%{_bindir}/ctdb_recovery_helper
-%{_bindir}/smnotify
%{_bindir}/ping_pong
%{_bindir}/ltdbtool
%{_bindir}/ctdb_diagnostics
%{_bindir}/onnode
-%{_bindir}/ctdb_natgw
+%dir %{_libexecdir}/ctdb
+%{_libexecdir}/ctdb/ctdb_lock_helper
+%{_libexecdir}/ctdb/ctdb_event_helper
+%{_libexecdir}/ctdb/ctdb_recovery_helper
+%{_libexecdir}/ctdb/ctdb_natgw
+%{_libexecdir}/ctdb/smnotify
%dir %{_libdir}
%{_libdir}/ctdb/lib*
%{_libdir}/libtevent-unix-util.so.0*
diff --git a/ctdb/tests/eventscripts/scripts/local.sh
b/ctdb/tests/eventscripts/scripts/local.sh
index 82ebc09..fcb7519 100644
--- a/ctdb/tests/eventscripts/scripts/local.sh
+++ b/ctdb/tests/eventscripts/scripts/local.sh
@@ -13,6 +13,7 @@ if [ -d "${TEST_SUBDIR}/stubs" ] ; then
/*) : ;;
*) EVENTSCRIPTS_PATH="${PWD}/${EVENTSCRIPTS_PATH}" ;;
esac
+ export CTDB_HELPER_BINDIR="$EVENTSCRIPTS_PATH"
fi
export EVENTSCRIPTS_PATH
diff --git a/ctdb/wscript b/ctdb/wscript
index c27f869..43cbbc9 100755
--- a/ctdb/wscript
+++ b/ctdb/wscript
@@ -181,6 +181,7 @@ def configure(conf):
conf.env.CTDB_ETCDIR = os.path.join(conf.env.SYSCONFDIR, 'ctdb')
conf.env.CTDB_VARDIR = os.path.join(conf.env.LOCALSTATEDIR, 'lib/ctdb')
conf.env.CTDB_RUNDIR = os.path.join(conf.env.LOCALSTATEDIR, 'run/ctdb')
+ conf.env.CTDB_HELPER_BINDIR = os.path.join(conf.env.LIBEXECDIR, 'ctdb')
if Options.options.ctdb_logdir:
conf.env.CTDB_LOGDIR = Options.options.ctdb_logdir
@@ -199,7 +200,7 @@ def configure(conf):
-DCTDB_ETCDIR=\"%s\"
-DCTDB_VARDIR=\"%s\"
-DCTDB_RUNDIR=\"%s\"''' % (
- conf.env.CTDB_BINDIR,
+ conf.env.CTDB_HELPER_BINDIR,
conf.env.CTDB_LOGDIR,
conf.env.CTDB_ETCDIR,
conf.env.CTDB_VARDIR,
@@ -432,19 +433,19 @@ def build(bld):
source='server/ctdb_lock_helper.c',
deps='samba-util ctdb-system talloc tdb',
includes='include',
- install_path='${BINDIR}')
+ install_path='${CTDB_HELPER_BINDIR}')
bld.SAMBA_BINARY('ctdb_event_helper',
source='server/ctdb_event_helper.c',
includes='include',
deps='samba-util ctdb-system replace tdb',
- install_path='${BINDIR}')
+ install_path='${CTDB_HELPER_BINDIR}')
bld.SAMBA_BINARY('ctdb_recovery_helper',
source='server/ctdb_recovery_helper.c',
deps='''ctdb-client2 ctdb-protocol ctdb-util
samba-util replace tdb''',
- install_path='${BINDIR}')
+ install_path='${CTDB_HELPER_BINDIR}')
bld.SAMBA_GENERATOR('ctdb-smnotify-h',
source='utils/smnotify/smnotify.x',
@@ -468,7 +469,7 @@ def build(bld):
'smnotify.c gen_smnotify.c gen_xdr.c'),
deps='ctdb-smnotify-h ctdb-smnotify-c ctdb-smnotify-x
popt',
includes='utils utils/smnotify',
- install_path='${BINDIR}')
+ install_path='${CTDB_HELPER_BINDIR}')
bld.SAMBA_BINARY('ping_pong',
source='utils/ping_pong/ping_pong.c',
@@ -500,8 +501,10 @@ def build(bld):
sed_expr3 = 's|/usr/local/var/log|%s|g' % (bld.env.CTDB_LOGDIR)
sed_expr4 = 's|/usr/local/var/run/ctdb|%s|g' % (bld.env.CTDB_RUNDIR)
sed_expr5 = 's|/usr/local/sbin|%s|g' % (bld.env.SBINDIR)
- sed_cmdline = '-e "%s" -e "%s" -e "%s" -e "%s" -e "%s"' % \
- (sed_expr1, sed_expr2, sed_expr3, sed_expr4, sed_expr5)
+ sed_expr6 = 's|/usr/local/libexec/ctdb|%s|g' %
(bld.env.CTDB_HELPER_BINDIR)
+ sed_cmdline = '-e "%s" -e "%s" -e "%s" -e "%s" -e "%s" -e "%s"' % \
+ (sed_expr1, sed_expr2, sed_expr3, sed_expr4, sed_expr5,
+ sed_expr6)
for f in manpages:
x = '%s.xml' % (f)
@@ -540,7 +543,7 @@ def build(bld):
source='tools/ctdb_natgw',
target='ctdb_natgw',
rule='sed %s ${SRC} > ${TGT}' % (sed_cmdline))
- bld.INSTALL_FILES('${BINDIR}', 'ctdb_natgw',
+ bld.INSTALL_FILES('${CTDB_HELPER_BINDIR}', 'ctdb_natgw',
destname='ctdb_natgw', chmod=0755)
bld.SAMBA_GENERATOR('ctdbd-wrapper',
diff --git a/lib/util/talloc_stack.h b/lib/util/talloc_stack.h
index 2f5dcab..fceb41f 100644
--- a/lib/util/talloc_stack.h
+++ b/lib/util/talloc_stack.h
@@ -5,7 +5,7 @@
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
+ the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
@@ -14,8 +14,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/*
diff --git a/source3/modules/vfs_fruit.c b/source3/modules/vfs_fruit.c
index cb0d284..e33521e 100644
--- a/source3/modules/vfs_fruit.c
+++ b/source3/modules/vfs_fruit.c
@@ -2630,7 +2630,7 @@ static ssize_t fruit_pread(vfs_handle_struct *handle,
handle, fsp);
struct fruit_config_data *config = NULL;
AfpInfo *ai = NULL;
- ssize_t len;
+ ssize_t len = -1;
char *name = NULL;
char *tmp_base_name = NULL;
NTSTATUS status;
diff --git a/source3/winbindd/idmap_autorid_tdb.c
b/source3/winbindd/idmap_autorid_tdb.c
index 89c3ad7..2f09f6c 100644
--- a/source3/winbindd/idmap_autorid_tdb.c
+++ b/source3/winbindd/idmap_autorid_tdb.c
@@ -602,7 +602,7 @@ static NTSTATUS
idmap_autorid_delete_range_by_num_action(struct db_context *db,
struct idmap_autorid_delete_range_by_num_ctx *ctx =
(struct idmap_autorid_delete_range_by_num_ctx *)private_data;
uint32_t rangenum;
- char *keystr;
+ char *keystr = NULL;
char *range_keystr;
TDB_DATA val;
NTSTATUS status;
diff --git a/source4/heimdal/lib/krb5/fcache.c
b/source4/heimdal/lib/krb5/fcache.c
index cb720c0..4cc4880 100644
--- a/source4/heimdal/lib/krb5/fcache.c
+++ b/source4/heimdal/lib/krb5/fcache.c
@@ -690,8 +690,8 @@ fcc_get_principal(krb5_context context,
krb5_principal *principal)
{
krb5_error_code ret;
- int fd;
- krb5_storage *sp;
+ int fd = 0;
+ krb5_storage *sp = NULL;
ret = init_fcc (context, id, &sp, &fd, NULL);
if (ret)
diff --git a/source4/torture/ndr/ntlmssp.c b/source4/torture/ndr/ntlmssp.c
index 5b879c6..ae56192 100644
--- a/source4/torture/ndr/ntlmssp.c
+++ b/source4/torture/ndr/ntlmssp.c
@@ -48,7 +48,6 @@ static bool ntlmssp_NEGOTIATE_MESSAGE_check(struct
torture_context *tctx,
torture_assert_int_equal(tctx, r->Version.version.Reserved[0], 0x00,
"Reserved");
torture_assert_int_equal(tctx, r->Version.version.Reserved[1], 0x00,
"Reserved");
torture_assert_int_equal(tctx, r->Version.version.Reserved[2], 0x00,
"Reserved");
- torture_assert_int_equal(tctx, r->Version.version.Reserved[3], 0x00,
"Reserved");
torture_assert_int_equal(tctx, r->Version.version.NTLMRevisionCurrent,
NTLMSSP_REVISION_W2K3, "NTLMRevisionCurrent");
return true;
@@ -116,7 +115,6 @@ static bool ntlmssp_CHALLENGE_MESSAGE_check(struct
torture_context *tctx,
torture_assert_int_equal(tctx, r->Version.version.Reserved[0], 0x00,
"Reserved");
torture_assert_int_equal(tctx, r->Version.version.Reserved[1], 0x00,
"Reserved");
torture_assert_int_equal(tctx, r->Version.version.Reserved[2], 0x00,
"Reserved");
- torture_assert_int_equal(tctx, r->Version.version.Reserved[3], 0x00,
"Reserved");
torture_assert_int_equal(tctx, r->Version.version.NTLMRevisionCurrent,
NTLMSSP_REVISION_W2K3, "NTLMRevisionCurrent");
return true;
@@ -270,7 +268,6 @@ static bool ntlmssp_AUTHENTICATE_MESSAGE_check(struct
torture_context *tctx,
torture_assert_int_equal(tctx, r->Version.version.Reserved[0], 0x00,
"Reserved");
torture_assert_int_equal(tctx, r->Version.version.Reserved[1], 0x00,
"Reserved");
torture_assert_int_equal(tctx, r->Version.version.Reserved[2], 0x00,
"Reserved");
- torture_assert_int_equal(tctx, r->Version.version.Reserved[3], 0x00,
"Reserved");
torture_assert_int_equal(tctx, r->Version.version.NTLMRevisionCurrent,
NTLMSSP_REVISION_W2K3, "NTLMRevisionCurrent");
return true;
--
Samba Shared Repository
