From: Willem Toorop <willem@nlnetlabs.nl>
Date: Thu, 11 Jul 2019 13:38:54 +0000 (+0200)
Subject: Merge branch 'develop' into feature/ldns-signzone-engine-support
X-Git-Tag: release-1.7.1-rc1~5^2^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=56060b2a365ee1264550894ebb52982fb4d5d49c;p=thirdparty%2Fldns.git

Merge branch 'develop' into feature/ldns-signzone-engine-support
---

56060b2a365ee1264550894ebb52982fb4d5d49c
diff --cc examples/ldns-signzone.c
index 0a790e66,797bab43..8fa7ae77
--- a/examples/ldns-signzone.c
+++ b/examples/ldns-signzone.c
@@@ -552,8 -316,15 +553,9 @@@ main(int argc, char *argv[]
  	char *outputfile_name = NULL;
  	FILE *outputfile;
  	
 -	/* tmp vars for engine keys */
 -	char *eng_key_l;
 -	size_t eng_key_id_len;
 -	char *eng_key_id;
 -	int eng_key_algo;
 -	
  	bool use_nsec3 = false;
  	int signflags = 0;
+ 	bool unixtime_serial = false;
  
  	/* Add the given keys to the zone if they are not yet present */
  	bool add_keys = true;