From owner-svn-src-stable-10@FreeBSD.ORG  Tue Apr  7 04:21:37 2015
Return-Path: <owner-svn-src-stable-10@FreeBSD.ORG>
Delivered-To: svn-src-stable-10@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 60DAE67C;
 Tue,  7 Apr 2015 04:21:37 +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 4B94A9B7;
 Tue,  7 Apr 2015 04:21:37 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t374LaBU073021;
 Tue, 7 Apr 2015 04:21:36 GMT (envelope-from jpaetzel@FreeBSD.org)
Received: (from jpaetzel@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t374LaLI073020;
 Tue, 7 Apr 2015 04:21:36 GMT (envelope-from jpaetzel@FreeBSD.org)
Message-Id: <201504070421.t374LaLI073020@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: jpaetzel set sender to
 jpaetzel@FreeBSD.org using -f
From: Josh Paetzel <jpaetzel@FreeBSD.org>
Date: Tue, 7 Apr 2015 04:21:36 +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: r281187 - 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-stable-10@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 07 Apr 2015 04:21:37 -0000

Author: jpaetzel
Date: Tue Apr  7 04:21:36 2015
New Revision: 281187
URL: https://svnweb.freebsd.org/changeset/base/281187

Log:
  MFC 281084
  
  Fix thinko/copypaste error.
  
  When checking the length of the mutual secret password the variable for
  the secret password was used by mistake.  This resulted in ctld never
  warning about the length of the mutual secret being wrong even if it was.
  
  Sponsored by:	iXsystems

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

Modified: stable/10/usr.sbin/ctld/ctld.c
==============================================================================
--- stable/10/usr.sbin/ctld/ctld.c	Tue Apr  7 02:55:22 2015	(r281186)
+++ stable/10/usr.sbin/ctld/ctld.c	Tue Apr  7 04:21:36 2015	(r281187)
@@ -203,7 +203,7 @@ auth_check_secret_length(struct auth *au
 	}
 
 	if (auth->a_mutual_secret != NULL) {
-		len = strlen(auth->a_secret);
+		len = strlen(auth->a_mutual_secret);
 		if (len > 16) {
 			if (auth->a_auth_group->ag_name != NULL)
 				log_warnx("mutual secret for user \"%s\", "