From owner-svn-src-head@FreeBSD.ORG Wed Jun 18 17:21:39 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 82E8AB21; Wed, 18 Jun 2014 17:21:39 +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 561E72BBF; Wed, 18 Jun 2014 17:21:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5IHLdvU062866; Wed, 18 Jun 2014 17:21:39 GMT (envelope-from trasz@svn.freebsd.org) Received: (from trasz@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5IHLdUo062865; Wed, 18 Jun 2014 17:21:39 GMT (envelope-from trasz@svn.freebsd.org) Message-Id: <201406181721.s5IHLdUo062865@svn.freebsd.org> From: Edward Tomasz Napierala Date: Wed, 18 Jun 2014 17:21:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r267612 - 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:21:39 -0000 Author: trasz Date: Wed Jun 18 17:21:38 2014 New Revision: 267612 URL: http://svnweb.freebsd.org/changeset/base/267612 Log: Get rid of unneccessary argument. Sponsored by: The 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 17:20:02 2014 (r267611) +++ head/usr.sbin/iscsid/login.c Wed Jun 18 17:21:38 2014 (r267612) @@ -159,11 +159,12 @@ login_target_error_str(int class, int de } static struct pdu * -login_receive(struct connection *conn, bool initial) +login_receive(struct connection *conn) { struct pdu *response; struct iscsi_bhs_login_response *bhslr; const char *errorstr; + static bool initial = true; response = pdu_new(conn); pdu_receive(response); @@ -201,6 +202,8 @@ login_receive(struct connection *conn, b } conn->conn_statsn = ntohl(bhslr->bhslr_statsn); + initial = false; + return (response); } @@ -550,7 +553,7 @@ login_negotiate(struct connection *conn) pdu_delete(request); request = NULL; - response = login_receive(conn, false); + response = login_receive(conn); response_keys = keys_new(); keys_load(response_keys, response); for (i = 0; i < KEYS_MAX; i++) { @@ -742,7 +745,7 @@ login_chap(struct connection *conn) login_send_chap_a(conn); log_debugx("waiting for CHAP_A/CHAP_C/CHAP_I"); - response = login_receive(conn, false); + response = login_receive(conn); log_debugx("sending CHAP_N/CHAP_R"); login_send_chap_r(response); @@ -753,7 +756,7 @@ login_chap(struct connection *conn) */ log_debugx("waiting for CHAP result"); - response = login_receive(conn, false); + response = login_receive(conn); if (conn->conn_conf.isc_mutual_user[0] != '\0') login_verify_mutual(response); pdu_delete(response); @@ -831,7 +834,7 @@ login(struct connection *conn) pdu_send(request); pdu_delete(request); - response = login_receive(conn, true); + response = login_receive(conn); response_keys = keys_new(); keys_load(response_keys, response);