- Merged very large OpenBSD source code reformat

 - OpenBSD CVS updates
   - [channels.c cipher.c compat.c log-client.c scp.c serverloop.c]
     [ssh.h sshd.8 sshd.c]
     syslog changes:
     * Unified Logmessage for all auth-types, for success and for failed
     * Standard connections get only ONE line in the LOG when level==LOG:
       Auth-attempts are logged only, if authentication is:
          a) successfull or
          b) with passwd or
          c) we had more than AUTH_FAIL_LOG failues
     * many log() became verbose()
     * old behaviour with level=VERBOSE
   - [readconf.c readconf.h ssh.1 ssh.h sshconnect.c sshd.c]
     tranfer s/key challenge/response data in SSH_SMSG_AUTH_TIS_CHALLENGE
     messages. allows use of s/key in windows (ttssh, securecrt) and
     ssh-1.2.27 clients without 'ssh -v', ok: niels@
   - [sshd.8]
     -V, for fallback to openssh in SSH2 compatibility mode
   - [sshd.c]
     fix sigchld race; cjc5@po.cwru.edu

1 files changed, 28 insertions, 22 deletions

diff --git a/uidswap.h b/uidswap.h
index af4f924f0..4755710de 100644
--- a/uidswap.h
+++ b/uidswap.h
@@ -1,30 +1,36 @@
 /*
-
-uidswap.h
-
-Author: Tatu Ylonen <ylo@cs.hut.fi>
-
-Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
-                   All rights reserved
-
-Created: Sat Sep  9 01:43:15 1995 ylo
-Last modified: Sat Sep  9 02:34:04 1995 ylo
-
-*/
+ * 
+ * uidswap.h
+ * 
+ * Author: Tatu Ylonen <ylo@cs.hut.fi>
+ * 
+ * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
+ *                    All rights reserved
+ * 
+ * Created: Sat Sep  9 01:43:15 1995 ylo
+ * Last modified: Sat Sep  9 02:34:04 1995 ylo
+ * 
+ */
 
 #ifndef UIDSWAP_H
 #define UIDSWAP_H
 
-/* Temporarily changes to the given uid.  If the effective user id is not
-   root, this does nothing.  This call cannot be nested. */
-void temporarily_use_uid(uid_t uid);
+/*
+ * Temporarily changes to the given uid.  If the effective user id is not
+ * root, this does nothing.  This call cannot be nested.
+ */
+void    temporarily_use_uid(uid_t uid);
 
-/* Restores the original effective user id after temporarily_use_uid().
-   This should only be called while temporarily_use_uid is effective. */
-void restore_uid();
+/*
+ * Restores the original effective user id after temporarily_use_uid().
+ * This should only be called while temporarily_use_uid is effective.
+ */
+void    restore_uid();
 
-/* Permanently sets all uids to the given uid.  This cannot be called while
-   temporarily_use_uid is effective.  This must also clear any saved uids. */
-void permanently_set_uid(uid_t uid);
+/*
+ * Permanently sets all uids to the given uid.  This cannot be called while
+ * temporarily_use_uid is effective.  This must also clear any saved uids.
+ */
+void    permanently_set_uid(uid_t uid);
 
-#endif /* UIDSWAP_H */
+#endif                          /* UIDSWAP_H */