[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 3/8] VNC: Rename client's 'username' key
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PATCH 3/8] VNC: Rename client's 'username' key |
Date: |
Thu, 14 Jan 2010 14:50:54 -0200 |
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 <address@hidden>
---
vnc.c | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/vnc.c b/vnc.c
index b5f3b64..e35cc36 100644
--- a/vnc.c
+++ b/vnc.c
@@ -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:
*
--
1.6.6
- [Qemu-devel] [PATCH v0 0/8]: VNC events and cleanup, Luiz Capitulino, 2010/01/14
- [Qemu-devel] [PATCH 1/8] VNC: Use 'enabled' key instead of 'status', Luiz Capitulino, 2010/01/14
- [Qemu-devel] [PATCH 2/8] VNC: Make 'auth' key mandatory, Luiz Capitulino, 2010/01/14
- [Qemu-devel] [PATCH 3/8] VNC: Rename client's 'username' key,
Luiz Capitulino <=
- [Qemu-devel] [PATCH 4/8] VNC: Add 'family' key, Luiz Capitulino, 2010/01/14
- [Qemu-devel] [PATCH 5/8] VNC: Cache client info at connection time, Luiz Capitulino, 2010/01/14
- [Qemu-devel] [PATCH 6/8] QMP: Introduce VNC_CONNECTED event, Luiz Capitulino, 2010/01/14
- [Qemu-devel] [PATCH 8/8] QMP: Introduce VNC_INITIALIZED event, Luiz Capitulino, 2010/01/14
- [Qemu-devel] [PATCH 7/8] QMP: Introduce VNC_DISCONNECTED event, Luiz Capitulino, 2010/01/14
- [Qemu-devel] Re: [PATCH v0 0/8]: VNC events and cleanup, Daniel P. Berrange, 2010/01/14