- More reformatting merged from OpenBSD CVS

 - Merged OpenBSD CVS changes:
   - [channels.c]
     report from mrwizard@psu.edu via djm@ibs.com.au
   - [channels.c]
     set SO_REUSEADDR and SO_LINGER for forwarded ports.
     chip@valinux.com via damien@ibs.com.au
   - [nchan.c]
     it's not an error() if shutdown_write failes in nchan.
   - [readconf.c]
     remove dead #ifdef-0-code
   - [readconf.c servconf.c]
     strcasecmp instead of tolower
   - [scp.c]
     progress meter overflow fix from damien@ibs.com.au
   - [ssh-add.1 ssh-add.c]
     SSH_ASKPASS support
   - [ssh.1 ssh.c]
     postpone fork_after_authentication until command execution,
     request/patch from jahakala@cc.jyu.fi via damien@ibs.com.au
     plus: use daemon() for backgrounding

1 files changed, 49 insertions, 33 deletions

diff --git a/authfd.h b/authfd.h
index bddb8bab8..01cfd93a5 100644
--- a/authfd.h
+++ b/authfd.h
@@ -13,7 +13,7 @@
  * 
  */
 
-/* RCSID("$Id: authfd.h,v 1.3 1999/11/24 13:26:22 damien Exp $"); */
+/* RCSID("$Id: authfd.h,v 1.4 1999/11/25 00:54:58 damien Exp $"); */
 
 #ifndef AUTHFD_H
 #define AUTHFD_H
@@ -40,33 +40,43 @@ typedef struct {
 /* Returns the number of the authentication fd, or -1 if there is none. */
 int     ssh_get_authentication_socket();
 
-/* This should be called for any descriptor returned by
-   ssh_get_authentication_socket().  Depending on the way the descriptor was
-   obtained, this may close the descriptor. */
+/*
+ * This should be called for any descriptor returned by
+ * ssh_get_authentication_socket().  Depending on the way the descriptor was
+ * obtained, this may close the descriptor.
+ */
 void    ssh_close_authentication_socket(int authfd);
 
-/* Opens and connects a private socket for communication with the
-   authentication agent.  Returns NULL if an error occurred and the
-   connection could not be opened.  The connection should be closed by
-   the caller by calling ssh_close_authentication_connection(). */
+/*
+ * Opens and connects a private socket for communication with the
+ * authentication agent.  Returns NULL if an error occurred and the
+ * connection could not be opened.  The connection should be closed by the
+ * caller by calling ssh_close_authentication_connection().
+ */
 AuthenticationConnection *ssh_get_authentication_connection();
 
-/* Closes the connection to the authentication agent and frees any associated
-   memory. */
+/*
+ * Closes the connection to the authentication agent and frees any associated
+ * memory.
+ */
 void    ssh_close_authentication_connection(AuthenticationConnection * ac);
 
-/* Returns the first authentication identity held by the agent.
-   Returns true if an identity is available, 0 otherwise.
-   The caller must initialize the integers before the call, and free the
-   comment after a successful call (before calling ssh_get_next_identity). */
+/*
+ * Returns the first authentication identity held by the agent. Returns true
+ * if an identity is available, 0 otherwise. The caller must initialize the
+ * integers before the call, and free the comment after a successful call
+ * (before calling ssh_get_next_identity).
+ */
 int 
 ssh_get_first_identity(AuthenticationConnection * connection,
     BIGNUM * e, BIGNUM * n, char **comment);
 
-/* Returns the next authentication identity for the agent.  Other functions
-   can be called between this and ssh_get_first_identity or two calls of this
-   function.  This returns 0 if there are no more identities.  The caller
-   must free comment after a successful return. */
+/*
+ * Returns the next authentication identity for the agent.  Other functions
+ * can be called between this and ssh_get_first_identity or two calls of this
+ * function.  This returns 0 if there are no more identities.  The caller
+ * must free comment after a successful return.
+ */
 int 
 ssh_get_next_identity(AuthenticationConnection * connection,
     BIGNUM * e, BIGNUM * n, char **comment);
@@ -80,24 +90,30 @@ ssh_decrypt_challenge(AuthenticationConnection * auth,
     unsigned int response_type,
     unsigned char response[16]);
 
-/* Adds an identity to the authentication server.  This call is not meant to
-   be used by normal applications.  This returns true if the identity
-   was successfully added. */
-        int     ssh_add_identity(AuthenticationConnection * connection,
-            RSA * key, const char *comment);
+/*
+ * Adds an identity to the authentication server.  This call is not meant to
+ * be used by normal applications.  This returns true if the identity was
+ * successfully added.
+ */
+int    
+ssh_add_identity(AuthenticationConnection * connection, RSA * key,
+    const char *comment);
 
-/* Removes the identity from the authentication server.  This call is
-   not meant to be used by normal applications.  This returns true if the
-   identity was successfully added. */
-        int     ssh_remove_identity(AuthenticationConnection * connection,
-            RSA * key);
+/*
+ * Removes the identity from the authentication server.  This call is not
+ * meant to be used by normal applications.  This returns true if the
+ * identity was successfully added.
+ */
+int     ssh_remove_identity(AuthenticationConnection * connection, RSA * key);
 
-/* Removes all identities from the authentication agent.  This call is not
-   meant to be used by normal applications.  This returns true if the
-   operation was successful. */
-        int     ssh_remove_all_identities(AuthenticationConnection * connection);
+/*
+ * Removes all identities from the authentication agent.  This call is not
+ * meant to be used by normal applications.  This returns true if the
+ * operation was successful.
+ */
+int     ssh_remove_all_identities(AuthenticationConnection * connection);
 
 /* Closes the connection to the authentication agent. */
-        void    ssh_close_authentication(AuthenticationConnection * connection);
+void    ssh_close_authentication(AuthenticationConnection * connection);
 
 #endif                          /* AUTHFD_H */