diff options
| author |   mpi <mpi@openbsd.org> | 2016-01-03 10:33:27 +0000 |
|---|---|---|
| committer | mpi <mpi@openbsd.org> | 2016-01-03 10:33:27 +0000 |
| commit | 257cba2189958ca5a3c38a359ad7cea7cec00543 (patch) | |
| tree | 9afa599dc57df651a480d4e64b18f81332c226c1 | |
| parent | enable pchtemp(4) on i386. (diff) | |
| download | wireguard-openbsd-257cba2189958ca5a3c38a359ad7cea7cec00543.tar.xz wireguard-openbsd-257cba2189958ca5a3c38a359ad7cea7cec00543.zip | |
Remove obsolete and undocumented "-carpdev" option, from Fabian Raetz.
ok benno@, claudio@
| -rw-r--r-- | sbin/ifconfig/ifconfig.c | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c index 103a57b4942..5a989afe450 100644 --- a/sbin/ifconfig/ifconfig.c +++ b/sbin/ifconfig/ifconfig.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ifconfig.c,v 1.312 2016/01/01 12:50:54 jung Exp $ */ +/* $OpenBSD: ifconfig.c,v 1.313 2016/01/03 10:33:27 mpi Exp $ */ /* $NetBSD: ifconfig.c,v 1.40 1997/10/01 02:19:43 enami Exp $ */ /* @@ -236,7 +236,6 @@ void setcarp_passwd(const char *, int); void setcarp_vhid(const char *, int); void setcarp_state(const char *, int); void setcarpdev(const char *, int); -void unsetcarpdev(const char *, int); void setcarp_nodes(const char *, int); void setcarp_balancing(const char *, int); void setpfsync_syncdev(const char *, int); @@ -395,7 +394,6 @@ const struct cmd { { "carpdev", NEXTARG, 0, setcarpdev }, { "carpnodes", NEXTARG, 0, setcarp_nodes }, { "balancing", NEXTARG, 0, setcarp_balancing }, - { "-carpdev", 1, 0, unsetcarpdev }, { "syncdev", NEXTARG, 0, setpfsync_syncdev }, { "-syncdev", 1, 0, unsetpfsync_syncdev }, { "syncif", NEXTARG, 0, setpfsync_syncdev }, @@ -4013,23 +4011,6 @@ setcarpdev(const char *val, int d) } void -unsetcarpdev(const char *val, int d) -{ - struct carpreq carpr; - - bzero(&carpr, sizeof(struct carpreq)); - ifr.ifr_data = (caddr_t)&carpr; - - if (ioctl(s, SIOCGVH, (caddr_t)&ifr) == -1) - err(1, "SIOCGVH"); - - bzero(&carpr.carpr_carpdev, sizeof(carpr.carpr_carpdev)); - - if (ioctl(s, SIOCSVH, (caddr_t)&ifr) == -1) - err(1, "SIOCSVH"); -} - -void setcarp_nodes(const char *val, int d) { char *optlist, *str; |