diff options
| author |   deraadt <deraadt@openbsd.org> | 2015-11-26 19:00:40 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2015-11-26 19:00:40 +0000 |
| commit | e398de5919e3d10e969b16b140e19ea2e1dbbbae (patch) | |
| tree | c25e2d5c9f27c4e3e711b83d8466c2540992c5d9 /usr.sbin/rpc.bootparamd | |
| parent | sync (diff) | |
| download | wireguard-openbsd-e398de5919e3d10e969b16b140e19ea2e1dbbbae.tar.xz wireguard-openbsd-e398de5919e3d10e969b16b140e19ea2e1dbbbae.zip | |
Delete YP lookup code; user base of 0.
Diffstat (limited to 'usr.sbin/rpc.bootparamd')
| -rw-r--r-- | usr.sbin/rpc.bootparamd/Makefile | 6 | ||||
| -rw-r--r-- | usr.sbin/rpc.bootparamd/bootparamd.c | 22 |
2 files changed, 2 insertions, 26 deletions
diff --git a/usr.sbin/rpc.bootparamd/Makefile b/usr.sbin/rpc.bootparamd/Makefile index 276a04e6656..159241134d9 100644 --- a/usr.sbin/rpc.bootparamd/Makefile +++ b/usr.sbin/rpc.bootparamd/Makefile @@ -1,11 +1,7 @@ -# $OpenBSD: Makefile,v 1.11 2007/03/24 05:36:54 deraadt Exp $ +# $OpenBSD: Makefile,v 1.12 2015/11/26 19:00:40 deraadt Exp $ .include <bsd.own.mk> -.if (${YP:L} == "yes") -CFLAGS+=-DYP -.endif - PROG= rpc.bootparamd SRCS= bootparamd.c bootparam_prot_svc.c MAN= bootparams.5 rpc.bootparamd.8 diff --git a/usr.sbin/rpc.bootparamd/bootparamd.c b/usr.sbin/rpc.bootparamd/bootparamd.c index 73221841913..b96b987337c 100644 --- a/usr.sbin/rpc.bootparamd/bootparamd.c +++ b/usr.sbin/rpc.bootparamd/bootparamd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bootparamd.c,v 1.19 2015/11/20 17:49:59 deraadt Exp $ */ +/* $OpenBSD: bootparamd.c,v 1.20 2015/11/26 19:00:40 deraadt Exp $ */ /* * This code is not copyright, and is placed in the public domain. @@ -6,7 +6,6 @@ * suggestions + bug fixes to Klas Heggemann <klas@nada.kth.se> * * Various small changes by Theo de Raadt <deraadt@fsa.ca> - * Parser rewritten (adding YP support) by Roland McGrath <roland@frob.com> */ #include <sys/types.h> @@ -270,10 +269,6 @@ lookup_bootparam(char *client, char *client_canonical, char *id, char **server, char **path) { FILE *f; -#ifdef YP - static char *ypbuf = NULL; - static int ypbuflen = 0; -#endif static char buf[BUFSIZ]; char *bp, *word = NULL; size_t idlen = id == NULL ? 0 : strlen(id); @@ -301,21 +296,6 @@ lookup_bootparam(char *client, char *client_canonical, char *id, continue; if ((word = strsep(&bp, " \t\n")) == NULL) continue; -#ifdef YP - /* A + in the file means try YP now */ - if (!strcmp(word, "+")) { - char *ypdom; - - if (yp_get_default_domain(&ypdom) || - yp_match(ypdom, "bootparams", client, - strlen(client), &ypbuf, &ypbuflen)) - continue; - bp = ypbuf; - word = client; - contin *= -1; - break; - } -#endif /* See if this line's client is the one we are * looking for */ if (strcasecmp(word, client) != 0) { |