svn commit: r269067 - stable/10/usr.sbin/iscsid

Alexander Motin mav at FreeBSD.org
Thu Jul 24 15:38:50 UTC 2014


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);


More information about the svn-src-stable-10 mailing list