- (djm) Merge OpenBSD changes:

[openssh.git] / authfile.h

diff --git a/authfile.h b/authfile.h
index afec27d5433e2a848e9ed2afc70928703416029d..4283d9381c06792d8e02e2e290518cc64beab4ff 100644 (file)
--- a/authfile.h
+++ b/authfile.h
@@ -1,3 +1,15 @@
+/*
+ * Author: Tatu Ylonen <ylo@cs.hut.fi>
+ * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
+ *                    All rights reserved
+ * Functions to interface with the SSH_AUTHENTICATION_FD socket.
+ *
+ * As far as I am concerned, the code I have written for this software
+ * can be used freely for any purpose.  Any derived versions of this
+ * software must be clearly marked as such, and if the derived work is
+ * incompatible with the protocol description in the RFC file, it must be
+ * called by a name other than "ssh" or "Secure Shell".
+ */
 #ifndef AUTHFILE_H
 #define AUTHFILE_H
 
@@ -18,9 +30,8 @@ save_private_key(const char *filename, const char *passphrase,
  * comment of the key is returned in comment_return if it is non-NULL; the
  * caller must free the value with xfree.
  */
-int
-load_public_key(const char *filename, Key * pub,
-    char **comment_return);
+int load_public_key(const char *filename, Key * pub, char **comment_return);
+int try_load_public_key(const char *filename, Key * pub, char **comment_return);
 
 /*
  * Loads the private key from the file.  Returns 0 if an error is encountered