[libvirt] [PATCH] Give correct error message when configure a wrong URI aliase.

[Daniel P. Berrange]

On Tue, Nov 22, 2011 at 11:27:04AM +0800, taget at linux.vnet.ibm.com wrote:
> From: Eli Qiao <taget at linux.vnet.ibm.com>
> 
> Signed-off-by: Eli Qiao <taget at linux.vnet.ibm.com>
> 
> When configure the URI aliase like this in 'libvirt.conf':
> 
> uri_aliases = [
>   "jj#j=qemu+ssh://root@127.0.0.1/system",
>   "sleet=qemu+ssh://root@sleet.cloud.example.com/system",
> ]
> virsh -c jj#j
> 
> It will show this error message:
> 'no connection driver available for No connection for URI jj#j'
> Actually ，we expect this message below：
> Malformed 'uri_aliases' config entry 'jj#j=qemu+ssh://root@127.0.0.1/system', aliases may only container 'a-Z, 0-9, _, -'
> 
> Give this patch to fix this error.
> ---
>  src/libvirt.c |    5 -----
>  1 files changed, 0 insertions(+), 5 deletions(-)
> 
> diff --git a/src/libvirt.c b/src/libvirt.c
> index 1518ed2..17e073e 100644
> --- a/src/libvirt.c
> +++ b/src/libvirt.c
> @@ -1054,11 +1054,6 @@ virConnectOpenResolveURIAlias(const char *alias, char **uri)
>  
>      *uri = NULL;
>  
> -    /* Short circuit to avoid doing URI alias resolution
> -     * when it clearly isn't an valid alias */
> -    if (strspn(alias, URI_ALIAS_CHARS) != strlen(alias))
> -        return 0;
> -
>      if (!(config = virConnectConfigFile()))
>          goto cleanup;
>  

ACK, this is OK, since we still validate the URI_ALIAS_CHARS later on


Daniel
-- 
|: http://berrange.com      -o-    http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org              -o-             http://virt-manager.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org       -o-       http://live.gnome.org/gtk-vnc :|