diff options
| author | Ted Unangst <tedu@cvs.openbsd.org> | 2012-09-06 19:42:00 +0000 |
|---|---|---|
| committer | Ted Unangst <tedu@cvs.openbsd.org> | 2012-09-06 19:42:00 +0000 |
| commit | 4fc57e5204a74f75e9d197c2c43cef54c8dfd5c2 (patch) | |
| tree | b1c6700fcaea19c5f0bf5211bc8c6203fc01faa1 /sbin/ifconfig | |
| parent | ea76ce83dd6d5c9adbd72293f2884e5618793790 (diff) | |
move pkcs5_pbkdf5 function to libutil so everybody can play with it
ok deraadt jsing matthew
Diffstat (limited to 'sbin/ifconfig')
| -rw-r--r-- | sbin/ifconfig/Makefile | 9 | ||||
| -rw-r--r-- | sbin/ifconfig/ifconfig.c | 3 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sbin/ifconfig/Makefile b/sbin/ifconfig/Makefile index a3c3381d6eb..92e9464836d 100644 --- a/sbin/ifconfig/Makefile +++ b/sbin/ifconfig/Makefile @@ -1,11 +1,12 @@ -# $OpenBSD: Makefile,v 1.11 2010/10/18 04:10:56 deraadt Exp $ - -.PATH: ${.CURDIR}/../bioctl +# $OpenBSD: Makefile,v 1.12 2012/09/06 19:41:59 tedu Exp $ PROG= ifconfig -SRCS= ifconfig.c brconfig.c pbkdf2.c +SRCS= ifconfig.c brconfig.c MAN= ifconfig.8 +LDADD= -lutil +DPADD= ${LIBUTIL} + CPPFLAGS+=-DINET6 -I${.CURDIR}/../bioctl .include <bsd.prog.mk> diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c index 587f8a0ca9c..4fcba358fd5 100644 --- a/sbin/ifconfig/ifconfig.c +++ b/sbin/ifconfig/ifconfig.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ifconfig.c,v 1.256 2012/08/21 19:50:39 bluhm Exp $ */ +/* $OpenBSD: ifconfig.c,v 1.257 2012/09/06 19:41:59 tedu Exp $ */ /* $NetBSD: ifconfig.c,v 1.40 1997/10/01 02:19:43 enami Exp $ */ /* @@ -103,7 +103,6 @@ #include <ifaddrs.h> #include "brconfig.h" -#include "pbkdf2.h" #define HWFEATURESBITS \ "\024\1CSUM_IPv4\2CSUM_TCPv4\3CSUM_UDPv4" \ |