From patchwork Thu Jan 14 16:50:54 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 42909 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 72283B7CCD for ; Fri, 15 Jan 2010 03:59:00 +1100 (EST) Received: from localhost ([127.0.0.1]:49345 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NVT29-0002w1-2n for incoming@patchwork.ozlabs.org; Thu, 14 Jan 2010 11:58:57 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NVSvZ-0007Et-QC for qemu-devel@nongnu.org; Thu, 14 Jan 2010 11:52:09 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NVSvT-0007AR-2g for qemu-devel@nongnu.org; Thu, 14 Jan 2010 11:52:07 -0500 Received: from [199.232.76.173] (port=44452 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NVSvS-0007A0-9c for qemu-devel@nongnu.org; Thu, 14 Jan 2010 11:52:02 -0500 Received: from mx1.redhat.com ([209.132.183.28]:11114) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NVSvQ-0002CB-EL for qemu-devel@nongnu.org; Thu, 14 Jan 2010 11:52:00 -0500 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o0EGpxfQ026538 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 14 Jan 2010 11:51:59 -0500 Received: from localhost (vpn-10-170.rdu.redhat.com [10.11.10.170]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o0EGpwXl023023; Thu, 14 Jan 2010 11:51:59 -0500 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Thu, 14 Jan 2010 14:50:54 -0200 Message-Id: <1263487859-6318-4-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1263487859-6318-1-git-send-email-lcapitulino@redhat.com> References: <1263487859-6318-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: armbru@redhat.com Subject: [Qemu-devel] [PATCH 3/8] VNC: Rename client's 'username' key X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 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: *