diff options
| author |   reyk <reyk@openbsd.org> | 2018-06-13 14:54:42 +0000 |
|---|---|---|
| committer | reyk <reyk@openbsd.org> | 2018-06-13 14:54:42 +0000 |
| commit | 9b203ab7c3f4e076af3bee6e51616885cc6063c0 (patch) | |
| tree | 9cedbfac6686f9a89917e4c122a779e5048444be | |
| parent | Make octeon kernels compile with DEBUG. (diff) | |
| download | wireguard-openbsd-9b203ab7c3f4e076af3bee6e51616885cc6063c0.tar.xz wireguard-openbsd-9b203ab7c3f4e076af3bee6e51616885cc6063c0.zip | |
Remove #ifdef PASSWD, it was always enabled and is a leftover from krb5 days.
No other uses of -DPASSWD were found in the tree.
OK deraadt@ tb@ brynet@
| -rw-r--r-- | libexec/login_passwd/Makefile | 4 | ||||
| -rw-r--r-- | libexec/login_passwd/common.h | 4 | ||||
| -rw-r--r-- | libexec/login_passwd/login.c | 8 |
3 files changed, 5 insertions, 11 deletions
diff --git a/libexec/login_passwd/Makefile b/libexec/login_passwd/Makefile index 6c03ecf9ade..c60a765c58f 100644 --- a/libexec/login_passwd/Makefile +++ b/libexec/login_passwd/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.6 2015/10/24 13:53:20 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.7 2018/06/13 14:54:42 reyk Exp $ PROG= login_passwd MAN= login_passwd.8 SRCS= login.c login_passwd.c DPADD= ${LIBUTIL} LDADD= -lutil -CFLAGS+=-Wall -DPASSWD +CFLAGS+=-Wall BINOWN= root BINGRP= auth diff --git a/libexec/login_passwd/common.h b/libexec/login_passwd/common.h index fadfe211d74..1dd35071de1 100644 --- a/libexec/login_passwd/common.h +++ b/libexec/login_passwd/common.h @@ -1,4 +1,4 @@ -/* $OpenBSD: common.h,v 1.8 2016/09/03 10:50:16 gsoares Exp $ */ +/* $OpenBSD: common.h,v 1.9 2018/06/13 14:54:42 reyk Exp $ */ /*- * Copyright (c) 2001 Hans Insulander <hin@openbsd.org>. * All rights reserved. @@ -54,8 +54,6 @@ extern FILE *back; -#ifdef PASSWD int pwd_login(char *, char *, char *, int, char *); -#endif #endif /* !_COMMON_H_ */ diff --git a/libexec/login_passwd/login.c b/libexec/login_passwd/login.c index 9782ae0be5d..16499c6450e 100644 --- a/libexec/login_passwd/login.c +++ b/libexec/login_passwd/login.c @@ -1,4 +1,4 @@ -/* $OpenBSD: login.c,v 1.16 2016/09/03 11:24:40 tedu Exp $ */ +/* $OpenBSD: login.c,v 1.17 2018/06/13 14:54:42 reyk Exp $ */ /*- * Copyright (c) 1995 Berkeley Software Design, Inc. All rights reserved. @@ -148,11 +148,7 @@ main(int argc, char **argv) break; } - ret = AUTH_FAILED; -#ifdef PASSWD - if (ret != AUTH_OK) - ret = pwd_login(username, password, wheel, lastchance, class); -#endif + ret = pwd_login(username, password, wheel, lastchance, class); if (password != NULL) explicit_bzero(password, strlen(password)); |