Index: multipath-tools-0.4.8/libmultipath/configure.c
===================================================================
--- multipath-tools-0.4.8.orig/libmultipath/configure.c	2010-02-26 13:34:41.000000000 +0100
+++ multipath-tools-0.4.8/libmultipath/configure.c	2010-02-26 13:35:31.000000000 +0100
@@ -167,7 +167,7 @@ select_action (struct multipath * mpp, v
 	if (!find_mp_by_wwid(curmp, mpp->wwid)) {
 		condlog(2, "%s: remove (wwid changed)", cmpp->alias);
 		dm_flush_map(mpp->alias);
-		strncat(cmpp->wwid, mpp->wwid, WWID_SIZE);
+		strncat(cmpp->wwid, mpp->wwid, WWID_SIZE-strlen(cmpp->wwid)-1);
 		drop_multipath(curmp, cmpp->wwid, KEEP_PATHS);
 		mpp->action = ACT_CREATE;
 		condlog(3, "%s: set ACT_CREATE (map wwid change)",