From owner-svn-src-all@FreeBSD.ORG  Wed May  7 07:40:46 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@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 6D785F6D;
 Wed,  7 May 2014 07:40:46 +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 59DA9192;
 Wed,  7 May 2014 07:40:46 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s477ek17022947;
 Wed, 7 May 2014 07:40:46 GMT (envelope-from trasz@svn.freebsd.org)
Received: (from trasz@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s477ekbq022946;
 Wed, 7 May 2014 07:40:46 GMT (envelope-from trasz@svn.freebsd.org)
Message-Id: <201405070740.s477ekbq022946@svn.freebsd.org>
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Wed, 7 May 2014 07:40:46 +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: r265515 - stable/10/usr.sbin/ctld
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 07 May 2014 07:40:46 -0000

Author: trasz
Date: Wed May  7 07:40:45 2014
New Revision: 265515
URL: http://svnweb.freebsd.org/changeset/base/265515

Log:
  MFC r264532:
  
  Use proper terminology in debug messages.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/10/usr.sbin/ctld/login.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/ctld/login.c
==============================================================================
--- stable/10/usr.sbin/ctld/login.c	Wed May  7 07:39:16 2014	(r265514)
+++ stable/10/usr.sbin/ctld/login.c	Wed May  7 07:40:45 2014	(r265515)
@@ -787,7 +787,7 @@ login_negotiate(struct connection *conn,
 	bool skipped_security;
 
 	if (request == NULL) {
-		log_debugx("beginning parameter negotiation; "
+		log_debugx("beginning operational parameter negotiation; "
 		    "waiting for Login PDU");
 		request = login_receive(conn, false);
 		skipped_security = false;
@@ -813,7 +813,7 @@ login_negotiate(struct connection *conn,
 		    response_keys);
 	}
 
-	log_debugx("parameter negotiation done; "
+	log_debugx("operational parameter negotiation done; "
 	    "transitioning to Full Feature Phase");
 
 	keys_save(response_keys, response);
@@ -987,7 +987,7 @@ login(struct connection *conn)
 		 * but we don't need it.
 		 */
 		log_debugx("authentication not required; "
-		    "transitioning to parameter negotiation");
+		    "transitioning to operational parameter negotiation");
 
 		if ((bhslr->bhslr_flags & BHSLR_FLAGS_TRANSIT) == 0)
 			log_warnx("initiator did not set the \"T\" flag; "