From owner-svn-ports-head@freebsd.org Mon Aug 13 21:37:51 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 62DB2107E64C; Mon, 13 Aug 2018 21:37:51 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 0E32D8E67C; Mon, 13 Aug 2018 21:37:51 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D63D71256E; Mon, 13 Aug 2018 21:37:50 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w7DLbomh099666; Mon, 13 Aug 2018 21:37:50 GMT (envelope-from des@FreeBSD.org) Received: (from des@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w7DLboUH099663; Mon, 13 Aug 2018 21:37:50 GMT (envelope-from des@FreeBSD.org) Message-Id: <201808132137.w7DLboUH099663@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: des set sender to des@FreeBSD.org using -f From: =?UTF-8?Q?Dag-Erling_Sm=c3=b8rgrav?= Date: Mon, 13 Aug 2018 21:37:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r477119 - in head/net/nss_ldap: . files X-SVN-Group: ports-head X-SVN-Commit-Author: des X-SVN-Commit-Paths: in head/net/nss_ldap: . files X-SVN-Commit-Revision: 477119 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Aug 2018 21:37:51 -0000 Author: des Date: Mon Aug 13 21:37:49 2018 New Revision: 477119 URL: https://svnweb.freebsd.org/changeset/ports/477119 Log: Add netgroup support. Submitted by: markj@ Added: head/net/nss_ldap/files/patch-ldap-netgrp.c (contents, props changed) Modified: head/net/nss_ldap/Makefile head/net/nss_ldap/files/bsdnss.c Modified: head/net/nss_ldap/Makefile ============================================================================== --- head/net/nss_ldap/Makefile Mon Aug 13 21:31:22 2018 (r477118) +++ head/net/nss_ldap/Makefile Mon Aug 13 21:37:49 2018 (r477119) @@ -3,7 +3,7 @@ PORTNAME= nss_ldap PORTVERSION= 1.${NSS_LDAP_VERSION} -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= net MASTER_SITES= http://www.padl.com/download/ \ LOCAL/martymac Modified: head/net/nss_ldap/files/bsdnss.c ============================================================================== --- head/net/nss_ldap/files/bsdnss.c Mon Aug 13 21:31:22 2018 (r477118) +++ head/net/nss_ldap/files/bsdnss.c Mon Aug 13 21:37:49 2018 (r477119) @@ -1,7 +1,8 @@ -#include -#include #include #include + +#include +#include #include #include #include @@ -39,6 +40,14 @@ extern enum nss_status _nss_ldap_gethostbyaddr_r (stru struct hostent * result, char *buffer, size_t buflen, int *errnop, int *h_errnop); +struct __netgrent; +extern enum nss_status _nss_ldap_netgrp_load_result(struct __netgrent *result, + char **hostp, char **userp, char **domp); +extern enum nss_status _nss_ldap_getnetgrent_r(struct __netgrent *result, char *buffer, + size_t buflen, int *errnop); +extern enum nss_status _nss_ldap_setnetgrent(char *group, struct __netgrent *result); +extern enum nss_status _nss_ldap_endnetgrent(struct __netgrent *result); + NSS_METHOD_PROTOTYPE(__nss_compat_getgrnam_r); NSS_METHOD_PROTOTYPE(__nss_compat_getgrgid_r); NSS_METHOD_PROTOTYPE(__nss_compat_getgrent_r); @@ -56,6 +65,10 @@ NSS_METHOD_PROTOTYPE(__nss_compat_gethostbyname); NSS_METHOD_PROTOTYPE(__nss_compat_gethostbyname2); NSS_METHOD_PROTOTYPE(__nss_compat_gethostbyaddr); +static NSS_METHOD_PROTOTYPE(__nss_compat_getnetgrent_r); +static NSS_METHOD_PROTOTYPE(__nss_compat_setnetgrent); +static NSS_METHOD_PROTOTYPE(__nss_compat_endnetgrent); + static ns_mtab methods[] = { { NSDB_GROUP, "getgrnam_r", __nss_compat_getgrnam_r, _nss_ldap_getgrnam_r }, { NSDB_GROUP, "getgrgid_r", __nss_compat_getgrgid_r, _nss_ldap_getgrgid_r }, @@ -74,6 +87,10 @@ static ns_mtab methods[] = { { NSDB_HOSTS, "gethostbyaddr", __nss_compat_gethostbyaddr, _nss_ldap_gethostbyaddr_r }, { NSDB_HOSTS, "gethostbyname2", __nss_compat_gethostbyname2, _nss_ldap_gethostbyname2_r }, +{ NSDB_NETGROUP, "getnetgrent_r", __nss_compat_getnetgrent_r, _nss_ldap_getnetgrent_r }, +{ NSDB_NETGROUP, "setnetgrent", __nss_compat_setnetgrent, _nss_ldap_setnetgrent }, +{ NSDB_NETGROUP, "endnetgrent", __nss_compat_endnetgrent, _nss_ldap_endnetgrent }, + { NSDB_GROUP_COMPAT, "getgrnam_r", __nss_compat_getgrnam_r, _nss_ldap_getgrnam_r }, { NSDB_GROUP_COMPAT, "getgrgid_r", __nss_compat_getgrgid_r, _nss_ldap_getgrgid_r }, { NSDB_GROUP_COMPAT, "getgrent_r", __nss_compat_getgrent_r, _nss_ldap_getgrent_r }, @@ -216,4 +233,68 @@ static int __freebsd_getgroupmembership(void *retval, free(tmpgroups); return __nss_compat_result(s, err); +} + +static void *_netgr_result; + +static int +__nss_compat_getnetgrent_r(void *retval, void *mdata, va_list ap) +{ + char **hostp, **userp, **domp; + char *buffer; + size_t bufsize; + enum nss_status rv; + int *errorp; + int ret; + + hostp = va_arg(ap, char **); + userp = va_arg(ap, char **); + domp = va_arg(ap, char **); + buffer = va_arg(ap, char *); + bufsize = va_arg(ap, size_t); + errorp = va_arg(ap, int *); + + do { + *errorp = 0; + rv = _nss_ldap_getnetgrent_r(_netgr_result, buffer, bufsize, + errorp); + ret = __nss_compat_result(rv, *errorp); + if (ret != NS_SUCCESS) + return (ret); + rv = _nss_ldap_netgrp_load_result(_netgr_result, hostp, userp, + domp); + ret = __nss_compat_result(rv, 0); + } while (ret == NS_TRYAGAIN); + + return (NS_SUCCESS); +} + +extern size_t _nss_ldap_netgrent_sz; + +static int +__nss_compat_setnetgrent(void *retval, void *mdata, va_list ap) +{ + const char *netgroup; + int ret; + + netgroup = va_arg(ap, const char *); + + if (_netgr_result != NULL) + free(_netgr_result); + _netgr_result = calloc(1, _nss_ldap_netgrent_sz); + if (_netgr_result == NULL) + return (NS_TRYAGAIN); + + return (_nss_ldap_setnetgrent(netgroup, _netgr_result)); +} + +static int +__nss_compat_endnetgrent(void *retval, void *mdata, va_list ap) +{ + int ret; + + ret = _nss_ldap_endnetgrent(_netgr_result); + free(_netgr_result); + _netgr_result = NULL; + return (ret); } Added: head/net/nss_ldap/files/patch-ldap-netgrp.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/nss_ldap/files/patch-ldap-netgrp.c Mon Aug 13 21:37:49 2018 (r477119) @@ -0,0 +1,31 @@ +--- ldap-netgrp.c.orig 2016-06-05 21:43:56 UTC ++++ ldap-netgrp.c +@@ -161,6 +161,8 @@ struct __netgrent + struct name_list *needed_groups; + }; + ++size_t _nss_ldap_netgrent_sz = sizeof(struct __netgrent); ++ + static char * + strip_whitespace (char *str) + { +@@ -384,6 +386,19 @@ _nss_ldap_getnetgrent_r (struct __netgre + { + return _nss_ldap_parse_netgr (result, buffer, buflen); + } ++ ++enum nss_status ++_nss_ldap_netgrp_load_result (struct __netgrent *result, ++ char **hostp, char **userp, char **domp) ++{ ++ ++ if (result->type == group_val) ++ return NSS_TRYAGAIN; ++ *hostp = result->val.triple.host; ++ *userp = result->val.triple.user; ++ *domp = result->val.triple.domain; ++ return NSS_SUCCESS; ++} + #endif /* HAVE_NSS_H */ + + #if defined(HAVE_NSSWITCH_H) || defined(HAVE_IRS_H)