diff options
| author | Kjell Wooding <kjell@cvs.openbsd.org> | 2005-05-23 20:25:55 +0000 |
|---|---|---|
| committer | Kjell Wooding <kjell@cvs.openbsd.org> | 2005-05-23 20:25:55 +0000 |
| commit | 96b3f0d6ff187ba0091064f167f5279c692eaf64 (patch) | |
| tree | 11afd5486137cee272cbbcb5f9983f0deae29c62 /sbin | |
| parent | 4993920c001a022410f5901621b069ce282724d2 (diff) | |
tap. tap. is this thing on?
KNF, Fix a typo in an ENUM, Xr to ipsec.conf
no binary change
ok hshoexer@
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/ipsecctl/ipsecctl.8 | 6 | ||||
| -rw-r--r-- | sbin/ipsecctl/ipsecctl.c | 24 | ||||
| -rw-r--r-- | sbin/ipsecctl/ipsecctl.h | 4 |
3 files changed, 17 insertions, 17 deletions
diff --git a/sbin/ipsecctl/ipsecctl.8 b/sbin/ipsecctl/ipsecctl.8 index a4a5b6c52c4..d3e48599a93 100644 --- a/sbin/ipsecctl/ipsecctl.8 +++ b/sbin/ipsecctl/ipsecctl.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ipsecctl.8,v 1.6 2005/04/12 06:57:36 deraadt Exp $ +.\" $OpenBSD: ipsecctl.8,v 1.7 2005/05/23 20:25:54 kjell Exp $ .\" .\" Copyright (c) 2004, 2005 Hans-Joerg Hoexer <hshoexer@openbsd.org> .\" @@ -65,8 +65,8 @@ will produce even more verbose output. .\" .Sh DIAGNOSTICS .\" The next request is for sections 2, 3, and 9 error and signal handling only. .\" .Sh ERRORS -.\" .Sh SEE ALSO -.\" .Xr foobar 1 +.Sh SEE ALSO +.Xr ipsec.conf 5 .\" .Sh STANDARDS .\" .Sh HISTORY .\" .Sh AUTHORS diff --git a/sbin/ipsecctl/ipsecctl.c b/sbin/ipsecctl/ipsecctl.c index 41a2ec7019e..78969bc0319 100644 --- a/sbin/ipsecctl/ipsecctl.c +++ b/sbin/ipsecctl/ipsecctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ipsecctl.c,v 1.4 2005/04/12 06:57:36 deraadt Exp $ */ +/* $OpenBSD: ipsecctl.c,v 1.5 2005/05/23 20:25:54 kjell Exp $ */ /* * Copyright (c) 2004, 2005 Hans-Joerg Hoexer <hshoexer@openbsd.org> * @@ -67,7 +67,7 @@ ipsecctl_rules(char *filename, int opts) } else { if ((fin = ipsecctl_fopen(filename, "r")) == NULL) { warn("%s", filename); - return 1; + return (1); } infile = filename; } @@ -80,7 +80,7 @@ ipsecctl_rules(char *filename, int opts) if (ipsecctl_commit(&ipsec)) err(1, NULL); - return error; + return (error); } FILE * @@ -91,18 +91,18 @@ ipsecctl_fopen(const char *name, const char *mode) fp = fopen(name, mode); if (fp == NULL) - return NULL; + return (NULL); if (fstat(fileno(fp), &st)) { fclose(fp); - return NULL; + return (NULL); } if (S_ISDIR(st.st_mode)) { fclose(fp); errno = EISDIR; - return NULL; + return (NULL); } - return fp; + return (fp); } int @@ -129,7 +129,7 @@ ipsecctl_commit(struct ipsecctl *ipsec) free(rp); } - return 0; + return (0); } int @@ -141,7 +141,7 @@ ipsecctl_add_rule(struct ipsecctl *ipsec, struct ipsec_rule *r) IPSECCTL_OPT_SHOW)) ipsecctl_print_rule(r, ipsec->opts & IPSECCTL_OPT_VERBOSE2); - return 0; + return (0); } void @@ -201,14 +201,14 @@ int ipsecctl_flush(int opts) { if (opts & IPSECCTL_OPT_NOACTION) - return 0; + return (0); if (pfkey_init() == -1) errx(1, "failed to open PF_KEY socket"); pfkey_ipsec_flush(); - return 0; + return (0); } void @@ -294,7 +294,7 @@ ipsecctl_get_rules(struct ipsecctl *ipsec) else if (ipo->ipo_sproto == IPPROTO_AH) rule->proto = IPSEC_AH; else { - rule->proto = PROTO_UNKNWON; + rule->proto = PROTO_UNKNOWN; warnx("unsupported protocol %d", ipo->ipo_sproto); } diff --git a/sbin/ipsecctl/ipsecctl.h b/sbin/ipsecctl/ipsecctl.h index 2c8c0e01208..e8fef4fec6b 100644 --- a/sbin/ipsecctl/ipsecctl.h +++ b/sbin/ipsecctl/ipsecctl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ipsecctl.h,v 1.2 2005/04/04 22:22:55 hshoexer Exp $ */ +/* $OpenBSD: ipsecctl.h,v 1.3 2005/05/23 20:25:54 kjell Exp $ */ /* * Copyright (c) 2004, 2005 Hans-Joerg Hoexer <hshoexer@openbsd.org> * @@ -30,7 +30,7 @@ enum { DIRECTION_UNKNOWN, IPSEC_IN, IPSEC_OUT, IPSEC_INOUT }; enum { - PROTO_UNKNWON, IPSEC_ESP, IPSEC_AH, IPSEC_COMP + PROTO_UNKNOWN, IPSEC_ESP, IPSEC_AH, IPSEC_COMP }; enum { AUTH_UNKNOWN, AUTH_PSK, AUTH_RSA |