summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-05-06 02:53:25 +0000
committerBen Lindstrom <mouring@eviladmin.org>2001-05-06 02:53:25 +0000
commit5428bea57454391b47914f557b3b08f700912746 (patch)
treefac9fe4e4e79556e2a56fb4d73fb385bce3ce45c
parent5bf5f2c8f84e4b12acd2ed6baa1b110c282249ff (diff)
- (bal) White Space and #ifdef sync with OpenBSD
-rw-r--r--ChangeLog3
-rw-r--r--session.c3
-rw-r--r--sshlogin.h6
-rw-r--r--uidswap.c3
4 files changed, 7 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 282f99bc..c83fb510 100644
--- 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
@@ -5347,4 +5348,4 @@
- Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1
-$Id: ChangeLog,v 1.1200 2001/05/06 00:54:15 djm Exp $
+$Id: ChangeLog,v 1.1201 2001/05/06 02:53:25 mouring Exp $
diff --git a/session.c b/session.c
index bb98176b..440b517b 100644
--- 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 64007cf0..7285bc23 100644
--- 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 3b264cf9..941d6f19 100644
--- 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));