- (bal) White Space and #ifdef sync with OpenBSD

diff --git a/ChangeLog b/ChangeLog
index 8928e3f651a122d2b890f103c7e2211bb3fb2499..f5a57a58381f1cef6e5c693c7c2aafcac9e70710 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
  - (djm) Update config.guess and config.sub with latest versions (from
    ftp://ftp.gnu.org/gnu/config/) to allow configure on ia64-hpux.
    Suggested by Jason Mader <jason@ncac.gwu.edu>
+ - (bal) White Space and #ifdef sync with OpenBSD
 
 20010505
  - OpenBSD CVS Sync

diff --git a/session.c b/session.c
index bb98176b5e0b2bc0c81912e983c90ea11ddc274b..440b517be6d90adf71da481848ba68f1f80e44ad 100644 (file)
--- a/session.c
+++ b/session.c
@@ -1404,13 +1404,12 @@ do_child(Session *s, const char *command)
                                            s->auth_data);
                                pclose(f);
                        } else
-                               fprintf(stderr, "Could not run %s\n", 
+                               fprintf(stderr, "Could not run %s\n",
                                    _PATH_SSH_USER_RC);
                } else if (stat(_PATH_SSH_SYSTEM_RC, &st) >= 0) {
                        if (debug_flag)
                                fprintf(stderr, "Running %s %s\n", _PATH_BSHELL,
                                    _PATH_SSH_SYSTEM_RC);
-
                        f = popen(_PATH_BSHELL " " _PATH_SSH_SYSTEM_RC, "w");
                        if (f) {
                                if (do_xauth)

diff --git a/sshlogin.h b/sshlogin.h
index 64007cf0974adc2ed95017806fc48f0693d023e2..7285bc23e60ad2146a685685bdf2b0564bd69d44 100644 (file)
--- a/sshlogin.h
+++ b/sshlogin.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: sshlogin.h,v 1.1 2001/03/04 01:46:30 djm Exp $        */
+/*     $OpenBSD: sshlogin.h,v 1.1 2001/03/04 01:46:30 djm Exp $        */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -11,8 +11,8 @@
  * incompatible with the protocol description in the RFC file, it must be
  * called by a name other than "ssh" or "Secure Shell".
  */
-#ifndef LOGIN_H
-#define LOGIN_H
+#ifndef SSHLOGIN_H
+#define SSHLOGIN_H
 
 /*
  * Returns the time when the user last logged in.  Returns 0 if the

diff --git a/uidswap.c b/uidswap.c
index 3b264cf9e866bb75331ae30eeba5d8c16e86764a..941d6f195059bc01c52432f57811f9caf696c6b2 100644 (file)
--- a/uidswap.c
+++ b/uidswap.c
@@ -117,8 +117,7 @@ restore_uid(void)
 #ifdef SAVED_IDS_WORK_WITH_SETEUID
        /* Set the effective uid back to the saved privileged uid. */
        if (seteuid(saved_euid) < 0)
-               fatal("seteuid %u: %.100s", (u_int) saved_euid, 
-                   strerror(errno));
+               fatal("seteuid %u: %.100s", (u_int) saved_euid, strerror(errno));
        if (setegid(saved_egid) < 0)
                fatal("setegid %u: %.100s", (u_int) saved_egid, 
                    strerror(errno));