diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2001-01-22 05:34:40 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2001-01-22 05:34:40 +0000 |
commit | 226cfa03781466907dd252916aeade6879e376b8 (patch) | |
tree | 3251d15053db065d74994b95e17fd65874fcaa9b /log.h | |
parent | 401d58f3612fa030f309d01df9815a2fc1d3c6de (diff) |
Hopefully things did not get mixed around too much. It compiles under
Linux and works. So that is at least a good sign. =)
20010122
- (bal) OpenBSD Resync
- markus@cvs.openbsd.org 2001/01/19 12:45:26 GMT 2001 by markus
[servconf.c ssh.h sshd.c]
only auth-chall.c needs #ifdef SKEY
- markus@cvs.openbsd.org 2001/01/19 15:55:10 GMT 2001 by markus
[auth-krb4.c auth-options.c auth-rh-rsa.c auth-rhosts.c auth-rsa.c
auth1.c auth2.c channels.c clientloop.c dh.c dispatch.c nchan.c
packet.c pathname.h readconf.c scp.c servconf.c serverloop.c
session.c ssh-add.c ssh-keygen.c ssh-keyscan.c ssh.c ssh.h
ssh1.h sshconnect1.c sshd.c ttymodes.c]
move ssh1 definitions to ssh1.h, pathnames to pathnames.h
- markus@cvs.openbsd.org 2001/01/19 16:48:14
[sshd.8]
fix typo; from stevesk@
- markus@cvs.openbsd.org 2001/01/19 16:50:58
[ssh-dss.c]
clear and free digest, make consistent with other code (use dlen); from
stevesk@
- markus@cvs.openbsd.org 2001/01/20 15:55:20 GMT 2001 by markus
[auth-options.c auth-options.h auth-rsa.c auth2.c]
pass the filename to auth_parse_options()
- markus@cvs.openbsd.org 2001/01/20 17:59:40 GMT 2001
[readconf.c]
fix SIGSEGV from -o ""; problem noted by jehsom@togetherweb.com
- stevesk@cvs.openbsd.org 2001/01/20 18:20:29
[sshconnect2.c]
dh_new_group() does not return NULL. ok markus@
- markus@cvs.openbsd.org 2001/01/20 21:33:42
[ssh-add.c]
do not loop forever if askpass does not exist; from
andrew@pimlott.ne.mediaone.net
- djm@cvs.openbsd.org 2001/01/20 23:00:56
[servconf.c]
Check for NULL return from strdelim; ok markus
- djm@cvs.openbsd.org 2001/01/20 23:02:07
[readconf.c]
KNF; ok markus
- jakob@cvs.openbsd.org 2001/01/21 9:00:33
[ssh-keygen.1]
remove -R flag; ok markus@
- markus@cvs.openbsd.org 2001/01/21 19:05:40
[atomicio.c automicio.h auth-chall.c auth-krb4.c auth-options.c
auth-options.h auth-passwd.c auth-rh-rsa.c auth-rhosts.c auth-rsa.c
auth.c auth.h auth1.c auth2-chall.c auth2.c authfd.c authfile.c
bufaux.c bufaux.h buffer.c canahost.c canahost.h channels.c
cipher.c cli.c clientloop.c clientloop.h compat.c compress.c
deattack.c dh.c dispatch.c groupaccess.c hmac.c hostfile.c kex.c
key.c key.h log-client.c log-server.c log.c log.h login.c login.h
match.c misc.c misc.h nchan.c packet.c pty.c radix.h readconf.c
readpass.c readpass.h rsa.c scp.c servconf.c serverloop.c serverloop.h
session.c sftp-server.c ssh-add.c ssh-agent.c ssh-dss.c ssh-keygen.c
ssh-keyscan.c ssh-rsa.c ssh.c ssh.h sshconnect.c sshconnect.h
sshconnect1.c sshconnect2.c sshd.c tildexpand.c tildexpand.h
ttysmodes.c uidswap.c xmalloc.c]
split ssh.h and try to cleanup the #include mess. remove unnecessary
#includes. rename util.[ch] -> misc.[ch]
- (bal) renamed 'PIDDIR' to '_PATH_SSH_PIDDIR' to match OpenBSD tree
- (bal) Moved #ifdef KRB4 in auth-krb4.c above the #include to resolve
conflict when compiling for non-kerb install
- (bal) removed the #ifdef SKEY in auth1.c to match Markus' changes
on 1/19.
Diffstat (limited to 'log.h')
-rw-r--r-- | log.h | 76 |
1 files changed, 76 insertions, 0 deletions
@@ -0,0 +1,76 @@ | |||
1 | /* | ||
2 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | ||
3 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | ||
4 | * All rights reserved | ||
5 | * | ||
6 | * As far as I am concerned, the code I have written for this software | ||
7 | * can be used freely for any purpose. Any derived versions of this | ||
8 | * software must be clearly marked as such, and if the derived work is | ||
9 | * incompatible with the protocol description in the RFC file, it must be | ||
10 | * called by a name other than "ssh" or "Secure Shell". | ||
11 | */ | ||
12 | |||
13 | #ifndef SSH_LOG_H | ||
14 | #define SSH_LOG_H | ||
15 | |||
16 | /* Supported syslog facilities and levels. */ | ||
17 | typedef enum { | ||
18 | SYSLOG_FACILITY_DAEMON, | ||
19 | SYSLOG_FACILITY_USER, | ||
20 | SYSLOG_FACILITY_AUTH, | ||
21 | #ifdef LOG_AUTHPRIV | ||
22 | SYSLOG_FACILITY_AUTHPRIV, | ||
23 | #endif | ||
24 | SYSLOG_FACILITY_LOCAL0, | ||
25 | SYSLOG_FACILITY_LOCAL1, | ||
26 | SYSLOG_FACILITY_LOCAL2, | ||
27 | SYSLOG_FACILITY_LOCAL3, | ||
28 | SYSLOG_FACILITY_LOCAL4, | ||
29 | SYSLOG_FACILITY_LOCAL5, | ||
30 | SYSLOG_FACILITY_LOCAL6, | ||
31 | SYSLOG_FACILITY_LOCAL7 | ||
32 | } SyslogFacility; | ||
33 | |||
34 | typedef enum { | ||
35 | SYSLOG_LEVEL_QUIET, | ||
36 | SYSLOG_LEVEL_FATAL, | ||
37 | SYSLOG_LEVEL_ERROR, | ||
38 | SYSLOG_LEVEL_INFO, | ||
39 | SYSLOG_LEVEL_VERBOSE, | ||
40 | SYSLOG_LEVEL_DEBUG1, | ||
41 | SYSLOG_LEVEL_DEBUG2, | ||
42 | SYSLOG_LEVEL_DEBUG3 | ||
43 | } LogLevel; | ||
44 | /* Initializes logging. */ | ||
45 | void log_init(char *av0, LogLevel level, SyslogFacility facility, int on_stderr); | ||
46 | |||
47 | /* Logging implementation, depending on server or client */ | ||
48 | void do_log(LogLevel level, const char *fmt, va_list args); | ||
49 | |||
50 | /* name to facility/level */ | ||
51 | SyslogFacility log_facility_number(char *name); | ||
52 | LogLevel log_level_number(char *name); | ||
53 | |||
54 | /* Output a message to syslog or stderr */ | ||
55 | void fatal(const char *fmt,...) __attribute__((format(printf, 1, 2))); | ||
56 | void error(const char *fmt,...) __attribute__((format(printf, 1, 2))); | ||
57 | void log(const char *fmt,...) __attribute__((format(printf, 1, 2))); | ||
58 | void verbose(const char *fmt,...) __attribute__((format(printf, 1, 2))); | ||
59 | void debug(const char *fmt,...) __attribute__((format(printf, 1, 2))); | ||
60 | void debug2(const char *fmt,...) __attribute__((format(printf, 1, 2))); | ||
61 | void debug3(const char *fmt,...) __attribute__((format(printf, 1, 2))); | ||
62 | |||
63 | /* same as fatal() but w/o logging */ | ||
64 | void fatal_cleanup(void); | ||
65 | |||
66 | /* | ||
67 | * Registers a cleanup function to be called by fatal()/fatal_cleanup() | ||
68 | * before exiting. It is permissible to call fatal_remove_cleanup for the | ||
69 | * function itself from the function. | ||
70 | */ | ||
71 | void fatal_add_cleanup(void (*proc) (void *context), void *context); | ||
72 | |||
73 | /* Removes a cleanup function to be called at fatal(). */ | ||
74 | void fatal_remove_cleanup(void (*proc) (void *context), void *context); | ||
75 | |||
76 | #endif | ||