From owner-cvs-src@FreeBSD.ORG  Sat Feb 11 13:04:16 2006
Return-Path: <owner-cvs-src@FreeBSD.ORG>
X-Original-To: cvs-src@FreeBSD.org
Delivered-To: cvs-src@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 2605E16A420;
	Sat, 11 Feb 2006 13:04:16 +0000 (GMT) (envelope-from pjd@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9636443D5F;
	Sat, 11 Feb 2006 13:04:11 +0000 (GMT) (envelope-from pjd@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1BD4BYD029231;
	Sat, 11 Feb 2006 13:04:11 GMT (envelope-from pjd@repoman.freebsd.org)
Received: (from pjd@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1BD4B5Q029230;
	Sat, 11 Feb 2006 13:04:11 GMT (envelope-from pjd)
Message-Id: <200602111304.k1BD4B5Q029230@repoman.freebsd.org>
From: Pawel Jakub Dawidek <pjd@FreeBSD.org>
Date: Sat, 11 Feb 2006 13:04:11 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Cc: 
Subject: cvs commit: src/sbin/geom/class/eli geom_eli.c
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 11 Feb 2006 13:04:16 -0000

pjd         2006-02-11 13:04:10 UTC

  FreeBSD src repository

  Modified files:
    sbin/geom/class/eli  geom_eli.c 
  Log:
  - Allow to use -b without passphrase or with keyfiles as it will be
    supported for a moment.
  - Don't allow to use -i when no passphrase is given. Now if iterations is
    equal to -1 (not set), we know that we should not ask for the passphrase
    on boot.
    It still doesn't handle situation when one key is protected with
    passphrase and the other is not. There is no quick fix for this.
    The complete solution will be to make number of iterations a per-key
    value. Because this need metadata format change and is only needed for
    devices attached on boot, I'll leave it as it is for now.
  
  MFC after:      3 days
  
  Revision  Changes    Path
  1.9       +16 -20    src/sbin/geom/class/eli/geom_eli.c