b0ec4a42c8
Modify 0021-RHBZ-548874-add-find-multipaths.patch
Modify 0022-RHBZ-557845-RHEL5-style-partitions.patch
Add 0025-RHBZ-508827-update-multipathd-manpage.patch through
0101-RHBZ-631009-disable-udev-disk-rules-on-reload.patch
* sync with current state of RHEL6. Next release should include a updated
source tarball with most of these fixes rolled in.
Add 0102-RHBZ-690828-systemd-unit-file.patch
* Add Jóhann B. Guðmundsson's unit file for systemd.
* Add sub-package sysvinit for SysV init script.
Resolves: bz #690828
32 lines
826 B
Diff
32 lines
826 B
Diff
---
|
|
libmultipath/parser.c | 11 +++++++++--
|
|
1 file changed, 9 insertions(+), 2 deletions(-)
|
|
|
|
Index: multipath-tools/libmultipath/parser.c
|
|
===================================================================
|
|
--- multipath-tools.orig/libmultipath/parser.c
|
|
+++ multipath-tools/libmultipath/parser.c
|
|
@@ -386,13 +386,20 @@ alloc_value_block(vector strvec, void (*
|
|
void *
|
|
set_value(vector strvec)
|
|
{
|
|
- char *str = VECTOR_SLOT(strvec, 1);
|
|
- int size = strlen(str);
|
|
+ char *str;
|
|
+ int size;
|
|
int i = 0;
|
|
int len = 0;
|
|
char *alloc = NULL;
|
|
char *tmp;
|
|
|
|
+ str = VECTOR_SLOT(strvec, 1);
|
|
+ if (!str) {
|
|
+ str = VECTOR_SLOT(strvec, 0);
|
|
+ condlog(0, "option '%s' missing value\n", str);
|
|
+ return NULL;
|
|
+ }
|
|
+ size = strlen(str);
|
|
if (*str == '"') {
|
|
for (i = 2; i < VECTOR_SIZE(strvec); i++) {
|
|
str = VECTOR_SLOT(strvec, i);
|