diff common-runopts.c @ 845:774ad9b112ef

merge yet again
author Matt Johnston <matt@ucc.asn.au>
date Fri, 01 Nov 2013 00:21:59 +0800
parents d4ce5269a439
children 220f55d540ae
line wrap: on
line diff
--- a/common-runopts.c	Fri Nov 01 00:19:25 2013 +0800
+++ b/common-runopts.c	Fri Nov 01 00:21:59 2013 +0800
@@ -35,7 +35,8 @@
 
 /* returns success or failure, and the keytype in *type. If we want
  * to restrict the type, type can contain a type to return */
-int readhostkey(const char * filename, sign_key * hostkey, int *type) {
+int readhostkey(const char * filename, sign_key * hostkey, 
+	enum signkey_type *type) {
 
 	int ret = DROPBEAR_FAILURE;
 	buffer *buf;