From 7b13f8c6430b3a17818b7ea00041a551d2948342 Mon Sep 17 00:00:00 2001 From: Christophe Varoqui Date: Fri, 28 Oct 2005 15:11:33 +0200 Subject: [PATCH] [multipath] empty path uid is not a valid response from get_refwwid() Maxim Kozover noted that 'multipath /dev/fd0' does not limit the scope as expected. One of the reason is that get_refwwid happily returns blank refwwid. Make it clear that it's not a valid scope. --- multipath/main.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/multipath/main.c b/multipath/main.c index 4266f9b..ec03c74 100644 --- a/multipath/main.c +++ b/multipath/main.c @@ -83,7 +83,8 @@ get_refwwid (vector pathvec) return NULL; } } - return STRDUP(pp->wwid); + refwwid = pp->wwid; + goto out; } if (conf->dev_type == DEV_DEVT) { @@ -108,7 +109,8 @@ get_refwwid (vector pathvec) return NULL; } } - return STRDUP(pp->wwid); + refwwid = pp->wwid; + goto out; } if (conf->dev_type == DEV_DEVMAP) { /* @@ -130,9 +132,11 @@ get_refwwid (vector pathvec) */ if (!refwwid) refwwid = conf->dev; - - return STRDUP(refwwid); } +out: + if (refwwid && strlen(refwwid)) + return STRDUP(refwwid); + return NULL; } -- 2.7.4