- 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, 6 insertions, 5 deletions

diff --git a/uidswap.c b/uidswap.c
index 72c2cc6e..d81fde9d 100644
--- a/uidswap.c
+++ b/uidswap.c
@@ -7,7 +7,7 @@
  */
 
 #include "includes.h"
-RCSID("$Id: uidswap.c,v 1.2 1999/11/24 13:26:23 damien Exp $");
+RCSID("$Id: uidswap.c,v 1.3 1999/11/25 00:55:00 damien Exp $");
 
 #include "ssh.h"
 #include "uidswap.h"
@@ -66,10 +66,11 @@ restore_uid()
 	if (seteuid(saved_euid) < 0)
 		debug("seteuid %d: %.100s", (int) saved_euid, strerror(errno));
 #else /* SAVED_IDS_WORK_WITH_SETEUID */
-	/* We are unable to restore the real uid to its unprivileged
-	   value. */
-	/* Propagate the real uid (usually more privileged) to effective
-	   uid as well. */
+	/*
+	 * We are unable to restore the real uid to its unprivileged value.
+	 * Propagate the real uid (usually more privileged) to effective uid
+	 * as well.
+	 */
 	setuid(getuid());
 #endif /* SAVED_IDS_WORK_WITH_SETEUID */
 }