]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
Remove bogus port handling code in virsh
authorDaniel P. Berrange <berrange@redhat.com>
Fri, 12 Nov 2010 13:30:32 +0000 (13:30 +0000)
committerDaniel P. Berrange <berrange@redhat.com>
Tue, 23 Nov 2010 15:00:35 +0000 (15:00 +0000)
The "find-storage-pool-sources-as" command takes two arguments,
a hostname and a port number. For some reason the code would
also then look for a port number appended to the hostname
string by searching for ':'. This totally breaks if the user
gives an IPv6 address, and is redundant, since you can already
provide a port as a separate argument

* tools/virsh.c: Remove bogus port number handling code

tools/virsh.c

index 1d0b6e4738a5478cd088a07960b867fbb69c6af3..78a5c5b4ab8d0758b0c81c259891f416104ea7e2 100644 (file)
@@ -5829,20 +5829,12 @@ cmdPoolDiscoverSourcesAs(vshControl * ctl, const vshCmd * cmd ATTRIBUTE_UNUSED)
         return FALSE;
 
     if (host) {
-        size_t hostlen = strlen(host);
         char *port = vshCommandOptString(cmd, "port", &found);
-        if (!found) {
-            port = strrchr(host, ':');
-            if (port) {
-                if (*(++port))
-                    hostlen = port - host - 1;
-                else
-                    port = NULL;
-            }
-        }
+        if (!found)
+            port = NULL;
         virBuffer buf = VIR_BUFFER_INITIALIZER;
         virBufferAddLit(&buf, "<source>\n");
-        virBufferVSprintf(&buf, "  <host name='%.*s'",(int)hostlen, host);
+        virBufferVSprintf(&buf, "  <host name='%s'", host);
         if (port)
             virBufferVSprintf(&buf, " port='%s'", port);
         virBufferAddLit(&buf, "/>\n");