Skip to content

Commit b622711

Browse files
authored
Merge pull request #101 from luzpaz/typos
Fix various typos
2 parents 5552a3e + 64cd262 commit b622711

File tree

9 files changed

+12
-12
lines changed

9 files changed

+12
-12
lines changed

ChangeLog.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -508,7 +508,7 @@ and a replacement for `syslog.h` to enable new features in RFC5424.
508508
- New `syslogp()` API from NetBSD, for applications wanting to use
509509
RFC5424 features like MsgID or structured data
510510
- Many *incompatible changes* to command line options in `syslogd` and
511-
`klogd` for compatiblity with FreeBSD and NetBSD syslogd. Examples:
511+
`klogd` for compatibility with FreeBSD and NetBSD syslogd. Examples:
512512
- In syslogd: `-b` and `-c` have been replaced with `-r` for global
513513
log rotation, `-a` has been replaced with the new `-p` support. The
514514
`-r` flag and `-s HOST` has also been dropped in favor of the BSD

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ Main differences from the original sysklogd package are:
6363

6464
- The separate `klogd` daemon is no longer part of the sysklogd project,
6565
syslogd now natively supports logging kernel messages as well
66-
- *Major* command line changes to `syslogd`, for compatibilty with *BSD
66+
- *Major* command line changes to `syslogd`, for compatibility with *BSD
6767
- Supports `include /etc/syslog.d/*.conf` directive, see example .conf
6868
- Built-in log-rotation support, with compression by default, useful for
6969
embedded systems. No need for cron and/or a separate log rotate daemon

man/syslog.conf.5

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -704,7 +704,7 @@ This example shows one combination of program and hostname filters.
704704
!-ppp
705705
*.* /var/log/syslog
706706

707-
# Local pppd messages of severity info, or higer, go to its own log file
707+
# Local pppd messages of severity info, or higher, go to its own log file
708708
!+ppp
709709
*.info /var/log/ppp.log
710710

src/logger.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ static int usage(int code)
286286
" -h HOST Send (UDP) message to this remote syslog server (IP or DNS name)\n"
287287
" -H NAME Use NAME instead of system hostname in message header\n"
288288
" -i Log process ID of the logger process with each line (LOG_PID)\n"
289-
" -I PID Log process ID using PID, recommed using PID $$ for shell scripts\n"
289+
" -I PID Log process ID using PID, recommend using PID $$ for shell scripts\n"
290290
#ifdef __linux__
291291
" -k Log to kernel /dev/kmsg if /dev/log doesn't exist yet\n"
292292
#endif

src/syslog.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ CODE facilitynames[] = {
191191
#define LOG_NDELAY 0x008 /* don't delay open */
192192
#define LOG_NOWAIT 0x010 /* don't wait for console forks: DEPRECATED */
193193
#define LOG_PERROR 0x020 /* log to stderr as well */
194-
#define LOG_PTRIM 0x040 /* trim anything syslog addded when writing to stderr */
194+
#define LOG_PTRIM 0x040 /* trim anything syslog added when writing to stderr */
195195
#define LOG_NLOG 0x080 /* don't write to the system log */
196196
#define LOG_STDOUT 0x100 /* like nlog, for debugging syslogp() API */
197197
#define LOG_RFC3164 0x200 /* Log to remote/ipc socket in old BSD format */

src/syslogd.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ static TAILQ_HEAD(notifiers, notifier) nothead = TAILQ_HEAD_INITIALIZER(nothead)
177177
static TAILQ_HEAD(peers, peer) pqueue = TAILQ_HEAD_INITIALIZER(pqueue);
178178

179179
/*
180-
* List fo peers allowed to log to us.
180+
* List of peers allowed to log to us.
181181
*/
182182
static SIMPLEQ_HEAD(allowed, allowedpeer) aphead = SIMPLEQ_HEAD_INITIALIZER(aphead);
183183

@@ -4456,7 +4456,7 @@ static void notifier_free_all(void)
44564456
}
44574457

44584458
/*
4459-
* The following function is resposible for handling a SIGHUP signal. Since
4459+
* The following function is responsible for handling a SIGHUP signal. Since
44604460
* we are now doing mallocs/free as part of init we had better not being
44614461
* doing this during a signal handler. Instead this function simply sets
44624462
* a flag variable which will tell the main loop to go through a restart.

src/syslogd.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@
224224
#define F_PIPE 9 /* named pipe */
225225

226226
/*
227-
* Stuct to hold property-based filters
227+
* Struct to hold property-based filters
228228
*/
229229
struct prop_filter {
230230
uint8_t prop_type;

syslog.conf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ mail.err /var/log/mail.err
4444

4545
#
4646
# Store all critical events, except kernel logs, in critical RFC5424 format.
47-
# Overide global log rotation settings, rotate every 10MiB, keep 5 old logs,
47+
# Override global log rotation settings, rotate every 10MiB, keep 5 old logs,
4848
#
4949
#*.=crit;kern.none /var/log/critical ;rotate=10M:5,RFC5424
5050

@@ -68,7 +68,7 @@ mail.err /var/log/mail.err
6868
# Secure mode, same as -s, none(0), on(1), full(2). When enabled
6969
# only logging to remote syslog server possible, with full secure
7070
# mode, not even that is possible. We default to prevent syslogd
71-
# from opening UDP/514 and receving messages from other systems.
71+
# from opening UDP/514 and receiving messages from other systems.
7272
#
7373
secure_mode 1
7474

test/listen.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,10 @@ run_step "Verify listen off - no remote no ports" verify_secure_daem
9999
run_step "Verify listen off - only send to remote, no ports" verify_safe_daemon
100100
run_step "Verify listen on, default" verify_default_daemon
101101

102-
run_step "Verfiy listen on 127.0.0.1:510" verify_local_daemon
102+
run_step "Verify listen on 127.0.0.1:510" verify_local_daemon
103103
run_step "Verify port 514 is closed" check_not_open 514
104104

105-
run_step "Verfiy listen on 10.0.0.1:512" verify_bind
105+
run_step "Verify listen on 10.0.0.1:512" verify_bind
106106
run_step "Verify port 510 is closed" check_not_open 510
107107

108108
run_step "Verify delayed bind to new address 10.0.0.2:513" verify_delayed_bind

0 commit comments

Comments
 (0)