cluster-commits October 2010

cluster-commits@lists.fedorahosted.org

6 participants
113 discussions

cluster: RHEL6 - fencing: Not all parameters appear in metadata (1/2)
by Marek Grác 25 Oct '10

25 Oct '10

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=e7… Commit: e786883086370715a0f8ef05b8a3b1e0e4035891 Parent: cdcb2114a89195c2dfd940c8c8e2be5c637ecfcc Author: Marek 'marx' Grac <mgrac(a)redhat.com> AuthorDate: Mon Oct 25 18:15:44 2010 +0200 Committer: Marek 'marx' Grac <mgrac(a)redhat.com> CommitterDate: Mon Oct 25 18:15:44 2010 +0200 fencing: Not all parameters appear in metadata (1/2) Resolves: rhbz#618703 --- fence/agents/lib/fencing.py.py | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py index a4b6357..88bb1a1 100644 --- a/fence/agents/lib/fencing.py.py +++ b/fence/agents/lib/fencing.py.py @@ -329,6 +329,8 @@ all_opt = { "longopt" : "login-timeout", "help" : "--login-timeout <seconds> Wait X seconds for cmd prompt after login", "default" : "5", + "required" : "0", + "shortdesc" : "Wait X seconds for cmd prompt after login", "order" : 200 }, "shell_timeout" : { "getopt" : "Y:", @@ -343,23 +345,31 @@ all_opt = { "longopt" : "power-timeout", "help" : "--power-timeout <seconds> Test X seconds for status change after ON/OFF", "default" : "20", + "required" : "0", + "shortdesc" : "Test X seconds for status change after ON/OFF", "order" : 200 }, "power_wait" : { "getopt" : "G:", "longopt" : "power-wait", "help" : "--power-wait <seconds> Wait X seconds after issuing ON/OFF", "default" : "0", + "required" : "0", + "shortdesc" : "Wait X seconds after issuing ON/OFF", "order" : 200 }, "missing_as_off" : { "getopt" : "M", "longopt" : "missing-as-off", "help" : "--missing-as-off Missing port returns OFF instead of failure", + "required" : "0", + "shortdesc" : "Missing port returns OFF instead of failure", "order" : 200 }, "retry_on" : { "getopt" : "F:", "longopt" : "retry-on", "help" : "--retry-on <attempts> Count of attempts to retry power on", "default" : "1", + "required" : "0", + "shortdesc" : "Count of attempts to retry power on", "order" : 200 } }

1 0

cluster: RHEL6 - fence_drac5: make "port" a synonym of "module_name" for drac5
by Marek Grác 25 Oct '10

25 Oct '10

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=cd… Commit: cdcb2114a89195c2dfd940c8c8e2be5c637ecfcc Parent: 4028b11dcac119463e1f2d8195e6e36e0cc9c3b6 Author: Marek 'marx' Grac <mgrac(a)redhat.com> AuthorDate: Fri Jul 30 17:58:01 2010 +0200 Committer: Marek 'marx' Grac <mgrac(a)redhat.com> CommitterDate: Mon Oct 25 18:13:16 2010 +0200 fence_drac5: make "port" a synonym of "module_name" for drac5 Resolves: rhbz#619096 --- fence/agents/lib/fencing.py.py | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py index c906c06..a4b6357 100644 --- a/fence/agents/lib/fencing.py.py +++ b/fence/agents/lib/fencing.py.py @@ -507,6 +507,11 @@ def process_input(avail_opt): else: longopt_list.append(all_opt[k]["longopt"]) + ## Compatibility layer + if avail_opt.count("module_name") == 1: + getopt_string += "n:" + longopt_list.append("plug=") + ## ## Read options from command line or standard input ##### @@ -533,6 +538,8 @@ def process_input(avail_opt): z = dict(opt) if z.has_key("-T") == 1: z["-o"] = "status" + if z.has_key("-n") == 1: + z["-m"] = z["-n"] opt = z ## @@ -562,6 +569,8 @@ def process_input(avail_opt): name = "module_name" elif name == "action" and 1 == avail_opt.count("io_fencing"): name = "io_fencing" + elif name == "port" and 1 == avail_opt.count("drac_version"): + name = "module_name" ## ######

1 0

fence-agents: master - library: Metadata are not correct if agent does not support on/off
by Marek Grác 25 Oct '10

25 Oct '10

Gitweb: http://git.fedorahosted.org/git/fence-agents.git?p=fence-agents.git;a=commi… Commit: c3491b707166d877037d0f65ce7117396398d6af Parent: 1c0b1d0952d7f79ba3797bfaefa8f73d234d271d Author: Marek 'marx' Grac <mgrac(a)redhat.com> AuthorDate: Mon Oct 25 16:57:00 2010 +0200 Committer: Marek 'marx' Grac <mgrac(a)redhat.com> CommitterDate: Mon Oct 25 16:57:00 2010 +0200 library: Metadata are not correct if agent does not support on/off Metadata actions are generated according to option io_fencing. Currently only fence_sanbox is affected as fence_ifmib accepts both enable/disable and on/off (so io_fencing is not used) Resolves: rhbz#623266 --- fence/agents/lib/fencing.py.py | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py index 7e49649..65f88da 100644 --- a/fence/agents/lib/fencing.py.py +++ b/fence/agents/lib/fencing.py.py @@ -483,9 +483,14 @@ def metadata(avail_opt, options, docs): print "\t</parameter>" print "</parameters>" print "<actions>" - print "\t<action name=\"on\" />" - print "\t<action name=\"off\" />" - print "\t<action name=\"reboot\" />" + if avail_opt.count("io_fencing") == 0: + print "\t<action name=\"on\" />" + print "\t<action name=\"off\" />" + print "\t<action name=\"reboot\" />" + else: + print "\t<action name=\"enable\" />" + print "\t<action name=\"disable\" />" + print "\t<action name=\"status\" />" print "\t<action name=\"list\" />" print "\t<action name=\"monitor\" />"

1 0

fence-agents: master - fence_eps: Fix parameters missing in metadata
by Marek Grác 25 Oct '10

25 Oct '10

Gitweb: http://git.fedorahosted.org/git/fence-agents.git?p=fence-agents.git;a=commi… Commit: 1c0b1d0952d7f79ba3797bfaefa8f73d234d271d Parent: abdc276970edf3c44e21b48988e4c50232566eaa Author: Marek 'marx' Grac <mgrac(a)redhat.com> AuthorDate: Mon Oct 25 16:24:54 2010 +0200 Committer: Marek 'marx' Grac <mgrac(a)redhat.com> CommitterDate: Mon Oct 25 16:24:54 2010 +0200 fence_eps: Fix parameters missing in metadata fence_eps contains a parameter which is not defined in fencing library. Resolves: rhbz#618703 --- fence/agents/eps/fence_eps.py | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/fence/agents/eps/fence_eps.py b/fence/agents/eps/fence_eps.py index 049c01c..21530e6 100644 --- a/fence/agents/eps/fence_eps.py +++ b/fence/agents/eps/fence_eps.py @@ -87,9 +87,14 @@ def set_power_status(conn, options): # Define new option def eps_define_new_opts(): all_opt["hidden_page"]={ - "getopt":"c:", - "help":"-c <page> Name of hidden page (default hidden.htm)", - "order": 1} + "getopt" : "c:", + "longopt" : "page", + "help":"-c, --page=<page> Name of hidden page (default hidden.htm)", + "required" : "0", + "shortdesc" : "Name of hidden page", + "default" : "hidden.htm", + "order": 1 + } # Starting point of fence agent def main(): @@ -104,9 +109,6 @@ def main(): options = check_input(device_opt,process_input(device_opt)) - if (not options.has_key("-c")): - options["-c"]="hidden.htm" - docs = { } docs["shortdesc"] = "Fence agent for ePowerSwitch" docs["longdesc"] = "fence_eps is an I/O Fencing agent \

1 0

fence-agents: master - fence_egenera: Missing -u / user in manual page
by Marek Grác 25 Oct '10

25 Oct '10

Gitweb: http://git.fedorahosted.org/git/fence-agents.git?p=fence-agents.git;a=commi… Commit: abdc276970edf3c44e21b48988e4c50232566eaa Parent: 7d53eb8ab06a8713d2b52500da741b6170fbfc91 Author: Marek 'marx' Grac <mgrac(a)redhat.com> AuthorDate: Mon Oct 25 15:55:21 2010 +0200 Committer: Marek 'marx' Grac <mgrac(a)redhat.com> CommitterDate: Mon Oct 25 15:55:21 2010 +0200 fence_egenera: Missing -u / user in manual page Resolves: rhbz#635824 (partially) --- fence/agents/egenera/fence_egenera.8 | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/fence/agents/egenera/fence_egenera.8 b/fence/agents/egenera/fence_egenera.8 index 1111b1b..3823d7c 100644 --- a/fence/agents/egenera/fence_egenera.8 +++ b/fence/agents/egenera/fence_egenera.8 @@ -29,6 +29,9 @@ Vendor URL: http://www.egenera.com The cserver to ssh to. cserver can be in the form user@hostname to specify a different user to login as. .TP +\fB-u\fP \fIuser\fR +Login name. Default login name is 'root' +.TP \fB-h\fP Print out a help message describing available options, then exit. .TP @@ -55,6 +58,9 @@ Print out a version message, then exit. \fIaction = < param >\fR The action required. reboot (default), off, on or status. .TP +\fIuser = < param >\fR +Login name. Default login name is 'root' +.TP \fIagent = < param >\fR This option is used by fence_node(8) and is ignored by fence_apc. .TP

1 0

cluster: RHEL4 - rgmanager: Fix S/Lang compiler error
by Lon Hohberger 22 Oct '10

22 Oct '10

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=37… Commit: 371a1a0eaff5c89cafe49f51d7494d4a10676a1a Parent: d20bd177341a7ee9dc76c17d5db73b5904b07660 Author: Lon Hohberger <lhh(a)redhat.com> AuthorDate: Fri Oct 22 15:47:42 2010 -0400 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Fri Oct 22 15:50:09 2010 -0400 rgmanager: Fix S/Lang compiler error SL_RunTime_Error is not present in the distributions targeted for this branch. Resolves: rhbz#507430 Signed-off-by: Lon Hohberger <lhh(a)redhat.com> --- rgmanager/src/daemons/slang_event.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rgmanager/src/daemons/slang_event.c b/rgmanager/src/daemons/slang_event.c index 34b0bae..859fa3b 100644 --- a/rgmanager/src/daemons/slang_event.c +++ b/rgmanager/src/daemons/slang_event.c @@ -435,14 +435,14 @@ sl_service_property(char *svcName, char *prop) ret = strdup(buf); if (!ret) { - SLang_verror(SL_RunTime_Error, + SLang_verror(SL_INTRINSIC_ERROR, (char *)"%s: Failed to duplicate %s property of %s", __FUNCTION__, prop, svcName); return; } if (SLang_push_malloced_string(ret) < 0) { - SLang_verror(SL_RunTime_Error, + SLang_verror(SL_INTRINSIC_ERROR, (char *)"%s: Failed to push %s property of %s", __FUNCTION__, prop, svcName); free(ret);

1 0

cluster: RHEL4 - ccsd: Fix bug 498980 - symlink attack vulnerabilities
by Lon Hohberger 22 Oct '10

22 Oct '10

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=d2… Commit: d20bd177341a7ee9dc76c17d5db73b5904b07660 Parent: a08257ab9823ecc97da56439398eb0240c98cd0b Author: Jonathan Brassow <jbrassow(a)redhat.com> AuthorDate: Thu May 20 11:31:49 2010 -0500 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Fri Oct 22 15:38:15 2010 -0400 ccsd: Fix bug 498980 - symlink attack vulnerabilities Fix vulnerability in CCS that would allow someone to prevent a 'ccs_tool update'. Previous patch would not work since there is no mkostemp() on the release for which the patch was designed. Signed-off-by: Lon Hohberger <lhh(a)redhat.com> --- ccs/ccs_tool/upgrade.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ccs/ccs_tool/upgrade.c b/ccs/ccs_tool/upgrade.c index b085407..ac90735 100644 --- a/ccs/ccs_tool/upgrade.c +++ b/ccs/ccs_tool/upgrade.c @@ -193,7 +193,7 @@ static void ccs_dh_in(ccs_dh_t *dh, char *buf){ static int upgrade_device_archive(char *location){ int error = 0; int dev_fd=-1, tmp_fd=-1; - char tmp_file[64]; + char tmp_file[128]; char *buffer = NULL; ccs_dh_t dev_header; @@ -229,9 +229,10 @@ static int upgrade_device_archive(char *location){ goto fail; } - sprintf(tmp_file, "/tmp/tmp_%d", getpid()); + memset(tmp_file, 0, 128); + sprintf(tmp_file, "/tmp/ccs_tool_tmp_XXXXXX"); - tmp_fd = open(tmp_file, O_RDWR | O_CREAT |O_TRUNC, S_IRUSR|S_IWUSR); + tmp_fd = mkstemp(tmp_file); if(tmp_fd < 0){ fprintf(stderr, "Unable to create temporary archive: %s\n", strerror(errno)); error = -errno;

1 0

cluster: RHEL4 - Revert "ccsd: Fix bug 49898 - symlink attack vulnerabilities"
by Lon Hohberger 22 Oct '10

22 Oct '10

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=a0… Commit: a08257ab9823ecc97da56439398eb0240c98cd0b Parent: fa19791a85c5f46fe223827d37d3ff59a6134f31 Author: Lon Hohberger <lhh(a)redhat.com> AuthorDate: Fri Oct 22 15:34:11 2010 -0400 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Fri Oct 22 15:34:11 2010 -0400 Revert "ccsd: Fix bug 49898 - symlink attack vulnerabilities" This reverts commit bba9068b91f737b8f88cd26581eed5884f443bae. --- ccs/ccs_tool/upgrade.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/ccs/ccs_tool/upgrade.c b/ccs/ccs_tool/upgrade.c index cb844b9..b085407 100644 --- a/ccs/ccs_tool/upgrade.c +++ b/ccs/ccs_tool/upgrade.c @@ -193,7 +193,7 @@ static void ccs_dh_in(ccs_dh_t *dh, char *buf){ static int upgrade_device_archive(char *location){ int error = 0; int dev_fd=-1, tmp_fd=-1; - char tmp_file[128]; + char tmp_file[64]; char *buffer = NULL; ccs_dh_t dev_header; @@ -229,10 +229,9 @@ static int upgrade_device_archive(char *location){ goto fail; } - memset(tmp_file, 0, 128); - sprintf(tmp_file, "/tmp/ccs_tool_tmp_XXXXXX"); + sprintf(tmp_file, "/tmp/tmp_%d", getpid()); - tmp_fd = mkostemp(tmp_file, O_RDWR | O_CREAT |O_TRUNC); + tmp_fd = open(tmp_file, O_RDWR | O_CREAT |O_TRUNC, S_IRUSR|S_IWUSR); if(tmp_fd < 0){ fprintf(stderr, "Unable to create temporary archive: %s\n", strerror(errno)); error = -errno;

1 0

cluster: RHEL4 - rgmanager: Randomize fsck log name
by Lon Hohberger 21 Oct '10

21 Oct '10

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=fa… Commit: fa19791a85c5f46fe223827d37d3ff59a6134f31 Parent: efadcbe9493327f6c6b011291fa6909cf5d413cb Author: Lon Hohberger <lhh(a)redhat.com> AuthorDate: Wed May 20 18:02:15 2009 -0400 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Thu Oct 21 18:28:48 2010 -0400 rgmanager: Randomize fsck log name Signed-off-by: Lon Hohberger <lhh(a)redhat.com> --- rgmanager/src/resources/fs.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/rgmanager/src/resources/fs.sh b/rgmanager/src/resources/fs.sh index 2c380b7..046aa65 100755 --- a/rgmanager/src/resources/fs.sh +++ b/rgmanager/src/resources/fs.sh @@ -947,7 +947,7 @@ Unknown file system type '$fstype' for device $dev. Assuming fsck is required." # if [ -n "$fsck_needed" ] || [ "${OCF_RESKEY_force_fsck}" = "yes" ] ||\ [ "${OCF_RESKEY_force_fsck}" = "1" ]; then - typeset fsck_log=/tmp/$(basename $dev).fsck.log + typeset fsck_log=$(mktemp /tmp/fs-$OCF_RESKEY_name.fsck.log.XXXXXX) ocf_log debug "Running fsck on $dev" fsck -p $dev >> $fsck_log 2>&1 ret_val=$?

1 0

cluster: RHEL4 - rgmanager: move nfsclient.sh cache files where they belong
by Lon Hohberger 21 Oct '10

21 Oct '10

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=ef… Commit: efadcbe9493327f6c6b011291fa6909cf5d413cb Parent: 0e3074ee3666bef630884c323028486aeed28e62 Author: Fabio M. Di Nitto <fdinitto(a)redhat.com> AuthorDate: Wed Oct 22 10:10:08 2008 +0200 Committer: Lon Hohberger <lhh(a)redhat.com> CommitterDate: Thu Oct 21 18:21:50 2010 -0400 rgmanager: move nfsclient.sh cache files where they belong by using a static path to /tmp, the operation can be used to trigger a local DoS by a normal user. Move the cache files to /var/cache/cluster that's owned by root and doesn't allow normal users to play with it. Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com> --- rgmanager/src/resources/nfsclient.sh | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/rgmanager/src/resources/nfsclient.sh b/rgmanager/src/resources/nfsclient.sh index 7e8104a..a579bb1 100755 --- a/rgmanager/src/resources/nfsclient.sh +++ b/rgmanager/src/resources/nfsclient.sh @@ -382,12 +382,15 @@ status|monitor) # Don't let anyone read the cache files. # umask 066 + + mkdir -p /var/cache/cluster + if [ -n "$OCF_RESKEY_service_name" ] && [ "$OCF_RESKEY_use_cache" = "1" ]; then # # For large #s of exports, we need to cache the information # - tmpfn=/tmp/nfsclient-status-cache-$OCF_RESKEY_service_name + tmpfn=/var/cache/cluster/nfsclient-status-cache-$OCF_RESKEY_service_name if [ -f "$tmpfn" ]; then time_created=$(stat -c "%Y" $tmpfn) @@ -400,7 +403,7 @@ status|monitor) # # Create a different file if this is a separate instance # - tmpfn=/tmp/nfsclient-status-cache-$$ + tmpfn=/var/cache/cluster/nfsclient-status-cache-$$ fi if ! [ -f "$tmpfn" ] || [ $delta -gt 30 ]; then

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

cluster-commits October 2010