On 12/12/2012 02:36 AM, Michal Privoznik wrote: > On 12.12.2012 02:14, Cole Robinson wrote: >> On 12/10/2012 08:49 AM, Michal Privoznik wrote: >>> This reverts commit 5114431396fd125b6ebe4d1a20a981111f948ee7 >>> which was pushed accidentally. >>> --- >>> >>> Sorry for the inconvenience. >>> >>> src/util/dnsmasq.c | 4 ++-- >>> 1 files changed, 2 insertions(+), 2 deletions(-) >>> >>> diff --git a/src/util/dnsmasq.c b/src/util/dnsmasq.c >>> index a627ed2..bee3b61 100644 >>> --- a/src/util/dnsmasq.c >>> +++ b/src/util/dnsmasq.c >>> @@ -641,9 +641,9 @@ dnsmasqCapsSetFromBuffer(dnsmasqCapsPtr caps, const char *buf) >>> >>> caps->noRefresh = true; >>> >>> - if (!(p = strstr(buf, DNSMASQ_VERSION_STR))) >>> + p = STRSKIP(buf, DNSMASQ_VERSION_STR); >>> + if (!p) >>> goto fail; >>> - p += sizeof(DNSMASQ_VERSION_STR) - 1; >>> virSkipSpaces(&p); >>> if (virParseVersionString(p, &caps->version, true) < 0) >>> goto fail; >>> >> >> This patch actually made it into the maintenance releases :( Is that a >> problem? I didn't notice an detrimental effects in my smoke testing at least. >> >> - Cole >> > > No, both patches works. But with the previous one, this doesn't make > much sense as DNSMASQ_VERSION_STR should be right at the beginning of > 'buf'. The accidentally pushed patch just allows the version string to > be presented wherever in 'buf' while the original code expect it to be > only at the beginning. > > Michal > Okay, I'll pull in your revert commit on the next -maint release, just wanted to make sure it wasn't urgent. Thanks, Cole -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list