diff options
author | Kjell Wooding <kjell@cvs.openbsd.org> | 2002-06-09 01:58:55 +0000 |
---|---|---|
committer | Kjell Wooding <kjell@cvs.openbsd.org> | 2002-06-09 01:58:55 +0000 |
commit | 2fc8c0881632f9cf8079baddd995aa76ea24ba01 (patch) | |
tree | b1e20a6c8564cd7e87681d21522897c8e19828a5 /usr.sbin/named | |
parent | ccbb2edfedd4490f861c01c831e57fe506fdc733 (diff) |
More syslog \n whack. ok theo
Diffstat (limited to 'usr.sbin/named')
-rw-r--r-- | usr.sbin/named/named/db_dump.c | 8 | ||||
-rw-r--r-- | usr.sbin/named/named/db_glue.c | 8 | ||||
-rw-r--r-- | usr.sbin/named/named/db_load.c | 16 | ||||
-rw-r--r-- | usr.sbin/named/named/db_reload.c | 8 | ||||
-rw-r--r-- | usr.sbin/named/named/db_secure.c | 6 | ||||
-rw-r--r-- | usr.sbin/named/named/db_update.c | 6 | ||||
-rw-r--r-- | usr.sbin/named/named/ns_forw.c | 6 | ||||
-rw-r--r-- | usr.sbin/named/named/ns_init.c | 16 | ||||
-rw-r--r-- | usr.sbin/named/named/ns_main.c | 8 | ||||
-rw-r--r-- | usr.sbin/named/named/ns_maint.c | 8 | ||||
-rw-r--r-- | usr.sbin/named/named/ns_stats.c | 10 | ||||
-rw-r--r-- | usr.sbin/named/named/storage.c | 4 |
12 files changed, 52 insertions, 52 deletions
diff --git a/usr.sbin/named/named/db_dump.c b/usr.sbin/named/named/db_dump.c index ee6390a14a1..bfd92aca5e5 100644 --- a/usr.sbin/named/named/db_dump.c +++ b/usr.sbin/named/named/db_dump.c @@ -1,11 +1,11 @@ -/* $OpenBSD: db_dump.c,v 1.6 2002/05/28 01:23:13 deraadt Exp $ */ +/* $OpenBSD: db_dump.c,v 1.7 2002/06/09 01:58:54 kjell Exp $ */ #if !defined(lint) && !defined(SABER) #if 0 static char sccsid[] = "@(#)db_dump.c 4.33 (Berkeley) 3/3/91"; static char rcsid[] = "$From: db_dump.c,v 8.19 1996/10/08 04:51:03 vixie Exp $"; #else -static char rcsid[] = "$OpenBSD: db_dump.c,v 1.6 2002/05/28 01:23:13 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: db_dump.c,v 1.7 2002/06/09 01:58:54 kjell Exp $"; #endif #endif /* not lint */ @@ -264,7 +264,7 @@ doadump() FILE *fp; dprintf(3, (ddt, "doadump()\n")); - syslog(LOG_NOTICE, "dumping nameserver data\n"); + syslog(LOG_NOTICE, "dumping nameserver data"); if ((fp = fopen(dumpfile, "w")) == NULL) return; @@ -285,7 +285,7 @@ doadump() if (fcachetab != NULL) (void) db_dump(fcachetab, fp, DB_Z_ALL, ""); (void) my_fclose(fp); - syslog(LOG_NOTICE, "finished dumping nameserver data\n"); + syslog(LOG_NOTICE, "finished dumping nameserver data"); } int diff --git a/usr.sbin/named/named/db_glue.c b/usr.sbin/named/named/db_glue.c index 0653f6c9bad..9b451f548ad 100644 --- a/usr.sbin/named/named/db_glue.c +++ b/usr.sbin/named/named/db_glue.c @@ -1,11 +1,11 @@ -/* $OpenBSD: db_glue.c,v 1.3 2002/02/16 21:28:06 millert Exp $ */ +/* $OpenBSD: db_glue.c,v 1.4 2002/06/09 01:58:54 kjell Exp $ */ #if !defined(lint) && !defined(SABER) #if 0 static char sccsid[] = "@(#)db_glue.c 4.4 (Berkeley) 6/1/90"; static char rcsid[] = "$From: db_glue.c,v 8.16 1996/09/22 00:13:10 vixie Exp $"; #else -static char rcsid[] = "$OpenBSD: db_glue.c,v 1.3 2002/02/16 21:28:06 millert Exp $"; +static char rcsid[] = "$OpenBSD: db_glue.c,v 1.4 2002/06/09 01:58:54 kjell Exp $"; #endif #endif /* not lint */ @@ -534,7 +534,7 @@ rm_name(np, pp, pnp) || (np->n_hash && (msg = "hash")) ) { syslog(LOG_ERR, - "rm_name(%#lx(%s)): non-nil %s pointer\n", + "rm_name(%#lx(%s)): non-nil %s pointer", (u_long)np, NAME(*np), msg); panic(-1, "rm_name"); } @@ -570,7 +570,7 @@ getname(np, buf, buflen) i = (int) NAMELEN(*np); if (i + 1 >= buflen) { *cp = '\0'; - syslog(LOG_INFO, "domain name too long: %s...\n", buf); + syslog(LOG_INFO, "domain name too long: %s...", buf); strcpy(buf, "Name_Too_Long"); return; } diff --git a/usr.sbin/named/named/db_load.c b/usr.sbin/named/named/db_load.c index 00e78788cb4..e59919ed96f 100644 --- a/usr.sbin/named/named/db_load.c +++ b/usr.sbin/named/named/db_load.c @@ -1,11 +1,11 @@ -/* $OpenBSD: db_load.c,v 1.7 2002/02/17 19:42:37 millert Exp $ */ +/* $OpenBSD: db_load.c,v 1.8 2002/06/09 01:58:54 kjell Exp $ */ #if !defined(lint) && !defined(SABER) #if 0 static char sccsid[] = "@(#)db_load.c 4.38 (Berkeley) 3/2/91"; static char rcsid[] = "$From: db_load.c,v 8.33 1998/05/11 04:19:45 vixie Exp $"; #else -static char rcsid[] = "$OpenBSD: db_load.c,v 1.7 2002/02/17 19:42:37 millert Exp $"; +static char rcsid[] = "$OpenBSD: db_load.c,v 1.8 2002/06/09 01:58:54 kjell Exp $"; #endif #endif /* not lint */ @@ -321,7 +321,7 @@ db_load(filename, in_origin, zp, def_domain) do { if (n > (INT_MAX - (*cp - '0')) / 10) { syslog(LOG_INFO, - "%s: line %d: number > %lu\n", + "%s: line %d: number > %lu", filename, lineno, (u_long)INT_MAX); n = INT_MAX; cp++; @@ -332,7 +332,7 @@ db_load(filename, in_origin, zp, def_domain) if (*cp != '\0') { errs++; syslog(LOG_INFO, - "%s: Line %d: bad TTL: %s.\n", + "%s: Line %d: bad TTL: %s.", filename, lineno, buf); break; } @@ -364,7 +364,7 @@ db_load(filename, in_origin, zp, def_domain) dprintf(1, (ddt, "%s: Line %d: Unknown type: %s.\n", filename, lineno, buf)); errs++; - syslog(LOG_INFO, "%s: Line %d: Unknown type: %s.\n", + syslog(LOG_INFO, "%s: Line %d: Unknown type: %s.", filename, lineno, buf); break; } @@ -374,7 +374,7 @@ db_load(filename, in_origin, zp, def_domain) domain, inaddr_any)) { errs++; syslog(LOG_NOTICE, - "%s:%d: owner name error\n", + "%s:%d: owner name error", filename, lineno); break; } @@ -1462,7 +1462,7 @@ gettoken(fp, src) return (ORIGIN); } syslog(LOG_NOTICE, - "%s: line %d: Unknown $ option: $%s\n", + "%s: line %d: Unknown $ option: $%s", src, lineno, op); return (ERROR); @@ -1881,7 +1881,7 @@ makename_ok(name, origin, class, transport, context, owner, filename, lineno) makename(name, origin); if (!ns_nameok(name, class, transport, context, owner, inaddr_any)) { - syslog(LOG_INFO, "%s:%d: database naming error\n", + syslog(LOG_INFO, "%s:%d: database naming error", filename, lineno); ret = 0; } diff --git a/usr.sbin/named/named/db_reload.c b/usr.sbin/named/named/db_reload.c index 22ca1717d32..ccb09cef383 100644 --- a/usr.sbin/named/named/db_reload.c +++ b/usr.sbin/named/named/db_reload.c @@ -1,11 +1,11 @@ -/* $OpenBSD: db_reload.c,v 1.3 1998/05/23 19:24:49 millert Exp $ */ +/* $OpenBSD: db_reload.c,v 1.4 2002/06/09 01:58:54 kjell Exp $ */ #if !defined(lint) && !defined(SABER) #if 0 static char sccsid[] = "@(#)db_reload.c 4.22 (Berkeley) 3/21/91"; static char rcsid[] = "$From: db_reload.c,v 8.3 1996/08/27 08:33:23 vixie Exp $"; #else -static char rcsid[] = "$OpenBSD: db_reload.c,v 1.3 1998/05/23 19:24:49 millert Exp $"; +static char rcsid[] = "$OpenBSD: db_reload.c,v 1.4 2002/06/09 01:58:54 kjell Exp $"; #endif #endif /* not lint */ @@ -82,7 +82,7 @@ db_reload(reloadnets) int reloadnets; { dprintf(3, (ddt, "reload()\n")); - syslog(LOG_NOTICE, "reloading nameserver\n"); + syslog(LOG_NOTICE, "reloading nameserver"); qflush(); sqflush(NULL); @@ -100,7 +100,7 @@ db_reload(reloadnets) #endif /* FORCED_RELOAD */ dprintf(1, (ddt, "Ready to answer queries.\n")); - syslog(LOG_NOTICE, "Ready to answer queries.\n"); + syslog(LOG_NOTICE, "Ready to answer queries."); } #if 0 diff --git a/usr.sbin/named/named/db_secure.c b/usr.sbin/named/named/db_secure.c index 2cc7c065feb..d17e87e5f70 100644 --- a/usr.sbin/named/named/db_secure.c +++ b/usr.sbin/named/named/db_secure.c @@ -1,10 +1,10 @@ -/* $OpenBSD: db_secure.c,v 1.3 1998/05/22 00:47:36 millert Exp $ */ +/* $OpenBSD: db_secure.c,v 1.4 2002/06/09 01:58:54 kjell Exp $ */ #ifndef LINT #if 0 static char rcsid[] = "$From: db_secure.c,v 8.6 1996/05/17 09:10:46 vixie Exp $"; #else -static char rcsid[] = "$OpenBSD: db_secure.c,v 1.3 1998/05/22 00:47:36 millert Exp $"; +static char rcsid[] = "$OpenBSD: db_secure.c,v 1.4 2002/06/09 01:58:54 kjell Exp $"; #endif #endif @@ -124,7 +124,7 @@ build_secure_netlist(zp) /* Check for duplicates */ if (addr_on_netlist(ntp->my_addr, *netlistp)) { syslog(LOG_INFO, - "build_secure_netlist (%s): duplicate address %s\n", + "build_secure_netlist (%s): duplicate address %s", zp->z_origin, inet_ntoa(ntp->my_addr)); errs++; continue; diff --git a/usr.sbin/named/named/db_update.c b/usr.sbin/named/named/db_update.c index a34e3210535..74a3e49237c 100644 --- a/usr.sbin/named/named/db_update.c +++ b/usr.sbin/named/named/db_update.c @@ -1,11 +1,11 @@ -/* $OpenBSD: db_update.c,v 1.3 1998/05/22 00:47:37 millert Exp $ */ +/* $OpenBSD: db_update.c,v 1.4 2002/06/09 01:58:54 kjell Exp $ */ #if !defined(lint) && !defined(SABER) #if 0 static char sccsid[] = "@(#)db_update.c 4.28 (Berkeley) 3/21/91"; static char rcsid[] = "$From: db_update.c,v 8.19 1997/06/01 20:34:34 vixie Exp $"; #else -static char rcsid[] = "$OpenBSD: db_update.c,v 1.3 1998/05/22 00:47:37 millert Exp $"; +static char rcsid[] = "$OpenBSD: db_update.c,v 1.4 2002/06/09 01:58:54 kjell Exp $"; #endif #endif /* not lint */ @@ -352,7 +352,7 @@ db_update(name, odp, newdp, flags, htp) #endif /*NCACHE*/ zones[odp->d_zone].z_type != Z_CACHE) { syslog(LOG_INFO, - "%s has CNAME and other data (invalid)\n", + "%s has CNAME and other data (invalid)", name); goto skip; } diff --git a/usr.sbin/named/named/ns_forw.c b/usr.sbin/named/named/ns_forw.c index c75ef1c19bf..06a4ebf9743 100644 --- a/usr.sbin/named/named/ns_forw.c +++ b/usr.sbin/named/named/ns_forw.c @@ -1,11 +1,11 @@ -/* $OpenBSD: ns_forw.c,v 1.6 2002/02/16 21:28:06 millert Exp $ */ +/* $OpenBSD: ns_forw.c,v 1.7 2002/06/09 01:58:54 kjell Exp $ */ #if !defined(lint) && !defined(SABER) #if 0 static char sccsid[] = "@(#)ns_forw.c 4.32 (Berkeley) 3/3/91"; static char rcsid[] = "$From: ns_forw.c,v 8.19 1996/12/02 09:27:36 vixie Exp $"; #else -static char rcsid[] = "$OpenBSD: ns_forw.c,v 1.6 2002/02/16 21:28:06 millert Exp $"; +static char rcsid[] = "$OpenBSD: ns_forw.c,v 1.7 2002/06/09 01:58:54 kjell Exp $"; #endif #endif /* not lint */ @@ -545,7 +545,7 @@ nslookup(nsp, qp, syslogdname, sysloginfo) (dp->d_ttl < curtime) && !(dp->d_flags & DB_F_HINT) ) { - syslog(LOG_DEBUG, "nslookup: stale '%s'\n", + syslog(LOG_DEBUG, "nslookup: stale '%s'", NAME(*np)); n = oldn; found_arr = 0; diff --git a/usr.sbin/named/named/ns_init.c b/usr.sbin/named/named/ns_init.c index 7a41cba736c..6eeac90b52d 100644 --- a/usr.sbin/named/named/ns_init.c +++ b/usr.sbin/named/named/ns_init.c @@ -1,11 +1,11 @@ -/* $OpenBSD: ns_init.c,v 1.8 2002/02/17 19:42:37 millert Exp $ */ +/* $OpenBSD: ns_init.c,v 1.9 2002/06/09 01:58:54 kjell Exp $ */ #if !defined(lint) && !defined(SABER) #if 0 static char sccsid[] = "@(#)ns_init.c 4.38 (Berkeley) 3/21/91"; static char rcsid[] = "$From: ns_init.c,v 8.26 1998/05/11 04:19:45 vixie Exp $"; #else -static char rcsid[] = "$OpenBSD: ns_init.c,v 1.8 2002/02/17 19:42:37 millert Exp $"; +static char rcsid[] = "$OpenBSD: ns_init.c,v 1.9 2002/06/09 01:58:54 kjell Exp $"; #endif #endif /* not lint */ @@ -363,7 +363,7 @@ boot_read(filename, includefile) #endif } else { syslog(LOG_NOTICE, - "%s: line %d: unknown directive '%s'\n", + "%s: line %d: unknown directive '%s'", filename, lineno, buf); endline(fp); continue; @@ -373,14 +373,14 @@ boot_read(filename, includefile) * read zone origin */ if (!getword(obuf, sizeof(obuf), fp, 1)) { - syslog(LOG_NOTICE, "%s: line %d: missing origin\n", + syslog(LOG_NOTICE, "%s: line %d: missing origin", filename, lineno); continue; } i = strlen(obuf); if ((obuf[i-1] == '.') && (i != 1)) syslog(LOG_INFO, - "%s: line %d: zone \"%s\" has trailing dot\n", + "%s: line %d: zone \"%s\" has trailing dot", filename, lineno, obuf); while ((--i >= 0) && (obuf[i] == '.')) obuf[i] = '\0'; @@ -389,7 +389,7 @@ boot_read(filename, includefile) * Read source file or host address. */ if (!getword(buf, sizeof(buf), fp, 0)) { - syslog(LOG_NOTICE, "%s: line %d: missing %s\n", + syslog(LOG_NOTICE, "%s: line %d: missing %s", filename, lineno, #ifdef STUBS (type == Z_SECONDARY || type == Z_STUB) @@ -457,14 +457,14 @@ boot_read(filename, includefile) zp->z_refresh = atoi(buf); if (zp->z_refresh <= 0) { syslog(LOG_NOTICE, - "%s: line %d: bad refresh time '%s', ignored\n", + "%s: line %d: bad refresh time '%s', ignored", filename, lineno, buf); zp->z_refresh = 0; } else if (cache_file == NULL) cache_file = source; #else syslog(LOG_NOTICE, - "%s: line %d: cache refresh ignored\n", + "%s: line %d: cache refresh ignored", filename, lineno); #endif endline(fp); diff --git a/usr.sbin/named/named/ns_main.c b/usr.sbin/named/named/ns_main.c index 36ed2f1cc50..e79d6f46a4d 100644 --- a/usr.sbin/named/named/ns_main.c +++ b/usr.sbin/named/named/ns_main.c @@ -1,11 +1,11 @@ -/* $OpenBSD: ns_main.c,v 1.19 2002/05/28 01:23:13 deraadt Exp $ */ +/* $OpenBSD: ns_main.c,v 1.20 2002/06/09 01:58:54 kjell Exp $ */ #if !defined(lint) && !defined(SABER) #if 0 static char sccsid[] = "@(#)ns_main.c 4.55 (Berkeley) 7/1/91"; static char rcsid[] = "$From: ns_main.c,v 8.26 1998/05/11 04:19:45 vixie Exp $"; #else -static char rcsid[] = "$OpenBSD: ns_main.c,v 1.19 2002/05/28 01:23:13 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: ns_main.c,v 1.20 2002/06/09 01:58:54 kjell Exp $"; #endif #endif /* not lint */ @@ -738,7 +738,7 @@ main(argc, argv, envp) group_name); } - syslog(LOG_NOTICE, "Ready to answer queries.\n"); + syslog(LOG_NOTICE, "Ready to answer queries."); prime_cache(); #ifdef NeXT old_sigmask = sigblock(sigmask(SIGCHLD)); @@ -988,7 +988,7 @@ main(argc, argv, envp) #ifdef DEBUG if (debug) syslog(LOG_DEBUG, - "IP/TCP connection from %s (fd %d)\n", + "IP/TCP connection from %s (fd %d)", sin_ntoa(&sp->s_from), rfd); #endif } diff --git a/usr.sbin/named/named/ns_maint.c b/usr.sbin/named/named/ns_maint.c index fa2ba5ff286..5b4855dbf32 100644 --- a/usr.sbin/named/named/ns_maint.c +++ b/usr.sbin/named/named/ns_maint.c @@ -1,11 +1,11 @@ -/* $OpenBSD: ns_maint.c,v 1.5 2002/05/28 01:23:13 deraadt Exp $ */ +/* $OpenBSD: ns_maint.c,v 1.6 2002/06/09 01:58:54 kjell Exp $ */ #if !defined(lint) && !defined(SABER) #if 0 static char sccsid[] = "@(#)ns_maint.c 4.39 (Berkeley) 3/2/91"; static char rcsid[] = "$From: ns_maint.c,v 8.18 1996/09/22 00:13:10 vixie Exp $"; #else -static char rcsid[] = "$OpenBSD: ns_maint.c,v 1.5 2002/05/28 01:23:13 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: ns_maint.c,v 1.6 2002/06/09 01:58:54 kjell Exp $"; #endif #endif /* not lint */ @@ -322,7 +322,7 @@ qserial_answer(qp, serial) } else if (SEQ_GT(zp->z_serial, serial)) { if (!haveComplained((char*)zp, "went backward")) { syslog(LOG_NOTICE, - "Zone \"%s\" (class %d) SOA serial# (%lu) rcvd from [%s] is < ours (%lu)\n", + "Zone \"%s\" (class %d) SOA serial# (%lu) rcvd from [%s] is < ours (%lu)", zp->z_origin, zp->z_class, (u_long)serial, inet_ntoa(from_addr.sin_addr), (u_long)zp->z_serial); @@ -931,7 +931,7 @@ endxfer() if (WIFSIGNALED(status)) { if (WTERMSIG(status) != SIGKILL) { syslog(LOG_NOTICE, - "named-xfer \"%s\" exited with signal %d\n", + "named-xfer \"%s\" exited with signal %d", zp->z_origin[0]?zp->z_origin:".", WTERMSIG(status)); } diff --git a/usr.sbin/named/named/ns_stats.c b/usr.sbin/named/named/ns_stats.c index f822c60b5f8..b81b5fe9776 100644 --- a/usr.sbin/named/named/ns_stats.c +++ b/usr.sbin/named/named/ns_stats.c @@ -1,11 +1,11 @@ -/* $OpenBSD: ns_stats.c,v 1.5 2002/02/16 21:28:06 millert Exp $ */ +/* $OpenBSD: ns_stats.c,v 1.6 2002/06/09 01:58:54 kjell Exp $ */ #if !defined(lint) && !defined(SABER) #if 0 static char sccsid[] = "@(#)ns_stats.c 4.10 (Berkeley) 6/27/90"; static char rcsid[] = "$From: ns_stats.c,v 8.8 1996/09/22 00:13:10 vixie Exp $"; #else -static char rcsid[] = "$OpenBSD: ns_stats.c,v 1.5 2002/02/16 21:28:06 millert Exp $"; +static char rcsid[] = "$OpenBSD: ns_stats.c,v 1.6 2002/06/09 01:58:54 kjell Exp $"; #endif #endif /* not lint */ @@ -123,10 +123,10 @@ ns_stats() register FILE *f; register int i; - syslog(LOG_NOTICE, "dumping nameserver stats\n"); + syslog(LOG_NOTICE, "dumping nameserver stats"); if (!(f = fopen(statsfile, "a"))) { - syslog(LOG_NOTICE, "cannot open stat file, \"%s\"\n", + syslog(LOG_NOTICE, "cannot open stat file, \"%s\"", statsfile); return; } @@ -155,7 +155,7 @@ ns_stats() fprintf(f, "--- Statistics Dump --- (%ld) %s", (long)timenow, ctime(&timenow)); (void) my_fclose(f); - syslog(LOG_NOTICE, "done dumping nameserver stats\n"); + syslog(LOG_NOTICE, "done dumping nameserver stats"); } void diff --git a/usr.sbin/named/named/storage.c b/usr.sbin/named/named/storage.c index 0bd21de63b9..0fda2ac6a9c 100644 --- a/usr.sbin/named/named/storage.c +++ b/usr.sbin/named/named/storage.c @@ -1,4 +1,4 @@ -/* $OpenBSD: storage.c,v 1.4 2002/02/16 21:28:06 millert Exp $ */ +/* $OpenBSD: storage.c,v 1.5 2002/06/09 01:58:54 kjell Exp $ */ /* * ++Copyright++ 1985, 1989 @@ -125,7 +125,7 @@ unsigned int cnt; mp->mdb_str = "???"; goto ok; } - syslog(LOG_ERR, "rt_malloc: memdebug overflow\n"); + syslog(LOG_ERR, "rt_malloc: memdebug overflow"); } ok: ; { |