From owner-svn-ports-head@FreeBSD.ORG Thu Nov 13 21:46:12 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D978550D; Thu, 13 Nov 2014 21:46:12 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id AB907AC4; Thu, 13 Nov 2014 21:46:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sADLkCC7096994; Thu, 13 Nov 2014 21:46:12 GMT (envelope-from des@FreeBSD.org) Received: (from des@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sADLkBZA096990; Thu, 13 Nov 2014 21:46:11 GMT (envelope-from des@FreeBSD.org) Message-Id: <201411132146.sADLkBZA096990@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: des set sender to des@FreeBSD.org using -f From: Dag-Erling Smørgrav Date: Thu, 13 Nov 2014 21:46:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r372540 - in head/net/nss_ldap: . files X-SVN-Group: ports-head 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.18-1 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: Thu, 13 Nov 2014 21:46:13 -0000 Author: des Date: Thu Nov 13 21:46:11 2014 New Revision: 372540 URL: https://svnweb.freebsd.org/changeset/ports/372540 QAT: https://qat.redports.org/buildarchive/r372540/ Log: Add patches for a couple of issues I found while researching #190055: - Use GID_MAX instead of LONG_MAX, they are not the same on 64-bit. - Correctly restore the egid after reading the krb5 credential cache. MFH: 2014Q4 Added: head/net/nss_ldap/files/patch-ldap-grp.c (contents, props changed) Modified: head/net/nss_ldap/Makefile head/net/nss_ldap/files/patch-ldap-init-krb5-cache.c Modified: head/net/nss_ldap/Makefile ============================================================================== --- head/net/nss_ldap/Makefile Thu Nov 13 21:37:05 2014 (r372539) +++ head/net/nss_ldap/Makefile Thu Nov 13 21:46:11 2014 (r372540) @@ -3,7 +3,7 @@ PORTNAME= nss_ldap PORTVERSION= 1.${NSS_LDAP_VERSION} -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= net MASTER_SITES= http://www.padl.com/download/ \ LOCAL/martymac Added: head/net/nss_ldap/files/patch-ldap-grp.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/nss_ldap/files/patch-ldap-grp.c Thu Nov 13 21:46:11 2014 (r372540) @@ -0,0 +1,11 @@ +--- ldap-grp.c.orig ++++ ldap-grp.c +@@ -687,7 +687,7 @@ + gid = strtoul (values[0], (char **) NULL, 10); + ldap_value_free (values); + +- if (gid == LONG_MAX && errno == ERANGE) ++ if (gid == GID_MAX && errno == ERANGE) + { + /* invalid group, skip it */ + return NSS_NOTFOUND; Modified: head/net/nss_ldap/files/patch-ldap-init-krb5-cache.c ============================================================================== --- head/net/nss_ldap/files/patch-ldap-init-krb5-cache.c Thu Nov 13 21:37:05 2014 (r372539) +++ head/net/nss_ldap/files/patch-ldap-init-krb5-cache.c Thu Nov 13 21:46:11 2014 (r372540) @@ -1,5 +1,5 @@ ---- ldap-init-krb5-cache.c.orig 2009-11-06 11:28:08.000000000 +0100 -+++ ldap-init-krb5-cache.c 2014-03-26 21:42:54.575385677 +0100 +--- ldap-init-krb5-cache.c.orig ++++ ldap-init-krb5-cache.c @@ -109,14 +109,14 @@ #include #include @@ -47,6 +47,15 @@ { debug ("==> krb5_cache_kt_is_accessible: kt type = FILE"); uid_t ruid = getuid (); +@@ -243,7 +254,7 @@ + { + setreuid (ruid, euid); + } +- if (rgid != rgid) ++ if (rgid != egid) + { + setregid (rgid, egid); + } @@ -542,7 +553,7 @@ } profile_release (profile);