From owner-svn-src-head@FreeBSD.ORG Wed Jun 18 17:00:41 2014 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B7070D36; Wed, 18 Jun 2014 17:00:41 +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 A37E829AA; Wed, 18 Jun 2014 17:00:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5IH0fT2052843; Wed, 18 Jun 2014 17:00:41 GMT (envelope-from trasz@svn.freebsd.org) Received: (from trasz@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5IH0f08052842; Wed, 18 Jun 2014 17:00:41 GMT (envelope-from trasz@svn.freebsd.org) Message-Id: <201406181700.s5IH0f08052842@svn.freebsd.org> From: Edward Tomasz Napierala Date: Wed, 18 Jun 2014 17:00:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r267608 - head/usr.sbin/iscsid X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Jun 2014 17:00:41 -0000 Author: trasz Date: Wed Jun 18 17:00:41 2014 New Revision: 267608 URL: http://svnweb.freebsd.org/changeset/base/267608 Log: Use proper term in debug messages. MFC after: 1 month Sponsored by: FreeBSD Foundation Modified: head/usr.sbin/iscsid/login.c Modified: head/usr.sbin/iscsid/login.c ============================================================================== --- head/usr.sbin/iscsid/login.c Wed Jun 18 13:41:20 2014 (r267607) +++ head/usr.sbin/iscsid/login.c Wed Jun 18 17:00:41 2014 (r267608) @@ -495,7 +495,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); @@ -557,7 +557,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); @@ -848,12 +848,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);