OSDN Git Service
(root)
/
qmiga
/
qemu.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9167a69
)
r5531 made x509 certs not loadable (original patch from Henrik Holst).
author
balrog
<balrog@c046a42c-6fe2-441c-8c8c-71466251a162>
Wed, 12 Nov 2008 16:50:36 +0000
(16:50 +0000)
committer
balrog
<balrog@c046a42c-6fe2-441c-8c8c-71466251a162>
Wed, 12 Nov 2008 16:50:36 +0000
(16:50 +0000)
The patch in r5531 which replaced a bunch of strncpy with pstrcpy causes
the x509 credentials from the -vnc parameter to be one character shorter
than entered meaning that there is currently no way to enter x509
certificates...
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5707
c046a42c
-6fe2-441c-8c8c-
71466251a162
vnc.c
patch
|
blob
|
history
diff --git
a/vnc.c
b/vnc.c
index
f0ebebd
..
01bcc8d
100644
(file)
--- a/
vnc.c
+++ b/
vnc.c
@@
-2329,10
+2329,8
@@
int vnc_display_open(DisplayState *ds, const char *display)
end = strchr(options, ',');
if (start && (!end || (start < end))) {
int len = end ? end-(start+1) : strlen(start+1);
- char *path = qemu_
malloc(len+1
);
+ char *path = qemu_
strndup(start + 1, len
);
- pstrcpy(path, len, start + 1);
- path[len] = '\0';
VNC_DEBUG("Trying certificate path '%s'\n", path);
if (vnc_set_x509_credential_dir(vs, path) < 0) {
fprintf(stderr, "Failed to find x509 certificates/keys in %s\n", path);