diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2006-02-09 02:47:15 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2006-02-09 02:47:15 +0000 |
| commit | ba3239d80cf8c46d7075700c70aa3e67b2bb16e3 (patch) | |
| tree | f37527cef7b555443c9d43f7eafec9f906769d19 /sys-fs/mdadm/files | |
| parent | Adjust KDE eclasses for KOffice 1.5 Beta 1. (diff) | |
| download | historical-ba3239d80cf8c46d7075700c70aa3e67b2bb16e3.tar.gz historical-ba3239d80cf8c46d7075700c70aa3e67b2bb16e3.tar.bz2 historical-ba3239d80cf8c46d7075700c70aa3e67b2bb16e3.zip | |
fix segv properly
Diffstat (limited to 'sys-fs/mdadm/files')
| -rw-r--r-- | sys-fs/mdadm/files/mdadm-2.2-update-segv.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys-fs/mdadm/files/mdadm-2.2-update-segv.patch b/sys-fs/mdadm/files/mdadm-2.2-update-segv.patch index 1c1e37ecf4b2..2f425c358d78 100644 --- a/sys-fs/mdadm/files/mdadm-2.2-update-segv.patch +++ b/sys-fs/mdadm/files/mdadm-2.2-update-segv.patch @@ -1,7 +1,7 @@ Fix segfault when update is NULL http://bugs.gentoo.org/119245 -http://www.mail-archive.com/linux-raid@vger.kernel.org/msg03242.html +http://www.mail-archive.com/linux-raid@vger.kernel.org/msg03639.html --- Assemble.c +++ Assemble.c @@ -10,7 +10,7 @@ http://www.mail-archive.com/linux-raid@vger.kernel.org/msg03242.html if (dfd >= 0) close(dfd); - if (ident->uuid_set && (!update && strcmp(update, "uuid")!= 0) && -+ if (ident->uuid_set && update && strcmp(update, "uuid")!= 0 && ++ if (ident->uuid_set && (!update || strcmp(update, "uuid")!= 0) && (!super || same_uuid(info.uuid, ident->uuid, tst->ss->swapuuid)==0)) { if ((inargv && verbose >= 0) || verbose > 0) fprintf(stderr, Name ": %s has wrong uuid.\n", |