diff --git a/lib/isc/Makefile.in b/lib/isc/Makefile.in index 8402a2c10b..65b0735255 100644 --- a/lib/isc/Makefile.in +++ b/lib/isc/Makefile.in @@ -13,7 +13,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.70 2001/01/09 21:55:52 bwelling Exp $ +# $Id: Makefile.in,v 1.71 2001/03/02 19:25:15 bwelling Exp $ srcdir = @srcdir@ VPATH = @srcdir@ @@ -35,8 +35,8 @@ UNIXOBJS = @ISC_ISCIPV6_O@ \ unix/app.@O@ unix/dir.@O@ unix/entropy.@O@ \ unix/errno2result.@O@ unix/file.@O@ unix/fsaccess.@O@ \ unix/interfaceiter.@O@ unix/keyboard.@O@ unix/net.@O@ \ - unix/os.@O@ unix/resource.@O@ unix/socket.@O@ unix/time.@O@ \ - unix/stdio.@O@ unix/stdtime.@O@ + unix/os.@O@ unix/resource.@O@ unix/socket.@O@ unix/stdio.@O@ \ + unix/stdtime.@O@ unix/syslog.@O@ unix/time.@O@ NLSOBJS = nls/msgcat.@O@ diff --git a/lib/isc/unix/Makefile.in b/lib/isc/unix/Makefile.in index 19ec6aeb7d..7dc2fb827b 100644 --- a/lib/isc/unix/Makefile.in +++ b/lib/isc/unix/Makefile.in @@ -13,7 +13,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.34 2001/01/09 21:58:10 bwelling Exp $ +# $Id: Makefile.in,v 1.35 2001/03/02 19:25:16 bwelling Exp $ srcdir = @srcdir@ VPATH = @srcdir@ @@ -32,13 +32,15 @@ CWARNINGS = OBJS = @ISC_IPV6_O@ \ app.@O@ dir.@O@ entropy.@O@ errno2result.@O@ file.@O@ \ fsaccess.@O@ interfaceiter.@O@ keyboard.@O@ net.@O@ \ - os.@O@ resource.@O@ socket.@O@ stdio.@O@ stdtime.@O@ time.@O@ + os.@O@ resource.@O@ socket.@O@ stdio.@O@ stdtime.@O@ \ + syslog.@O@ time.@O@ # Alphabetically SRCS = @ISC_IPV6_C@ \ app.c dir.c entropy.c errno2result.c file.c \ fsaccess.c interfaceiter.c keyboard.c net.c \ - os.c resource.c socket.c stdio.c stdtime.c time.c + os.c resource.c socket.c stdio.c stdtime.c \ + syslog.c time.c SUBDIRS = include TARGETS = ${OBJS} diff --git a/lib/isc/unix/include/isc/Makefile.in b/lib/isc/unix/include/isc/Makefile.in index 028d2de7e4..de2ed2c561 100644 --- a/lib/isc/unix/include/isc/Makefile.in +++ b/lib/isc/unix/include/isc/Makefile.in @@ -13,7 +13,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.25 2001/01/09 21:58:35 bwelling Exp $ +# $Id: Makefile.in,v 1.26 2001/03/02 19:25:18 bwelling Exp $ srcdir = @srcdir@ VPATH = @srcdir@ @@ -21,7 +21,8 @@ top_srcdir = @top_srcdir@ @BIND9_VERSION@ -HEADERS = app.h dir.h int.h net.h netdb.h offset.h stdtime.h time.h +HEADERS = app.h dir.h int.h net.h netdb.h offset.h stdtime.h \ + syslog.h time.h SUBDIRS = TARGETS = diff --git a/lib/isc/unix/include/isc/syslog.h b/lib/isc/unix/include/isc/syslog.h new file mode 100644 index 0000000000..73f50a22b1 --- /dev/null +++ b/lib/isc/unix/include/isc/syslog.h @@ -0,0 +1,45 @@ +/* + * Copyright (C) 1999-2001 Internet Software Consortium. + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM + * DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL + * INTERNET SOFTWARE CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, + * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING + * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, + * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION + * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +/* $Id: syslog.h,v 1.1 2001/03/02 19:25:19 bwelling Exp $ */ + +#ifndef ISC_SYSLOG_H +#define ISC_SYSLOG_H 1 + +#include +#include + +ISC_LANG_BEGINDECLS + +isc_result_t +isc_syslog_facilityfromstring(const char *str, int *facilityp); +/* + * Convert 'str' to the appropriate syslog facility constant. + * + * Requires: + * + * 'str' is not NULL + * 'facilityp' is not NULL + * + * Returns: + * ISC_R_SUCCESS + * ISC_R_NOTFOUND + */ + +ISC_LANG_BEGINDECLS + +#endif /* ISC_SYSLOG_H */ diff --git a/lib/isc/unix/syslog.c b/lib/isc/unix/syslog.c new file mode 100644 index 0000000000..db5b93baa8 --- /dev/null +++ b/lib/isc/unix/syslog.c @@ -0,0 +1,82 @@ +/* + * Copyright (C) 2001 Internet Software Consortium. + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM + * DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL + * INTERNET SOFTWARE CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, + * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING + * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, + * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION + * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +/* $Id: syslog.c,v 1.1 2001/03/02 19:25:18 bwelling Exp $ */ + +#include + +#include +#include +#include + +#include +#include +#include + +static struct dsn_c_pvt_sfnt { + int val; + const char *strval; +} facilities[] = { + { LOG_KERN, "kern" }, + { LOG_USER, "user" }, + { LOG_MAIL, "mail" }, + { LOG_DAEMON, "daemon" }, + { LOG_AUTH, "auth" }, + { LOG_SYSLOG, "syslog" }, + { LOG_LPR, "lpr" }, +#ifdef LOG_NEWS + { LOG_NEWS, "news" }, +#endif +#ifdef LOG_UUCP + { LOG_UUCP, "uucp" }, +#endif +#ifdef LOG_CRON + { LOG_CRON, "cron" }, +#endif +#ifdef LOG_AUTHPRIV + { LOG_AUTHPRIV, "authpriv" }, +#endif +#ifdef LOG_FTP + { LOG_FTP, "ftp" }, +#endif + { LOG_LOCAL0, "local0"}, + { LOG_LOCAL1, "local1"}, + { LOG_LOCAL2, "local2"}, + { LOG_LOCAL3, "local3"}, + { LOG_LOCAL4, "local4"}, + { LOG_LOCAL5, "local5"}, + { LOG_LOCAL6, "local6"}, + { LOG_LOCAL7, "local7"}, + { 0, NULL } +}; + +isc_result_t +isc_syslog_facilityfromstring(const char *str, int *facilityp) { + int i; + + REQUIRE(str != NULL); + REQUIRE(facilityp != NULL); + + for (i = 0 ; facilities[i].strval != NULL ; i++) { + if (strcasecmp(facilities[i].strval, str) == 0) { + *facilityp = facilities[i].val; + return (ISC_R_SUCCESS); + } + } + return (ISC_R_NOTFOUND); + +} diff --git a/util/copyrights b/util/copyrights index d4c16725c5..d971eda4f3 100644 --- a/util/copyrights +++ b/util/copyrights @@ -1279,6 +1279,7 @@ ./lib/isc/unix/include/isc/netdb.h C 1999,2000,2001 ./lib/isc/unix/include/isc/offset.h C 2000,2001 ./lib/isc/unix/include/isc/stdtime.h C 1999,2000,2001 +./lib/isc/unix/include/isc/syslog.h C 1999,2000,2001 ./lib/isc/unix/include/isc/time.h C 1998,1999,2000,2001 ./lib/isc/unix/interfaceiter.c C 1999,2000,2001 ./lib/isc/unix/ipv6.c C 1999,2000,2001 @@ -1290,6 +1291,7 @@ ./lib/isc/unix/socket_p.h C 2000,2001 ./lib/isc/unix/stdio.c C 2000,2001 ./lib/isc/unix/stdtime.c C 1999,2000,2001 +./lib/isc/unix/syslog.c C 2001 ./lib/isc/unix/time.c C 1998,1999,2000,2001 ./lib/isc/version.c C 1998,1999,2000,2001 ./lib/isc/win32/.cvsignore X 1999,2000,2001