[Glibc-bsd-commits] r5266 - in trunk/freebsd-glue: debian src/freebsd-glue

[rmh at alioth.debian.org]

Author: rmh
Date: 2013-12-28 23:57:49 +0000 (Sat, 28 Dec 2013)
New Revision: 5266

Removed:
   trunk/freebsd-glue/src/freebsd-glue/getpeereid.c
Modified:
   trunk/freebsd-glue/debian/changelog
   trunk/freebsd-glue/debian/copyright
   trunk/freebsd-glue/debian/libfreebsd-glue-0.symbols
   trunk/freebsd-glue/src/freebsd-glue/Makefile
Log:
Remove getpeereid(), use version from libbsd instead.

Modified: trunk/freebsd-glue/debian/changelog
===================================================================
--- trunk/freebsd-glue/debian/changelog	2013-12-28 23:33:42 UTC (rev 5265)
+++ trunk/freebsd-glue/debian/changelog	2013-12-28 23:57:49 UTC (rev 5266)
@@ -1,3 +1,9 @@
+freebsd-glue (0.2.7) unstable; urgency=low
+
+  * Remove getpeereid(), use version from libbsd instead.
+
+ -- Robert Millan <rmh at debian.org>  Sun, 29 Dec 2013 00:53:25 +0100
+
 freebsd-glue (0.2.6) unstable; urgency=low
 
   * Use -O2 for normal build and -Os for udeb build.

Modified: trunk/freebsd-glue/debian/copyright
===================================================================
--- trunk/freebsd-glue/debian/copyright	2013-12-28 23:33:42 UTC (rev 5265)
+++ trunk/freebsd-glue/debian/copyright	2013-12-28 23:57:49 UTC (rev 5266)
@@ -43,10 +43,6 @@
 Copyright: 1990, 1993, 2001, Mike Barcroft <mike at FreeBSD.org>
 License: BSD (3 clause)
 
-Files: src/freebsd-glue/getpeereid.c
-Copyright: 2001, Dima Dorfman
-License: BSD (2 clause)
-
 Files: include/sys/param.h
 Copyright: 1982, 1986, 1989, 1993
   UNIX System Laboratories, Inc

Modified: trunk/freebsd-glue/debian/libfreebsd-glue-0.symbols
===================================================================
--- trunk/freebsd-glue/debian/libfreebsd-glue-0.symbols	2013-12-28 23:33:42 UTC (rev 5265)
+++ trunk/freebsd-glue/debian/libfreebsd-glue-0.symbols	2013-12-28 23:57:49 UTC (rev 5266)
@@ -25,7 +25,6 @@
  getfstab at Base 0.1.15
  (arch=kfreebsd-any)getloginclass at Base 0.1.15
  getosreldate at Base 0.1.15
- (arch=kfreebsd-any)getpeereid at Base 0.2.6
  (arch=kfreebsd-any)link_addr at Base 0.1.15
  (arch=kfreebsd-any)link_ntoa at Base 0.1.15
  (arch=kfreebsd-any)mac_free at Base 0.1.15

Modified: trunk/freebsd-glue/src/freebsd-glue/Makefile
===================================================================
--- trunk/freebsd-glue/src/freebsd-glue/Makefile	2013-12-28 23:33:42 UTC (rev 5265)
+++ trunk/freebsd-glue/src/freebsd-glue/Makefile	2013-12-28 23:57:49 UTC (rev 5266)
@@ -19,7 +19,6 @@
 	cpuset.c \
 	disklabel.c \
 	getbootfile.c \
-	getpeereid.c \
 	linkaddr.c \
 	login_class.c \
 	mac.c \

Deleted: trunk/freebsd-glue/src/freebsd-glue/getpeereid.c
===================================================================
--- trunk/freebsd-glue/src/freebsd-glue/getpeereid.c	2013-12-28 23:33:42 UTC (rev 5265)
+++ trunk/freebsd-glue/src/freebsd-glue/getpeereid.c	2013-12-28 23:57:49 UTC (rev 5266)
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2001 Dima Dorfman.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <sys/ucred.h>
-#include <sys/un.h>
-
-#include <errno.h>
-#include <unistd.h>
-
-int
-getpeereid(int s, uid_t *euid, gid_t *egid)
-{
-	struct xucred xuc;
-	socklen_t xuclen;
-	int error;
-
-	xuclen = sizeof(xuc);
-	error = getsockopt(s, 0, LOCAL_PEERCRED, &xuc, &xuclen);
-	if (error != 0)
-		return (error);
-	if (xuc.cr_version != XUCRED_VERSION)
-		return (EINVAL);
-	*euid = xuc.cr_uid;
-	*egid = xuc.cr_gid;
-	return (0);
-}