Hello community,
here is the log from the commit of package cluster-glue for openSUSE:Factory checked in at 2013-09-25 14:30:12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cluster-glue (Old)
and /work/SRC/openSUSE:Factory/.cluster-glue.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cluster-glue"
Changes:
--------
--- /work/SRC/openSUSE:Factory/cluster-glue/cluster-glue.changes 2013-06-05 13:27:23.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.cluster-glue.new/cluster-glue.changes 2013-09-25 14:30:13.000000000 +0200
@@ -1,0 +2,20 @@
+Wed Sep 18 14:41:03 UTC 2013 - lmb@suse.com
+
+- Change to recommend sbd instead of requiring it to avoid dependency
+ loop.
+
+-------------------------------------------------------------------
+Thu Aug 29 15:13:20 UTC 2013 - dmuhamedagic@suse.com
+
+- hb_report: fix test for the root user
+- hb_report: add support for the rfc5424 syslog date format
+- hb_report: add -X option for extra ssh options (fate#314906)
+- hb_report: adjust for more pacemaker directories moving
+- hb_report: Add "sudo" to package requirements (bnc#823087)
+- stonith: external/libvirt: fix exit code in reset
+- stonith: external/vcenter: do not list vms in status (bnc#825765)
+- Fix gcc warning about wrong typecast on i586.
+- fix various gcc warnings
+- upstream cs: 8acfc748667a
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cluster-glue.spec ++++++
--- /var/tmp/diff_new_pack.67uyhK/_old 2013-09-25 14:30:14.000000000 +0200
+++ /var/tmp/diff_new_pack.67uyhK/_new 2013-09-25 14:30:14.000000000 +0200
@@ -73,6 +73,10 @@
Conflicts: heartbeat-common < 3.0.2
Obsoletes: heartbeat-common < 3.0.2
Requires: perl-TimeDate
+Requires: sudo
+# The following is necessary since sbd is dropped from
+# cluster-glue itself:
+Recommends: sbd
Requires(pre): /usr/sbin/groupadd /usr/bin/getent /usr/sbin/useradd
# SLES10 needs tcpd-devel but doesn't have libcurl
%if 0%{?suse_version} < 1020
++++++ cluster-glue.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cluster-glue/.hg_archival.txt new/cluster-glue/.hg_archival.txt
--- old/cluster-glue/.hg_archival.txt 2013-05-07 04:52:50.000000000 +0200
+++ new/cluster-glue/.hg_archival.txt 2013-08-29 15:44:53.000000000 +0200
@@ -1,5 +1,5 @@
repo: e3ffdd7ae81c596b2be7e1e110d2c1255161340e
-node: 27019ba6670df783a757d6993cbd504f0befaf25
+node: 8acfc748667a8234e5e78d138d24afa6b9ac10ea
branch: default
latesttag: glue-1.0.11
-latesttagdistance: 26
+latesttagdistance: 38
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cluster-glue/configure.ac new/cluster-glue/configure.ac
--- old/cluster-glue/configure.ac 2013-05-07 04:52:50.000000000 +0200
+++ new/cluster-glue/configure.ac 2013-08-29 15:44:53.000000000 +0200
@@ -1201,7 +1201,7 @@
CFLAGS="$CFLAGS -g"
enable_fatal_warnings=no
else
- CFLAGS="$CFLAGS -ggdb3 -O0"
+ CFLAGS="$CFLAGS -ggdb"
# We had to eliminate -Wnested-externs because of libtool changes
EXTRA_FLAGS="-fgnu89-inline
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cluster-glue/doc/hb_report.8.txt new/cluster-glue/doc/hb_report.8.txt
--- old/cluster-glue/doc/hb_report.8.txt 2013-05-07 04:52:50.000000000 +0200
+++ new/cluster-glue/doc/hb_report.8.txt 2013-08-29 15:44:53.000000000 +0200
@@ -87,6 +87,11 @@
"hacluster". If you have another user for administration over
ssh, please use this option.
+*-X* ssh-options::
+ Extra ssh options. These will be added to every ssh
+ invocation. Alternatively, use `$HOME/.ssh/config` to setup
+ desired ssh connection options.
+
*-S*::
Single node operation. Run hb_report only on this node and
don't try to start slave collectors on other members of the
@@ -246,6 +251,10 @@
+
If you need to supply a password for your passphrase/login, then
always use the `-u` option.
+ +
+ For extra ssh(1) options, if you're too lazy to setup
+ $HOME/.ssh/config, use the `-X` option. Do not forget to put
+ the options in quotes.
sudo::
If the ssh user (as specified with the `-u` option) is other
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cluster-glue/hb_report/hb_report.in new/cluster-glue/hb_report/hb_report.in
--- old/cluster-glue/hb_report/hb_report.in 2013-05-07 04:52:50.000000000 +0200
+++ new/cluster-glue/hb_report/hb_report.in 2013-08-29 15:44:53.000000000 +0200
@@ -66,8 +66,9 @@
usage() {
cat<
+#include
#include
#define STONITH_VERS 2
@@ -131,6 +132,7 @@
StonithNVpair*
stonith_ghash_to_NVpair(GHashTable* stringtable);
void free_NVpair(StonithNVpair*); /* Free result from above 2 functions */
+void strdown(char *str); /* simple replacement for g_strdown */
/*
* The ST_DEVICEID info call is intended to return the type of the Stonith
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cluster-glue/lib/clplumbing/md5.c new/cluster-glue/lib/clplumbing/md5.c
--- old/cluster-glue/lib/clplumbing/md5.c 2013-05-07 04:52:50.000000000 +0200
+++ new/cluster-glue/lib/clplumbing/md5.c 2013-08-29 15:44:53.000000000 +0200
@@ -166,7 +166,7 @@
byteSwap(ctx->buf, 16);
memcpy(digest, ctx->buf, 16);
- memset(ctx, 0, sizeof(ctx)); /* In case it's sensitive */
+ memset(ctx, 0, sizeof(*ctx)); /* In case it's sensitive */
}
/* The four core functions - F1 is optimized somewhat */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cluster-glue/lib/pils/pils.c new/cluster-glue/lib/pils/pils.c
--- old/cluster-glue/lib/pils/pils.c 2013-05-07 04:52:50.000000000 +0200
+++ new/cluster-glue/lib/pils/pils.c 2013-08-29 15:44:53.000000000 +0200
@@ -223,7 +223,8 @@
, void* ud_interface /* interface user data */
);
static PIL_rc PILunregister_interface(PILInterface* interfaceid);
-static void PILLog(PILLogLevel priority, const char * fmt, ...);
+static void PILLog(PILLogLevel priority, const char * fmt, ...)
+ G_GNUC_PRINTF(2,3);
/*
@@ -309,7 +310,7 @@
PILPlugin* ret = NEW(PILPlugin);
if (DEBUGPLUGIN) {
- PILLog(PIL_DEBUG, "NewPILPlugin(0x%x)", (unsigned long)ret);
+ PILLog(PIL_DEBUG, "NewPILPlugin(0x%lx)", (unsigned long)ret);
}
STATNEW(plugin);
@@ -362,7 +363,7 @@
{
PILPluginType* ret = NEW(PILPluginType);
if (DEBUGPLUGIN) {
- PILLog(PIL_DEBUG, "NewPILPlugintype(0x%x)", (unsigned long)ret);
+ PILLog(PIL_DEBUG, "NewPILPlugintype(0x%lx)", (unsigned long)ret);
}
STATNEW(pitype);
@@ -463,7 +464,7 @@
STATNEW(piuniv);
if (DEBUGPLUGIN) {
- PILLog(PIL_DEBUG, "NewPILPluginUniv(0x%x)"
+ PILLog(PIL_DEBUG, "NewPILPluginUniv(0x%lx)"
, (unsigned long)ret);
}
if (!g_path_is_absolute(basepluginpath)) {
@@ -796,7 +797,7 @@
ret = NEW(PILInterface);
STATNEW(interface);
if (DEBUGPLUGIN) {
- PILLog(PIL_DEBUG, "NewPILInterface(0x%x)", (unsigned long)ret);
+ PILLog(PIL_DEBUG, "NewPILInterface(0x%lx)", (unsigned long)ret);
}
if (ret) {
@@ -813,7 +814,7 @@
ret->if_close = closefun;
ret->refcnt = 1;
if (DEBUGPLUGIN) {
- PILLog(PIL_DEBUG, "NewPILInterface(0x%lx:%s/%s)*** user_data: 0x%lx *******"
+ PILLog(PIL_DEBUG, "NewPILInterface(0x%lx:%s/%s)*** user_data: 0x%p *******"
, (unsigned long)ret
, interfacetype->typename
, ret->interfacename
@@ -1705,7 +1706,7 @@
static int ltinityet = 0;
if (DEBUGPLUGIN) {
- PILLog(PIL_DEBUG, "NewPILInterfaceUniv(0x%x)"
+ PILLog(PIL_DEBUG, "NewPILInterfaceUniv(0x%lx)"
, (unsigned long)ret);
}
if (!ltinityet) {
@@ -1882,7 +1883,7 @@
if (DEBUGPLUGIN) {
PILLog(PIL_DEBUG
, "FILE %s Doesn't look like a plugin name [%s] "
- "%d %d %s."
+ "%zd %zd %s."
, dire->d_name, end
, sizeof(obj_end), strlen(dire->d_name)
, &dire->d_name[strlen(dire->d_name)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cluster-glue/lib/plugins/stonith/apcmaster.c new/cluster-glue/lib/plugins/stonith/apcmaster.c
--- old/cluster-glue/lib/plugins/stonith/apcmaster.c 2013-05-07 04:52:50.000000000 +0200
+++ new/cluster-glue/lib/plugins/stonith/apcmaster.c 2013-08-29 15:44:53.000000000 +0200
@@ -573,7 +573,7 @@
if ((nm = (char*)STRDUP(sockname)) == NULL) {
goto out_of_memory;
}
- g_strdown(nm);
+ strdown(nm);
NameList[numnames] = nm;
++numnames;
NameList[numnames] = NULL;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cluster-glue/lib/plugins/stonith/apcmastersnmp.c new/cluster-glue/lib/plugins/stonith/apcmastersnmp.c
--- old/cluster-glue/lib/plugins/stonith/apcmastersnmp.c 2013-05-07 04:52:50.000000000 +0200
+++ new/cluster-glue/lib/plugins/stonith/apcmastersnmp.c 2013-08-29 15:44:53.000000000 +0200
@@ -490,7 +490,7 @@
hl = NULL;
return (hl);
}
- g_strdown(hl[num_outlets]);
+ strdown(hl[num_outlets]);
num_outlets++;
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cluster-glue/lib/plugins/stonith/apcsmart.c new/cluster-glue/lib/plugins/stonith/apcsmart.c
--- old/cluster-glue/lib/plugins/stonith/apcsmart.c 2013-05-07 04:52:50.000000000 +0200
+++ new/cluster-glue/lib/plugins/stonith/apcsmart.c 2013-08-29 15:44:53.000000000 +0200
@@ -664,7 +664,7 @@
}
for (ad->hostcount = 0; ad->hostlist[ad->hostcount]
; ad->hostcount++) {
- g_strdown(ad->hostlist[ad->hostcount]);
+ strdown(ad->hostlist[ad->hostcount]);
}
if (access(ad->upsdev, R_OK|W_OK|F_OK) < 0) {
LOG(PIL_CRIT,"Cannot access tty [%s]", ad->upsdev);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cluster-glue/lib/plugins/stonith/baytech.c new/cluster-glue/lib/plugins/stonith/baytech.c
--- old/cluster-glue/lib/plugins/stonith/baytech.c 2013-05-07 04:52:50.000000000 +0200
+++ new/cluster-glue/lib/plugins/stonith/baytech.c 2013-08-29 15:44:53.000000000 +0200
@@ -633,7 +633,7 @@
if ((nm = (char*)STRDUP(sockname)) == NULL) {
goto out_of_memory;
}
- g_strdown(nm);
+ strdown(nm);
NameList[numnames] = nm;
++numnames;
NameList[numnames] = NULL;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cluster-glue/lib/plugins/stonith/bladehpi.c new/cluster-glue/lib/plugins/stonith/bladehpi.c
--- old/cluster-glue/lib/plugins/stonith/bladehpi.c 2013-05-07 04:52:50.000000000 +0200
+++ new/cluster-glue/lib/plugins/stonith/bladehpi.c 2013-08-29 15:44:53.000000000 +0200
@@ -324,7 +324,7 @@
ret = NULL;
goto done;
}
- g_strdown(ret[j]);
+ strdown(ret[j]);
}
done:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cluster-glue/lib/plugins/stonith/cyclades.c new/cluster-glue/lib/plugins/stonith/cyclades.c
--- old/cluster-glue/lib/plugins/stonith/cyclades.c 2013-05-07 04:52:50.000000000 +0200
+++ new/cluster-glue/lib/plugins/stonith/cyclades.c 2013-08-29 15:44:53.000000000 +0200
@@ -341,7 +341,7 @@
if (!nm) {
goto out_of_memory;
}
- g_strdown(nm);
+ strdown(nm);
NameList[numnames] = nm;
numnames++;
NameList[numnames] = NULL;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cluster-glue/lib/plugins/stonith/drac3.c new/cluster-glue/lib/plugins/stonith/drac3.c
--- old/cluster-glue/lib/plugins/stonith/drac3.c 2013-05-07 04:52:50.000000000 +0200
+++ new/cluster-glue/lib/plugins/stonith/drac3.c 2013-08-29 15:44:53.000000000 +0200
@@ -352,7 +352,7 @@
if (hl == NULL) {
LOG(PIL_CRIT, "%s: out of memory", __FUNCTION__);
} else {
- g_strdown(hl[0]);
+ strdown(hl[0]);
}
return(hl);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cluster-glue/lib/plugins/stonith/external/libvirt new/cluster-glue/lib/plugins/stonith/external/libvirt
--- old/cluster-glue/lib/plugins/stonith/external/libvirt 2013-05-07 04:52:50.000000000 +0200
+++ new/cluster-glue/lib/plugins/stonith/external/libvirt 2013-08-29 15:44:53.000000000 +0200
@@ -245,14 +245,12 @@
if [ "$reset_method" = "power_cycle" ]; then
libvirt_stop
- rc=$?
- [ $rc = 1 ] && exit 1
+ [ $? = 1 ] && exit 1
sleep 2
libvirt_start
else
libvirt_reboot
fi
- rc=$?
exit $?
;;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cluster-glue/lib/plugins/stonith/external/vcenter new/cluster-glue/lib/plugins/stonith/external/vcenter
--- old/cluster-glue/lib/plugins/stonith/external/vcenter 2013-05-07 04:52:50.000000000 +0200
+++ new/cluster-glue/lib/plugins/stonith/external/vcenter 2013-08-29 15:44:53.000000000 +0200
@@ -232,14 +232,9 @@
} else {
# Command belongs to the group of commands that lookup the status of VMware vCenter and/or virtual machines
if ($command eq "status") {
- eval {
- # VI API: Searches the inventory tree for all VirtualMachine managed objects
- my $vms = Vim::find_entity_views(view_type => "VirtualMachine");
- };
- if ($@) {
- if (ref($@) eq "SoapFault") { dielog("$@->detail\n"); }
- dielog($@);
- }
+ # we already connect to the vcenter, no need to do
+ # anything else in status
+ ;
}
elsif ($command eq "gethosts") {
foreach my $key (keys(%host_to_vm)) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cluster-glue/lib/plugins/stonith/ibmhmc.c new/cluster-glue/lib/plugins/stonith/ibmhmc.c
--- old/cluster-glue/lib/plugins/stonith/ibmhmc.c 2013-05-07 04:52:50.000000000 +0200
+++ new/cluster-glue/lib/plugins/stonith/ibmhmc.c 2013-08-29 15:44:53.000000000 +0200
@@ -312,7 +312,7 @@
stonith_free_hostlist(ret);
return NULL;
}
- g_strdown(ret[j]);
+ strdown(ret[j]);
}
return ret;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cluster-glue/lib/plugins/stonith/ipmilan.c new/cluster-glue/lib/plugins/stonith/ipmilan.c
--- old/cluster-glue/lib/plugins/stonith/ipmilan.c 2013-05-07 04:52:50.000000000 +0200
+++ new/cluster-glue/lib/plugins/stonith/ipmilan.c 2013-08-29 15:44:53.000000000 +0200
@@ -323,7 +323,7 @@
ret = NULL;
break;
}
- g_strdown(ret[j]);
+ strdown(ret[j]);
}
return(ret);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cluster-glue/lib/plugins/stonith/meatware.c new/cluster-glue/lib/plugins/stonith/meatware.c
--- old/cluster-glue/lib/plugins/stonith/meatware.c 2013-05-07 04:52:50.000000000 +0200
+++ new/cluster-glue/lib/plugins/stonith/meatware.c 2013-08-29 15:44:53.000000000 +0200
@@ -157,7 +157,7 @@
return S_OOPS;
}
for (nd->hostcount = 0; nd->hostlist[nd->hostcount]; nd->hostcount++) {
- g_strdown(nd->hostlist[nd->hostcount]);
+ strdown(nd->hostlist[nd->hostcount]);
}
return(S_OK);
}
@@ -222,7 +222,7 @@
return S_RESETFAIL;
}
- g_strdown(resp_addr);
+ strdown(resp_addr);
if (strncmp(resp_mw, "meatware", 8) ||
strncmp(resp_result, "reply", 5) ||
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cluster-glue/lib/plugins/stonith/null.c new/cluster-glue/lib/plugins/stonith/null.c
--- old/cluster-glue/lib/plugins/stonith/null.c 2013-05-07 04:52:50.000000000 +0200
+++ new/cluster-glue/lib/plugins/stonith/null.c 2013-08-29 15:44:53.000000000 +0200
@@ -182,7 +182,7 @@
}
for (nd->hostcount = 0; nd->hostlist[nd->hostcount]
; nd->hostcount++) {
- g_strdown(nd->hostlist[nd->hostcount]);
+ strdown(nd->hostlist[nd->hostcount]);
}
return nd->hostcount ? S_OK : S_BADCONFIG;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cluster-glue/lib/plugins/stonith/nw_rpc100s.c new/cluster-glue/lib/plugins/stonith/nw_rpc100s.c
--- old/cluster-glue/lib/plugins/stonith/nw_rpc100s.c 2013-05-07 04:52:50.000000000 +0200
+++ new/cluster-glue/lib/plugins/stonith/nw_rpc100s.c 2013-08-29 15:44:53.000000000 +0200
@@ -418,7 +418,7 @@
if (ret == NULL) {
LOG(PIL_CRIT, "%s: out of memory", __FUNCTION__);
} else {
- g_strdown(ret[0]);
+ strdown(ret[0]);
}
return(ret);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cluster-glue/lib/plugins/stonith/rcd_serial.c new/cluster-glue/lib/plugins/stonith/rcd_serial.c
--- old/cluster-glue/lib/plugins/stonith/rcd_serial.c 2013-05-07 04:52:50.000000000 +0200
+++ new/cluster-glue/lib/plugins/stonith/rcd_serial.c 2013-08-29 15:44:53.000000000 +0200
@@ -467,7 +467,7 @@
return S_OOPS;
}
rcd->hostlist[0] = namestocopy[0].s_value;
- g_strdown(rcd->hostlist[0]);
+ strdown(rcd->hostlist[0]);
rcd->hostlist[1] = NULL;
rcd->hostcount = 1;
rcd->device = namestocopy[1].s_value;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cluster-glue/lib/plugins/stonith/riloe.c new/cluster-glue/lib/plugins/stonith/riloe.c
--- old/cluster-glue/lib/plugins/stonith/riloe.c 2013-05-07 04:52:50.000000000 +0200
+++ new/cluster-glue/lib/plugins/stonith/riloe.c 2013-08-29 15:44:53.000000000 +0200
@@ -164,7 +164,7 @@
return S_OOPS;
}
for (nd->hostcount = 0; nd->hostlist[nd->hostcount]; nd->hostcount++) {
- g_strdown(nd->hostlist[nd->hostcount]);
+ strdown(nd->hostlist[nd->hostcount]);
}
return(S_OK);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cluster-glue/lib/plugins/stonith/rps10.c new/cluster-glue/lib/plugins/stonith/rps10.c
--- old/cluster-glue/lib/plugins/stonith/rps10.c 2013-05-07 04:52:50.000000000 +0200
+++ new/cluster-glue/lib/plugins/stonith/rps10.c 2013-08-29 15:44:53.000000000 +0200
@@ -640,7 +640,7 @@
}
ctx->controllers[ctx->unit_count].node = STRDUP(node);
- g_strdown(ctx->controllers[ctx->unit_count].node);
+ strdown(ctx->controllers[ctx->unit_count].node);
ctx->controllers[ctx->unit_count].outlet_id = outlet_id;
ctx->unit_count++;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cluster-glue/lib/plugins/stonith/ssh.c new/cluster-glue/lib/plugins/stonith/ssh.c
--- old/cluster-glue/lib/plugins/stonith/ssh.c 2013-05-07 04:52:50.000000000 +0200
+++ new/cluster-glue/lib/plugins/stonith/ssh.c 2013-08-29 15:44:53.000000000 +0200
@@ -262,7 +262,7 @@
}else{
for (sd->hostcount = 0; sd->hostlist[sd->hostcount]
; sd->hostcount++) {
- g_strdown(sd->hostlist[sd->hostcount]);
+ strdown(sd->hostlist[sd->hostcount]);
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cluster-glue/lib/plugins/stonith/suicide.c new/cluster-glue/lib/plugins/stonith/suicide.c
--- old/cluster-glue/lib/plugins/stonith/suicide.c 2013-05-07 04:52:50.000000000 +0200
+++ new/cluster-glue/lib/plugins/stonith/suicide.c 2013-08-29 15:44:53.000000000 +0200
@@ -139,7 +139,7 @@
LOG(PIL_CRIT, "out of memory");
return ret;
}
- g_strdown(ret[0]);
+ strdown(ret[0]);
return ret;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cluster-glue/lib/plugins/stonith/vacm.c new/cluster-glue/lib/plugins/stonith/vacm.c
--- old/cluster-glue/lib/plugins/stonith/vacm.c 2013-05-07 04:52:50.000000000 +0200
+++ new/cluster-glue/lib/plugins/stonith/vacm.c 2013-08-29 15:44:53.000000000 +0200
@@ -262,7 +262,7 @@
stonith_free_hostlist(hlst);
return NULL;
}
- g_strdown(hlst[hrcnt]);
+ strdown(hlst[hrcnt]);
hrcnt++;
}
}else {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cluster-glue/lib/plugins/stonith/wti_mpc.c new/cluster-glue/lib/plugins/stonith/wti_mpc.c
--- old/cluster-glue/lib/plugins/stonith/wti_mpc.c 2013-05-07 04:52:50.000000000 +0200
+++ new/cluster-glue/lib/plugins/stonith/wti_mpc.c 2013-08-29 15:44:53.000000000 +0200
@@ -508,7 +508,7 @@
hl = NULL;
return (hl);
}
- g_strdown(hl[num_outlets]);
+ strdown(hl[num_outlets]);
num_outlets++;
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cluster-glue/lib/plugins/stonith/wti_nps.c new/cluster-glue/lib/plugins/stonith/wti_nps.c
--- old/cluster-glue/lib/plugins/stonith/wti_nps.c 2013-05-07 04:52:50.000000000 +0200
+++ new/cluster-glue/lib/plugins/stonith/wti_nps.c 2013-08-29 15:44:53.000000000 +0200
@@ -538,7 +538,7 @@
if ((nm = STRDUP(sockname)) == NULL) {
goto out_of_memory;
}
- g_strdown(nm);
+ strdown(nm);
NameList[numnames] = nm;
++numnames;
NameList[numnames] = NULL;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cluster-glue/lib/stonith/Makefile.am new/cluster-glue/lib/stonith/Makefile.am
--- old/cluster-glue/lib/stonith/Makefile.am 2013-05-07 04:52:50.000000000 +0200
+++ new/cluster-glue/lib/stonith/Makefile.am 2013-08-29 15:44:53.000000000 +0200
@@ -36,7 +36,7 @@
stonith_LDFLAGS = @LIBADD_DL@ @LIBLTDL@ -export-dynamic @DLOPEN_FORCE_FLAGS@ @LIBADD_INTL@
meatclient_SOURCES = meatclient.c
-meatclient_LDADD = $(GLIBLIB)
+meatclient_LDADD = $(GLIBLIB) libstonith.la
## libraries
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cluster-glue/lib/stonith/expect.c new/cluster-glue/lib/stonith/expect.c
--- old/cluster-glue/lib/stonith/expect.c 2013-05-07 04:52:50.000000000 +0200
+++ new/cluster-glue/lib/stonith/expect.c 2013-08-29 15:44:53.000000000 +0200
@@ -414,7 +414,7 @@
memcpy(*hret, here, slen);
/* Add EOS to result string */
(*hret)[slen] = EOS;
- g_strdown(*hret);
+ strdown(*hret);
here += slen;
++hret;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cluster-glue/lib/stonith/main.c new/cluster-glue/lib/stonith/main.c
--- old/cluster-glue/lib/stonith/main.c 2013-05-07 04:52:50.000000000 +0200
+++ new/cluster-glue/lib/stonith/main.c 2013-08-29 15:44:53.000000000 +0200
@@ -717,7 +717,7 @@
if (optind < argc) {
char *nodename;
nodename = g_strdup(argv[optind]);
- g_strdown(nodename);
+ strdown(nodename);
rc = stonith_req_reset(s, reset_type, nodename);
g_free(nodename);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cluster-glue/lib/stonith/meatclient.c new/cluster-glue/lib/stonith/meatclient.c
--- old/cluster-glue/lib/stonith/meatclient.c 2013-05-07 04:52:50.000000000 +0200
+++ new/cluster-glue/lib/stonith/meatclient.c 2013-08-29 15:44:53.000000000 +0200
@@ -60,7 +60,7 @@
char * opthost = NULL;
int clearhost = 0;
- int c, argcount, waitmode;
+ int c, argcount, waitmode = 0;
int errors = 0;
if ((cmdname = strrchr(argv[0], '/')) == NULL) {
@@ -89,7 +89,7 @@
usage(cmdname);
}
- g_strdown(opthost);
+ strdown(opthost);
if (clearhost) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cluster-glue/lib/stonith/stonith.c new/cluster-glue/lib/stonith/stonith.c
--- old/cluster-glue/lib/stonith/stonith.c 2013-05-07 04:52:50.000000000 +0200
+++ new/cluster-glue/lib/stonith/stonith.c 2013-08-29 15:44:53.000000000 +0200
@@ -447,6 +447,16 @@
return S_INVAL;
}
+void
+strdown(char *str)
+{
+ while( *str ) {
+ if( isupper(*str) )
+ *str = tolower(*str);
+ str++;
+ }
+}
+
int
stonith_req_reset(Stonith* s, int operation, const char* node)
{
@@ -457,7 +467,7 @@
if (nodecopy == NULL) {
return S_OOPS;
}
- g_strdown(nodecopy);
+ strdown(nodecopy);
rc = sp->s_ops->req_reset(sp, operation, nodecopy);
FREE(nodecopy);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cluster-glue/lrm/lrmd/lrmd.c new/cluster-glue/lrm/lrmd/lrmd.c
--- old/cluster-glue/lrm/lrmd/lrmd.c 2013-05-07 04:52:50.000000000 +0200
+++ new/cluster-glue/lrm/lrmd/lrmd.c 2013-08-29 15:44:53.000000000 +0200
@@ -1429,7 +1429,7 @@
lrmd_client_t* client = NULL;
struct ha_msg* msg = NULL;
char *msg_s;
- int ret;
+ int ret = FALSE;
client = (lrmd_client_t*)user_data;
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org