From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NTMgH-0002s8-9M for qemu-devel@nongnu.org; Fri, 08 Jan 2010 16:47:41 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NTMgC-0002oi-77 for qemu-devel@nongnu.org; Fri, 08 Jan 2010 16:47:40 -0500 Received: from [199.232.76.173] (port=58797 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NTMgC-0002oe-3q for qemu-devel@nongnu.org; Fri, 08 Jan 2010 16:47:36 -0500 Received: from mx1.redhat.com ([209.132.183.28]:18393) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NTMgB-0007f2-Kh for qemu-devel@nongnu.org; Fri, 08 Jan 2010 16:47:35 -0500 From: Luiz Capitulino Date: Fri, 8 Jan 2010 19:47:12 -0200 Message-Id: <1262987236-2943-4-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1262987236-2943-1-git-send-email-lcapitulino@redhat.com> References: <1262987236-2943-1-git-send-email-lcapitulino@redhat.com> Subject: [Qemu-devel] [PATCH 3/7] VNC: Rename client's 'username' key List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com 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 --- vnc.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/vnc.c b/vnc.c index a1ef8fc..7b77ffc 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