diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2000-12-22 01:43:59 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2000-12-22 01:43:59 +0000 |
commit | 46c162204b5a6f7471525c2f75cb2c607c88b83f (patch) | |
tree | 9041b006ab612c18bdb16b606601839a00ca5b2c /log.c | |
parent | a074feb65d6f1fcad02e80b751e2287fd6230b09 (diff) |
One way to massive patch. <sigh> It compiles and works under Linux..
And I think I have all the bits right from the OpenBSD tree.
20001222
- Updated RCSID for pty.c
- (bal) OpenBSD CVS Updates:
- markus@cvs.openbsd.org 2000/12/21 15:10:16
[auth-rh-rsa.c hostfile.c hostfile.h sshconnect.c]
print keyfile:line for changed hostkeys, for deraadt@, ok deraadt@
- markus@cvs.openbsd.org 2000/12/20 19:26:56
[authfile.c]
allow ssh -i userkey for root
- markus@cvs.openbsd.org 2000/12/20 19:37:21
[authfd.c authfd.h kex.c sshconnect2.c sshd.c uidswap.c uidswap.h]
fix prototypes; from stevesk@pobox.com
- markus@cvs.openbsd.org 2000/12/20 19:32:08
[sshd.c]
init pointer to NULL; report from Jan.Ivan@cern.ch
- markus@cvs.openbsd.org 2000/12/19 23:17:54
[auth-krb4.c auth-options.c auth-options.h auth-rhosts.c auth-rsa.c
auth1.c auth2-skey.c auth2.c authfd.c authfd.h authfile.c bufaux.c
bufaux.h buffer.c canohost.c channels.c clientloop.c compress.c
crc32.c deattack.c getput.h hmac.c hmac.h hostfile.c kex.c kex.h
key.c key.h log.c login.c match.c match.h mpaux.c mpaux.h packet.c
packet.h radix.c readconf.c rsa.c scp.c servconf.c servconf.h
serverloop.c session.c sftp-server.c ssh-agent.c ssh-dss.c ssh-dss.h
ssh-keygen.c ssh-keyscan.c ssh-rsa.c ssh-rsa.h ssh.c ssh.h uuencode.c
uuencode.h sshconnect1.c sshconnect2.c sshd.c tildexpand.c]
replace 'unsigned bla' with 'u_bla' everywhere. also replace 'char
unsigned' with u_char.
Diffstat (limited to 'log.c')
-rw-r--r-- | log.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -36,7 +36,7 @@ | |||
36 | */ | 36 | */ |
37 | 37 | ||
38 | #include "includes.h" | 38 | #include "includes.h" |
39 | RCSID("$OpenBSD: log.c,v 1.11 2000/09/30 16:27:43 markus Exp $"); | 39 | RCSID("$OpenBSD: log.c,v 1.12 2000/12/19 23:17:57 markus Exp $"); |
40 | 40 | ||
41 | #include "ssh.h" | 41 | #include "ssh.h" |
42 | #include "xmalloc.h" | 42 | #include "xmalloc.h" |
@@ -155,7 +155,7 @@ fatal_remove_cleanup(void (*proc) (void *context), void *context) | |||
155 | } | 155 | } |
156 | } | 156 | } |
157 | fatal("fatal_remove_cleanup: no such cleanup function: 0x%lx 0x%lx\n", | 157 | fatal("fatal_remove_cleanup: no such cleanup function: 0x%lx 0x%lx\n", |
158 | (unsigned long) proc, (unsigned long) context); | 158 | (u_long) proc, (u_long) context); |
159 | } | 159 | } |
160 | 160 | ||
161 | /* Cleanup and exit */ | 161 | /* Cleanup and exit */ |
@@ -172,7 +172,7 @@ fatal_cleanup(void) | |||
172 | for (cu = fatal_cleanups; cu; cu = next_cu) { | 172 | for (cu = fatal_cleanups; cu; cu = next_cu) { |
173 | next_cu = cu->next; | 173 | next_cu = cu->next; |
174 | debug("Calling cleanup 0x%lx(0x%lx)", | 174 | debug("Calling cleanup 0x%lx(0x%lx)", |
175 | (unsigned long) cu->proc, (unsigned long) cu->context); | 175 | (u_long) cu->proc, (u_long) cu->context); |
176 | (*cu->proc) (cu->context); | 176 | (*cu->proc) (cu->context); |
177 | } | 177 | } |
178 | exit(255); | 178 | exit(255); |