From: Evan Hunt Date: Sun, 19 Jul 2009 16:11:53 +0000 (+0000) Subject: fix a merge error from rebasing dnssec-settime (an assignment was left in X-Git-Tag: v9.7.0a2~40 X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=f73695f9bde65a7d26ee2ac1d1d9e7101060fdc9;p=thirdparty%2Fbind9.git fix a merge error from rebasing dnssec-settime (an assignment was left in place that was supposed to have been removed--this was already reviewed, I just merged the fix wrong) --- diff --git a/bin/dnssec/dnssec-settime.c b/bin/dnssec/dnssec-settime.c index 26ba8656c5d..0014afd8e28 100644 --- a/bin/dnssec/dnssec-settime.c +++ b/bin/dnssec/dnssec-settime.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: dnssec-settime.c,v 1.4 2009/07/19 05:26:05 each Exp $ */ +/* $Id: dnssec-settime.c,v 1.5 2009/07/19 16:11:53 each Exp $ */ /*! \file */ @@ -205,8 +205,6 @@ main(int argc, char **argv) { } } - filename = argv[isc_commandline_index]; - if (ectx == NULL) setup_entropy(mctx, NULL, &ectx); result = isc_hash_create(mctx, ectx, DNS_NAME_MAXWIRE);