From 757e8bdbeaa7c5f83ae28a2dd314ea5cb94e8ba0 Mon Sep 17 00:00:00 2001 From: Ian Lepore Date: Fri, 27 Jul 2018 19:47:42 +0000 Subject: [PATCH] Stop exporting __pw_scan and __pw_initpwd as freebsd-private libc functions for use in libutil, and instead compile the small amount of common code directly into libutil with a .PATH reachover. Discussed with: kib@ --- lib/libc/gen/Symbol.map | 2 -- lib/libutil/Makefile | 6 ++++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/libc/gen/Symbol.map b/lib/libc/gen/Symbol.map index 40cdc9312c4d..cf28dfd49814 100644 --- a/lib/libc/gen/Symbol.map +++ b/lib/libc/gen/Symbol.map @@ -510,8 +510,6 @@ FBSDprivate_1.0 { __opendir2; __pause; _pause; - __pw_initpwd; /* Used by (at least) libutil */ - __pw_scan; /* Used by (at least) libutil */ __raise; _raise; __sleep; diff --git a/lib/libutil/Makefile b/lib/libutil/Makefile index 68f57e4cff2e..972fc65c53e5 100644 --- a/lib/libutil/Makefile +++ b/lib/libutil/Makefile @@ -6,6 +6,8 @@ SHLIBDIR?= /lib .include +.PATH: ${SRCTOP}/lib/libc/gen # for pw_scan.c + LIB= util SHLIB_MAJOR= 9 @@ -15,8 +17,8 @@ SRCS= _secure_path.c auth.c expand_number.c flopen.c fparseln.c gr_util.c \ kinfo_getvmobject.c kld.c \ login_auth.c login_cap.c \ login_class.c login_crypt.c login_ok.c login_times.c login_tty.c \ - pidfile.c property.c pty.c pw_util.c quotafile.c realhostname.c \ - stub.c trimdomain.c uucplock.c + pidfile.c property.c pty.c pw_scan.c pw_util.c quotafile.c \ + realhostname.c stub.c trimdomain.c uucplock.c INCS= libutil.h login_cap.h CFLAGS+= -DNO__SCCSID