[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[dm-devel] two minor multipath tools fixes



There was a spot where multipathd's reply length forgot to count the NULL,
and I noticed that the way domap go rewritten, the dry-run option doesn't
print out the maps.

This patch fixes both.

-Ben
diff -urpN mp-devel/multipath/main.c mp-devel-patched/multipath/main.c
--- mp-devel/multipath/main.c	2005-11-07 12:13:07.000000000 -0600
+++ mp-devel-patched/multipath/main.c	2005-11-10 18:23:46.000000000 -0600
@@ -626,8 +626,10 @@ domap (struct multipath * mpp)
 	/*
 	 * last chance to quit before touching the devmaps
 	 */
-	if (conf->dry_run)
+	if (conf->dry_run) {
+		print_mp(mpp);
 		return 0;
+	}
 
 	switch (mpp->action) {
 	case ACT_NOTHING:
diff -urpN mp-devel/multipathd/cli.c mp-devel-patched/multipathd/cli.c
--- mp-devel/multipathd/cli.c	2005-11-01 18:41:23.000000000 -0600
+++ mp-devel-patched/multipathd/cli.c	2005-11-10 18:23:34.000000000 -0600
@@ -314,7 +314,7 @@ parse_cmd (char * cmd, char ** reply, in
 
 	if (!cmdvec) {
 		*reply = genhelp_handler();
-		*len = strlen(*reply);
+		*len = strlen(*reply) + 1;
 		return 0;
 	}
 

[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]