From: Daniel P. Berrange <berrange@redhat.com>
Date: Fri, 3 May 2013 13:23:03 +0000 (+0100)
Subject: Ignore 'uri' parameter in lockd driver
X-Git-Tag: CVE-2013-1962~203
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d80b5b7f8666ba8c9cd07e7cf67a55bd8bd11b3a;p=thirdparty%2Flibvirt.git

Ignore 'uri' parameter in lockd driver

A 'uri' parameter was added for the benefit of sanlock. This
causes a warning in the lockd driver though

2013-05-03 13:20:35.347+0000: 28403: error : virLockManagerLockDaemonNew:482 : internal error Unexpected parameter uri for object

Ignore this parameter, since lockd does not require it and it
is harmless if not used.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---

diff --git a/src/locking/lock_driver_lockd.c b/src/locking/lock_driver_lockd.c
index 4d0cd743c4..807710584a 100644
--- a/src/locking/lock_driver_lockd.c
+++ b/src/locking/lock_driver_lockd.c
@@ -476,6 +476,8 @@ static int virLockManagerLockDaemonNew(virLockManagerPtr lock,
                 priv->id = params[i].value.i;
             } else if (STREQ(params[i].key, "pid")) {
                 priv->pid = params[i].value.i;
+            } else if (STREQ(params[i].key, "uri")) {
+                /* ignored */
             } else {
                 virReportError(VIR_ERR_INTERNAL_ERROR,
                                _("Unexpected parameter %s for object"),