diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 2001-08-22 13:06:10 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 2001-08-22 13:06:10 +0000 |
| commit | 52c3362b2acec5b1c95f39fe4845636397b663a9 (patch) | |
| tree | 28b50b0e4bf379a149522d36e5bd16a3cb864cd8 /sbin/isakmpd/sysdep | |
| parent | f15bb0153e962c4b51bde4a2b26ae7745a3f783b (diff) | |
IPCOMP policy control should be optional for backward
compatibility.
Diffstat (limited to 'sbin/isakmpd/sysdep')
| -rw-r--r-- | sbin/isakmpd/sysdep/openbsd/sysdep.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sbin/isakmpd/sysdep/openbsd/sysdep.c b/sbin/isakmpd/sysdep/openbsd/sysdep.c index ea06cd5b833..3edd0ff0431 100644 --- a/sbin/isakmpd/sysdep/openbsd/sysdep.c +++ b/sbin/isakmpd/sysdep/openbsd/sysdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sysdep.c,v 1.16 2001/08/22 06:58:00 niklas Exp $ */ +/* $OpenBSD: sysdep.c,v 1.17 2001/08/22 13:06:09 niklas Exp $ */ /* $EOM: sysdep.c,v 1.9 2000/12/04 04:46:35 angelos Exp $ */ /* @@ -34,6 +34,7 @@ * This code was written under funding by Ericsson Radio Systems. */ +#include <sys/errno.h> #include <sys/types.h> #include <sys/socket.h> #include <netinet/in.h> @@ -191,10 +192,11 @@ sysdep_cleartext (int fd, int af) return -1; } if (setsockopt (fd, optsw[sw].ip_proto, optsw[sw].ipcomp_level, - (char *)&level, sizeof level) == -1) + (char *)&level, sizeof level) == -1 + && errno != ENOPROTOOPT) { log_error("sysdep_cleartext: " - "setsockopt (%d, %d, IP_IPCOMP_LEVEL, ...) failed", fd, + "setsockopt (%d, %d, IP_IPCOMP_LEVEL, ...) failed,", fd, optsw[sw].ip_proto); return -1; } |