diff options
| author | ume <ume@FreeBSD.org> | 2001-06-11 12:39:29 +0000 |
|---|---|---|
| committer | ume <ume@FreeBSD.org> | 2001-06-11 12:39:29 +0000 |
| commit | 832f8d224926758a9ae0b23a6b45353e44fbc87a (patch) | |
| tree | a79fc7ad2b97862c4a404f352f0211ad93a7b5f1 /usr.sbin/faithd/faithd.h | |
| parent | 2693854b01a52b0395a91322aa3edf926bddff38 (diff) | |
| download | FreeBSD-src-832f8d224926758a9ae0b23a6b45353e44fbc87a.zip FreeBSD-src-832f8d224926758a9ae0b23a6b45353e44fbc87a.tar.gz | |
Sync with recent KAME.
This work was based on kame-20010528-freebsd43-snap.tgz and some
critical problem after the snap was out were fixed.
There are many many changes since last KAME merge.
TODO:
- The definitions of SADB_* in sys/net/pfkeyv2.h are still different
from RFC2407/IANA assignment because of binary compatibility
issue. It should be fixed under 5-CURRENT.
- ip6po_m member of struct ip6_pktopts is no longer used. But, it
is still there because of binary compatibility issue. It should
be removed under 5-CURRENT.
Reviewed by: itojun
Obtained from: KAME
MFC after: 3 weeks
Diffstat (limited to 'usr.sbin/faithd/faithd.h')
| -rw-r--r-- | usr.sbin/faithd/faithd.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/usr.sbin/faithd/faithd.h b/usr.sbin/faithd/faithd.h index b882aad..8a5021b 100644 --- a/usr.sbin/faithd/faithd.h +++ b/usr.sbin/faithd/faithd.h @@ -1,4 +1,4 @@ -/* $KAME: faithd.h,v 1.2 2000/05/31 03:06:07 itojun Exp $ */ +/* $KAME: faithd.h,v 1.6 2000/10/05 22:20:37 itojun Exp $ */ /* * Copyright (C) 1997 and 1998 WIDE Project. @@ -40,12 +40,13 @@ extern int ftp_active __P((int, int, int *, int *)); extern int ftp_passive __P((int, int, int *, int *)); extern void rsh_relay __P((int, int)); extern void rsh_dual_relay __P((int, int)); -extern void exit_error __P((const char *fmt, ...)); -extern void exit_success __P((const char *fmt, ...)); -extern void exit_failure __P((const char *fmt, ...)); +extern void exit_success __P((const char *, ...)) + __attribute__((__format__(__printf__, 1, 2))); +extern void exit_failure __P((const char *, ...)) + __attribute__((__format__(__printf__, 1, 2))); #define DEFAULT_PORT_NAME "telnet" -#define DEFAULT_DIR "/usr/local/v6/libexec" +#define DEFAULT_DIR "/usr/libexec" #define DEFAULT_NAME "telnetd" #define DEFAULT_PATH (DEFAULT_DIR "/" DEFAULT_NAME) |
