From owner-svn-src-stable-10@FreeBSD.ORG Thu Jul 24 15:38:50 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 71E244F2; Thu, 24 Jul 2014 15:38:50 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5E9452C7A; Thu, 24 Jul 2014 15:38:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6OFco07002493; Thu, 24 Jul 2014 15:38:50 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6OFcoJP002492; Thu, 24 Jul 2014 15:38:50 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201407241538.s6OFcoJP002492@svn.freebsd.org> From: Alexander Motin Date: Thu, 24 Jul 2014 15:38:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r269067 - stable/10/usr.sbin/iscsid X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Jul 2014 15:38:50 -0000 Author: mav Date: Thu Jul 24 15:38:49 2014 New Revision: 269067 URL: http://svnweb.freebsd.org/changeset/base/269067 Log: MFC r267608 (by trasz): Use proper term in debug messages. Modified: stable/10/usr.sbin/iscsid/login.c Directory Properties: stable/10/ (props changed) Modified: stable/10/usr.sbin/iscsid/login.c ============================================================================== --- stable/10/usr.sbin/iscsid/login.c Thu Jul 24 15:37:31 2014 (r269066) +++ stable/10/usr.sbin/iscsid/login.c Thu Jul 24 15:38:49 2014 (r269067) @@ -557,7 +557,7 @@ login_negotiate(struct connection *conn) struct iscsi_bhs_login_response *bhslr; int i; - log_debugx("beginning parameter negotiation"); + log_debugx("beginning operational parameter negotiation"); request = login_new_request(conn); login_set_csg(request, BHSLR_STAGE_OPERATIONAL_NEGOTIATION); login_set_nsg(request, BHSLR_STAGE_FULL_FEATURE_PHASE); @@ -619,7 +619,7 @@ login_negotiate(struct connection *conn) log_warnx("received final login response with wrong NSG 0x%x", login_nsg(response)); - log_debugx("parameter negotiation done; " + log_debugx("operational parameter negotiation done; " "transitioning to Full Feature phase"); keys_delete(response_keys); @@ -890,12 +890,12 @@ login(struct connection *conn) login_nsg(response) == BHSLR_STAGE_OPERATIONAL_NEGOTIATION) { if (conn->conn_conf.isc_mutual_user[0] != '\0') { log_errx(1, "target requested transition " - "to operational negotiation, but we require " - "mutual CHAP"); + "to operational parameter negotiation, " + "but we require mutual CHAP"); } log_debugx("target requested transition " - "to operational negotiation"); + "to operational parameter negotiation"); keys_delete(response_keys); pdu_delete(response); login_negotiate(conn);