From: Stefan Metzmacher Date: Thu, 1 Jul 2021 10:08:16 +0000 (+0200) Subject: nsswitch: explicitly mark nss_module_register() _PUBLIC_ on FreeBSD X-Git-Tag: tdb-1.4.6~502 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fa98a44cb4d94c6a290deb931b260e411364314d;p=thirdparty%2Fsamba.git nsswitch: explicitly mark nss_module_register() _PUBLIC_ on FreeBSD This is the only symbol which is used via dlopen()/dlsym() and needs to be exported, in future we'll do hide all other symbols. BUG: https://bugzilla.samba.org/show_bug.cgi?id=14780 Signed-off-by: Stefan Metzmacher Reviewed-by: Andrew Bartlett Reviewed-by: Andreas Schneider --- diff --git a/nsswitch/winbind_nss_freebsd.c b/nsswitch/winbind_nss_freebsd.c index f424adbe9e7..d3f54894dc2 100644 --- a/nsswitch/winbind_nss_freebsd.c +++ b/nsswitch/winbind_nss_freebsd.c @@ -39,7 +39,7 @@ NSS_METHOD_PROTOTYPE(__nss_compat_setpwent); NSS_METHOD_PROTOTYPE(__nss_compat_endpwent); NSS_METHOD_PROTOTYPE(__nss_compat_endpwent); -NSS_METHOD_PROTOTYPE(__freebsd_getgroupmembership); +static NSS_METHOD_PROTOTYPE(__freebsd_getgroupmembership); static ns_mtab methods[] = { { NSDB_GROUP, "getgrnam_r", __nss_compat_getgrnam_r, _nss_winbind_getgrnam_r }, @@ -85,7 +85,7 @@ gr_addgid(gid_t gid, gid_t *groups, int maxgrp, int *grpcnt) defaultsrc, uname, agroup, groups, maxgrp, grpcnt); */ -int +static int __freebsd_getgroupmembership(void *retval, void *mdata, va_list ap) { const char *uname = va_arg(ap, const char *); @@ -127,7 +127,7 @@ __freebsd_getgroupmembership(void *retval, void *mdata, va_list ap) return NSS_STATUS_NOTFOUND; } -ns_mtab * +_PUBLIC_ ns_mtab * nss_module_register(const char *source, unsigned int *mtabsize, nss_module_unregister_fn *unreg) { diff --git a/nsswitch/wins_freebsd.c b/nsswitch/wins_freebsd.c index c1845d2a173..8637ce615f8 100644 --- a/nsswitch/wins_freebsd.c +++ b/nsswitch/wins_freebsd.c @@ -26,7 +26,7 @@ extern enum nss_status _nss_wins_gethostbyname2_r(const char *name, int af, stru ns_mtab *nss_module_register(const char *source, unsigned int *, nss_module_unregister_fn *); -NSS_METHOD_PROTOTYPE(__nss_wins_freebsd_gethostbyname2_r); +static NSS_METHOD_PROTOTYPE(__nss_wins_freebsd_gethostbyname2_r); static ns_mtab methods[] = { @@ -43,7 +43,7 @@ static ns_mtab methods[] = { NSDB_HOSTS, "getnetbyaddr", NULL, NULL } }; -int +static int __nss_wins_freebsd_gethostbyname2_r(void *retval, void *mdata, va_list ap) { int (*fn)(const char *, int, struct hostent *, char *, size_t, int *); @@ -71,7 +71,7 @@ __nss_wins_freebsd_gethostbyname2_r(void *retval, void *mdata, va_list ap) return (status); } -ns_mtab * +_PUBLIC_ ns_mtab * nss_module_register(const char *source __unused, unsigned int *mtabsize, nss_module_unregister_fn *unreg) {