diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2001-05-06 02:53:25 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2001-05-06 02:53:25 +0000 |
commit | 5428bea57454391b47914f557b3b08f700912746 (patch) | |
tree | fac9fe4e4e79556e2a56fb4d73fb385bce3ce45c | |
parent | 5bf5f2c8f84e4b12acd2ed6baa1b110c282249ff (diff) |
- (bal) White Space and #ifdef sync with OpenBSD
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | session.c | 3 | ||||
-rw-r--r-- | sshlogin.h | 6 | ||||
-rw-r--r-- | uidswap.c | 3 |
4 files changed, 7 insertions, 8 deletions
@@ -2,6 +2,7 @@ | |||
2 | - (djm) Update config.guess and config.sub with latest versions (from | 2 | - (djm) Update config.guess and config.sub with latest versions (from |
3 | ftp://ftp.gnu.org/gnu/config/) to allow configure on ia64-hpux. | 3 | ftp://ftp.gnu.org/gnu/config/) to allow configure on ia64-hpux. |
4 | Suggested by Jason Mader <jason@ncac.gwu.edu> | 4 | Suggested by Jason Mader <jason@ncac.gwu.edu> |
5 | - (bal) White Space and #ifdef sync with OpenBSD | ||
5 | 6 | ||
6 | 20010505 | 7 | 20010505 |
7 | - OpenBSD CVS Sync | 8 | - OpenBSD CVS Sync |
@@ -5347,4 +5348,4 @@ | |||
5347 | - Wrote replacements for strlcpy and mkdtemp | 5348 | - Wrote replacements for strlcpy and mkdtemp |
5348 | - Released 1.0pre1 | 5349 | - Released 1.0pre1 |
5349 | 5350 | ||
5350 | $Id: ChangeLog,v 1.1200 2001/05/06 00:54:15 djm Exp $ | 5351 | $Id: ChangeLog,v 1.1201 2001/05/06 02:53:25 mouring Exp $ |
@@ -1404,13 +1404,12 @@ do_child(Session *s, const char *command) | |||
1404 | s->auth_data); | 1404 | s->auth_data); |
1405 | pclose(f); | 1405 | pclose(f); |
1406 | } else | 1406 | } else |
1407 | fprintf(stderr, "Could not run %s\n", | 1407 | fprintf(stderr, "Could not run %s\n", |
1408 | _PATH_SSH_USER_RC); | 1408 | _PATH_SSH_USER_RC); |
1409 | } else if (stat(_PATH_SSH_SYSTEM_RC, &st) >= 0) { | 1409 | } else if (stat(_PATH_SSH_SYSTEM_RC, &st) >= 0) { |
1410 | if (debug_flag) | 1410 | if (debug_flag) |
1411 | fprintf(stderr, "Running %s %s\n", _PATH_BSHELL, | 1411 | fprintf(stderr, "Running %s %s\n", _PATH_BSHELL, |
1412 | _PATH_SSH_SYSTEM_RC); | 1412 | _PATH_SSH_SYSTEM_RC); |
1413 | |||
1414 | f = popen(_PATH_BSHELL " " _PATH_SSH_SYSTEM_RC, "w"); | 1413 | f = popen(_PATH_BSHELL " " _PATH_SSH_SYSTEM_RC, "w"); |
1415 | if (f) { | 1414 | if (f) { |
1416 | if (do_xauth) | 1415 | if (do_xauth) |
diff --git a/sshlogin.h b/sshlogin.h index 64007cf09..7285bc23e 100644 --- a/sshlogin.h +++ b/sshlogin.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshlogin.h,v 1.1 2001/03/04 01:46:30 djm Exp $ */ | 1 | /* $OpenBSD: sshlogin.h,v 1.1 2001/03/04 01:46:30 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -11,8 +11,8 @@ | |||
11 | * incompatible with the protocol description in the RFC file, it must be | 11 | * incompatible with the protocol description in the RFC file, it must be |
12 | * called by a name other than "ssh" or "Secure Shell". | 12 | * called by a name other than "ssh" or "Secure Shell". |
13 | */ | 13 | */ |
14 | #ifndef LOGIN_H | 14 | #ifndef SSHLOGIN_H |
15 | #define LOGIN_H | 15 | #define SSHLOGIN_H |
16 | 16 | ||
17 | /* | 17 | /* |
18 | * Returns the time when the user last logged in. Returns 0 if the | 18 | * Returns the time when the user last logged in. Returns 0 if the |
@@ -117,8 +117,7 @@ restore_uid(void) | |||
117 | #ifdef SAVED_IDS_WORK_WITH_SETEUID | 117 | #ifdef SAVED_IDS_WORK_WITH_SETEUID |
118 | /* Set the effective uid back to the saved privileged uid. */ | 118 | /* Set the effective uid back to the saved privileged uid. */ |
119 | if (seteuid(saved_euid) < 0) | 119 | if (seteuid(saved_euid) < 0) |
120 | fatal("seteuid %u: %.100s", (u_int) saved_euid, | 120 | fatal("seteuid %u: %.100s", (u_int) saved_euid, strerror(errno)); |
121 | strerror(errno)); | ||
122 | if (setegid(saved_egid) < 0) | 121 | if (setegid(saved_egid) < 0) |
123 | fatal("setegid %u: %.100s", (u_int) saved_egid, | 122 | fatal("setegid %u: %.100s", (u_int) saved_egid, |
124 | strerror(errno)); | 123 | strerror(errno)); |