libxl: don't require vncpasswd when empty

PATCH In review Christoph Egger 2 participants 3 messages Feb 11, 2011 – Feb 14, 2011

lore

Share & tools

lore

Christoph Egger

author

2011-02-11 10:08 UTC #0 lore raw

PATCH 1/1 libxl: don't require vncpasswd when empty

Hi!

Attached patch fixes a regression introduced in c/s 22866:ed9ef3b07d2a:

Don't require a NULL-byte password when the guest config file has the entry
vncpasswd=''

Signed-off-by Christoph Egger <[email protected]>

Signature · 6 lines

---to satisfy European Law for business letters:
Advanced Micro Devices GmbH
Einsteinring 24, 85609 Dornach b. Muenchen
Geschaeftsfuehrer: Alberto Bozzo, Andrew Bowd
Sitz: Dornach, Gemeinde Aschheim, Landkreis Muenchen
Registergericht Muenchen, HRB Nr. 43632

tools/libxl/libxl_dm.c +1 -1

diff -r 12de39a2c580 tools/libxl/libxl_dm.c
@@ -74,7 +74,7 @@ static char ** libxl_build_device_model_
         } else {
             vncarg = "127.0.0.1:0";
         }
-        if (info->vncpasswd)
+        if (info->vncpasswd && (info->vncpasswd[0] != '\0'))
             vncarg = libxl__sprintf(gc, "%s,password", vncarg);
         flexarray_append(dm_args, "-vnc");
         flexarray_append(dm_args, vncarg);

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel

Ian Jackson

2011-02-11 16:45 UTC #1 lore raw

Christoph Egger writes ("[Xen-devel] [PATCH] libxl: don't require vncpasswd when empty"):

Quoted 5 lines

Attached patch fixes a regression introduced in c/s 22866:ed9ef3b07d2a:
Don't require a NULL-byte password when the guest config file has the entry
vncpasswd=''

I'm afraid I don't understand this patch.

If you say "vncpasswd=''" in the config file then info->vncpasswd would be "" and therefore info->vncpasswd[0] would be '\0' so the branch would not be taken and you would end up without ",password" on the qemu command line. The result should be that qemu should not require a password.

Is that not what you would intend with such a config statement ?

Your patch seems to do the opposite of what you say it does. It would seem to make qemu require an empty string as a password, which is daft.

Ian.

Christoph Egger

author

2011-02-14 14:58 UTC #2 lore raw

Quoted 1 line · On Friday 11 February 2011 17:45:03 Ian Jackson wrote:

Christoph Egger writes ("[Xen-devel] [PATCH] libxl: don't require vncpasswd

when empty"):

Quoted 6 lines

Quoted 5 lines
Attached patch fixes a regression introduced in c/s 22866:ed9ef3b07d2a:
Don't require a NULL-byte password when the guest config file has the entry
vncpasswd=''

Quoted 7 lines

I'm afraid I don't understand this patch.
If you say "vncpasswd=''" in the config file then info->vncpasswd would be "" and therefore info->vncpasswd[0] would be '\0' so the branch would not be taken and you would end up without ",password" on the qemu command line. The result should be that qemu should not require a password.

I actually end up with ",password" on qemu command line because

    info->vncpasswd != info->vncpasswd[0] :-)

The command 'ps axuww | grep qemu' makes that visible.

Quoted 5 lines

Is that not what you would intend with such a config statement ?
Your patch seems to do the opposite of what you say it does. It would seem to make qemu require an empty string as a password, which is daft.

Yes, qemu wants me to enter a NULL-byte as password. With my patch, qemu doesn't ask me for a password at all.

Christoph

Signature · 6 lines

---to satisfy European Law for business letters:
Advanced Micro Devices GmbH
Einsteinring 24, 85609 Dornach b. Muenchen
Geschaeftsfuehrer: Alberto Bozzo, Andrew Bowd
Sitz: Dornach, Gemeinde Aschheim, Landkreis Muenchen
Registergericht Muenchen, HRB Nr. 43632