From owner-svn-soc-all@FreeBSD.ORG  Wed Jun 25 23:34:06 2014
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@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 6DD0F131
 for <svn-soc-all@FreeBSD.org>; Wed, 25 Jun 2014 23:34:06 +0000 (UTC)
Received: from socsvn.freebsd.org (socsvn.freebsd.org
 [IPv6:2001:1900:2254:206a::50:2])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 5A3B4220E
 for <svn-soc-all@FreeBSD.org>; Wed, 25 Jun 2014 23:34:06 +0000 (UTC)
Received: from socsvn.freebsd.org ([127.0.1.124])
 by socsvn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5PNY66q000958
 for <svn-soc-all@FreeBSD.org>; Wed, 25 Jun 2014 23:34:06 GMT
 (envelope-from def@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.14.8/8.14.8/Submit) id s5PNY5H6000854
 for svn-soc-all@FreeBSD.org; Wed, 25 Jun 2014 23:34:05 GMT
 (envelope-from def@FreeBSD.org)
Date: Wed, 25 Jun 2014 23:34:05 GMT
Message-Id: <201406252334.s5PNY5H6000854@socsvn.freebsd.org>
X-Authentication-Warning: socsvn.freebsd.org: www set sender to
 def@FreeBSD.org using -f
From: def@FreeBSD.org
To: svn-soc-all@FreeBSD.org
Subject: socsvn commit: r270044 - soc2013/def/crashdump-head/sbin/savecore
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
 <svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all/>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 25 Jun 2014 23:34:06 -0000

Author: def
Date: Wed Jun 25 23:34:05 2014
New Revision: 270044
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=270044

Log:
  At the moment crash dumps cannot be compressed and encrypted in the same time.

Modified:
  soc2013/def/crashdump-head/sbin/savecore/savecore.c

Modified: soc2013/def/crashdump-head/sbin/savecore/savecore.c
==============================================================================
--- soc2013/def/crashdump-head/sbin/savecore/savecore.c	Wed Jun 25 23:32:34 2014	(r270043)
+++ soc2013/def/crashdump-head/sbin/savecore/savecore.c	Wed Jun 25 23:34:05 2014	(r270044)
@@ -788,7 +788,9 @@
 		}
 	if (checkfor && (clear || force || keep))
 		usage();
-	if (clear && (compress || keep))
+	if (clear && (compress || encrypted || keep))
+		usage();
+	if (compress && encrypted)
 		usage();
 	if (maxdumps > 0 && (checkfor || clear))
 		usage();