openbsd/src
1
0
Fork 0
mirror of https://github.com/openbsd/src.git synced 2026-05-01 17:46:35 +00:00
Code Issues Projects Releases Wiki Activity

Use the (no YP, non-threaded) cleaned up copy of getpwent.c placed into

Browse Source 
usr.bin/chpass instead of reaching around into libc and using crazy cpp
options.
In the near future the libc version will have more substantial changes
(intersecting with pledge and unveil) which are much more difficult to
manage using cpp features, so we stop this reacharound into libc subtree.
This commit is contained in:
deraadt
2026-03-07 18:20:25 +00:00
parent 17722fb608
commit 6317b71d10
2 changed files with 4 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
usr.bin/chpass/Makefile
View File

@@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.16 2024/01/22 21:07:10 deraadt Exp $
# $OpenBSD: Makefile,v 1.17 2026/03/07 18:20:25 deraadt Exp $
.include <bsd.own.mk>
@@ -6,14 +6,9 @@ PROG= chpass
SRCS= chpass.c edit.c field.c table.c util.c getpwent.c
BINOWN= root
BINMODE=4555
.PATH: ${.CURDIR}/../../lib/libc/gen
LINKS= ${BINDIR}/chpass ${BINDIR}/chfn ${BINDIR}/chpass ${BINDIR}/chsh
CFLAGS+=-I${.CURDIR}/../../lib/libc/include -DFORCE_DBOPEN
CFLAGS+=-DFORCE_DBOPEN
DPADD+= ${LIBUTIL}
LDADD+= -lutil
.include <bsd.prog.mk>
getpwent.o: getpwent.c
${COMPILE.c} -UYP -D'DEF_WEAK(x)=asm("")' \
${.CURDIR}/../../lib/libc/gen/getpwent.c

10
usr.bin/passwd/Makefile
View File

@@ -1,22 +1,16 @@
# $OpenBSD: Makefile,v 1.42 2024/01/22 21:07:10 deraadt Exp $
# $OpenBSD: Makefile,v 1.43 2026/03/07 18:20:26 deraadt Exp $
.include <bsd.own.mk>
PROG= passwd
SRCS= local_passwd.c passwd.c getpwent.c \
pwd_check.c
.PATH: ${.CURDIR}/../../lib/libc/gen
.PATH: ${.CURDIR}/../chpass
DPADD+= ${LIBRPCSVC} ${LIBUTIL}
LDADD+= -lrpcsvc -lutil
CFLAGS+= -I${.CURDIR} -DFORCE_DBOPEN
CFLAGS+=-I${.CURDIR}/../../lib/libc/include
BINMODE=4555
BINOWN=root
getpwent.o: getpwent.c
${COMPILE.c} -UYP -D'DEF_WEAK(x)=asm("")' \
${.CURDIR}/../../lib/libc/gen/getpwent.c
.include <bsd.prog.mk>