diff options
| author | Luiz Capitulino <lcapitulino@redhat.com> | 2010-01-14 14:50:54 -0200 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2010-01-19 16:31:03 -0600 |
| commit | 76825067232d4dec710cd8b33ea94f029f7dd3a7 (patch) | |
| tree | 3c8c68d61f71fc9eea4a4515922eece2b047d503 /vnc.c | |
| parent | a77893829c27ef9bbab267d8403f5e76a4c61dbf (diff) | |
| download | qemu-76825067232d4dec710cd8b33ea94f029f7dd3a7.zip | |
VNC: Rename client's 'username' key
It's the SASL username, so it's better to call it 'sasl_username'
to be consistent.
Note that this change wouldn't be allowed if QMP were stable.
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'vnc.c')
| -rw-r--r-- | vnc.c | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -228,7 +228,8 @@ static QDict *do_info_vnc_client(Monitor *mon, VncState *client) #ifdef CONFIG_VNC_SASL if (client->sasl.conn && client->sasl.username) { - qdict_put(qdict, "username", qstring_from_str(client->sasl.username)); + qdict_put(qdict, "sasl_username", + qstring_from_str(client->sasl.username)); } #endif @@ -253,8 +254,8 @@ static void info_vnc_iter(QObject *obj, void *opaque) #endif #ifdef CONFIG_VNC_SASL monitor_printf(mon, " username: %s\n", - qdict_haskey(client, "username") ? - qdict_get_str(client, "username") : "none"); + qdict_haskey(client, "sasl_username") ? + qdict_get_str(client, "sasl_username") : "none"); #endif } @@ -302,7 +303,7 @@ void do_info_vnc_print(Monitor *mon, const QObject *data) * - "host": client's IP address * - "service": client's port number * - "x509_dname": TLS dname (optional) - * - "username": SASL username (optional) + * - "sasl_username": SASL username (optional) * * Example: * |