diff options
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | Makefile.in | 4 | ||||
-rw-r--r-- | fatal.c | 40 |
3 files changed, 44 insertions, 3 deletions
@@ -51,6 +51,7 @@ | |||
51 | - markus@cvs.openbsd.org 2002/02/25 16:33:27 | 51 | - markus@cvs.openbsd.org 2002/02/25 16:33:27 |
52 | [ssh-keygen.c sshconnect2.c uuencode.c uuencode.h] | 52 | [ssh-keygen.c sshconnect2.c uuencode.c uuencode.h] |
53 | more u_* fixes | 53 | more u_* fixes |
54 | - (bal) Imported missing fatal.c and fixed up Makefile.in | ||
54 | 55 | ||
55 | 20020225 | 56 | 20020225 |
56 | - (bal) Last AIX patch. Moved aix_usrinfo() outside of do_setuserconext() | 57 | - (bal) Last AIX patch. Moved aix_usrinfo() outside of do_setuserconext() |
@@ -7724,4 +7725,4 @@ | |||
7724 | - Wrote replacements for strlcpy and mkdtemp | 7725 | - Wrote replacements for strlcpy and mkdtemp |
7725 | - Released 1.0pre1 | 7726 | - Released 1.0pre1 |
7726 | 7727 | ||
7727 | $Id: ChangeLog,v 1.1887 2002/02/26 18:15:09 mouring Exp $ | 7728 | $Id: ChangeLog,v 1.1888 2002/02/26 19:24:21 mouring Exp $ |
diff --git a/Makefile.in b/Makefile.in index 2e9fb39d1..b58250aae 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: Makefile.in,v 1.196 2002/02/26 16:40:49 tim Exp $ | 1 | # $Id: Makefile.in,v 1.197 2002/02/26 19:24:22 mouring Exp $ |
2 | 2 | ||
3 | prefix=@prefix@ | 3 | prefix=@prefix@ |
4 | exec_prefix=@exec_prefix@ | 4 | exec_prefix=@exec_prefix@ |
@@ -50,7 +50,7 @@ INSTALL_SSH_RAND_HELPER=@INSTALL_SSH_RAND_HELPER@ | |||
50 | 50 | ||
51 | TARGETS=ssh$(EXEEXT) sshd$(EXEEXT) ssh-add$(EXEEXT) ssh-keygen$(EXEEXT) ssh-keyscan${EXEEXT} ssh-agent$(EXEEXT) scp$(EXEEXT) ssh-rand-helper${EXEEXT} $(SFTP_PROGS) | 51 | TARGETS=ssh$(EXEEXT) sshd$(EXEEXT) ssh-add$(EXEEXT) ssh-keygen$(EXEEXT) ssh-keyscan${EXEEXT} ssh-agent$(EXEEXT) scp$(EXEEXT) ssh-rand-helper${EXEEXT} $(SFTP_PROGS) |
52 | 52 | ||
53 | LIBSSH_OBJS=atomicio.o authfd.o authfile.o bufaux.o buffer.o canohost.o channels.o cipher.o compat.o compress.o crc32.o deattack.o dh.o dispatch.o mac.o hostfile.o key.o kex.o kexdh.o kexgex.o log.o match.o misc.o mpaux.o nchan.o packet.o radix.o rijndael.o entropy.o readpass.o rsa.o scard.o ssh-dss.o ssh-rsa.o tildexpand.o ttymodes.o uidswap.o uuencode.o xmalloc.o | 53 | LIBSSH_OBJS=atomicio.o authfd.o authfile.o bufaux.o buffer.o canohost.o channels.o cipher.o compat.o compress.o crc32.o deattack.o dh.o dispatch.o fatal.o mac.o hostfile.o key.o kex.o kexdh.o kexgex.o log.o match.o misc.o mpaux.o nchan.o packet.o radix.o rijndael.o entropy.o readpass.o rsa.o scard.o ssh-dss.o ssh-rsa.o tildexpand.o ttymodes.o uidswap.o uuencode.o xmalloc.o |
54 | 54 | ||
55 | SSHOBJS= ssh.o sshconnect.o sshconnect1.o sshconnect2.o sshtty.o readconf.o clientloop.o | 55 | SSHOBJS= ssh.o sshconnect.o sshconnect1.o sshconnect2.o sshtty.o readconf.o clientloop.o |
56 | 56 | ||
diff --git a/fatal.c b/fatal.c new file mode 100644 index 000000000..9e7d16000 --- /dev/null +++ b/fatal.c | |||
@@ -0,0 +1,40 @@ | |||
1 | /* | ||
2 | * Copyright (c) 2002 Markus Friedl. All rights reserved. | ||
3 | * | ||
4 | * Redistribution and use in source and binary forms, with or without | ||
5 | * modification, are permitted provided that the following conditions | ||
6 | * are met: | ||
7 | * 1. Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * 2. Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * | ||
13 | * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR | ||
14 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES | ||
15 | * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. | ||
16 | * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, | ||
17 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
18 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | ||
19 | * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | ||
20 | * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
21 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | ||
22 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
23 | */ | ||
24 | |||
25 | #include "includes.h" | ||
26 | RCSID("$OpenBSD: fatal.c,v 1.1 2002/02/22 12:20:34 markus Exp $"); | ||
27 | |||
28 | #include "log.h" | ||
29 | |||
30 | /* Fatal messages. This function never returns. */ | ||
31 | |||
32 | void | ||
33 | fatal(const char *fmt,...) | ||
34 | { | ||
35 | va_list args; | ||
36 | va_start(args, fmt); | ||
37 | do_log(SYSLOG_LEVEL_FATAL, fmt, args); | ||
38 | va_end(args); | ||
39 | fatal_cleanup(); | ||
40 | } | ||