- (djm) Added getpeereid() replacement. Properly implemented for systems
with SO_PEERCRED support. Faked for systems which lack it.
This commit is contained in:
parent
e1a4981707
commit
771721fa31
|
@ -1,4 +1,6 @@
|
||||||
20020912
|
20020912
|
||||||
|
- (djm) Added getpeereid() replacement. Properly implemented for systems
|
||||||
|
with SO_PEERCRED support. Faked for systems which lack it.
|
||||||
- (djm) OpenBSD CVS Sync
|
- (djm) OpenBSD CVS Sync
|
||||||
- markus@cvs.openbsd.org 2002/09/08 20:24:08
|
- markus@cvs.openbsd.org 2002/09/08 20:24:08
|
||||||
[hostfile.h]
|
[hostfile.h]
|
||||||
|
@ -1646,4 +1648,4 @@
|
||||||
- (stevesk) entropy.c: typo in debug message
|
- (stevesk) entropy.c: typo in debug message
|
||||||
- (djm) ssh-keygen -i needs seeded RNG; report from markus@
|
- (djm) ssh-keygen -i needs seeded RNG; report from markus@
|
||||||
|
|
||||||
$Id: ChangeLog,v 1.2458 2002/09/11 23:54:25 djm Exp $
|
$Id: ChangeLog,v 1.2459 2002/09/12 00:32:59 djm Exp $
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
# $Id: configure.ac,v 1.86 2002/09/04 13:26:30 djm Exp $
|
# $Id: configure.ac,v 1.87 2002/09/12 00:33:00 djm Exp $
|
||||||
|
|
||||||
AC_INIT
|
AC_INIT
|
||||||
AC_CONFIG_SRCDIR([ssh.c])
|
AC_CONFIG_SRCDIR([ssh.c])
|
||||||
|
@ -596,7 +596,7 @@ AC_ARG_WITH(tcp-wrappers,
|
||||||
dnl Checks for library functions.
|
dnl Checks for library functions.
|
||||||
AC_CHECK_FUNCS(arc4random b64_ntop bcopy bindresvport_sa \
|
AC_CHECK_FUNCS(arc4random b64_ntop bcopy bindresvport_sa \
|
||||||
clock fchmod fchown freeaddrinfo futimes gai_strerror \
|
clock fchmod fchown freeaddrinfo futimes gai_strerror \
|
||||||
getaddrinfo getcwd getgrouplist getnameinfo getopt \
|
getaddrinfo getcwd getgrouplist getnameinfo getopt getpeereid\
|
||||||
getrlimit getrusage getttyent glob inet_aton inet_ntoa \
|
getrlimit getrusage getttyent glob inet_aton inet_ntoa \
|
||||||
inet_ntop innetgr login_getcapbool md5_crypt memmove \
|
inet_ntop innetgr login_getcapbool md5_crypt memmove \
|
||||||
mkdtemp mmap ngetaddrinfo openpty ogetaddrinfo readpassphrase \
|
mkdtemp mmap ngetaddrinfo openpty ogetaddrinfo readpassphrase \
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
# $Id: Makefile.in,v 1.22 2002/07/14 20:36:51 tim Exp $
|
# $Id: Makefile.in,v 1.23 2002/09/12 00:33:02 djm Exp $
|
||||||
|
|
||||||
sysconfdir=@sysconfdir@
|
sysconfdir=@sysconfdir@
|
||||||
piddir=@piddir@
|
piddir=@piddir@
|
||||||
|
@ -18,7 +18,7 @@ LDFLAGS=-L. @LDFLAGS@
|
||||||
|
|
||||||
OPENBSD=base64.o bindresvport.o daemon.o dirname.o getcwd.o getgrouplist.o getopt.o glob.o inet_aton.o inet_ntoa.o inet_ntop.o mktemp.o readpassphrase.o realpath.o rresvport.o setenv.o setproctitle.o sigact.o strlcat.o strlcpy.o strmode.o strsep.o
|
OPENBSD=base64.o bindresvport.o daemon.o dirname.o getcwd.o getgrouplist.o getopt.o glob.o inet_aton.o inet_ntoa.o inet_ntop.o mktemp.o readpassphrase.o realpath.o rresvport.o setenv.o setproctitle.o sigact.o strlcat.o strlcpy.o strmode.o strsep.o
|
||||||
|
|
||||||
COMPAT=bsd-arc4random.o bsd-cray.o bsd-cygwin_util.o bsd-misc.o bsd-nextstep.o bsd-snprintf.o bsd-waitpid.o fake-getaddrinfo.o fake-getnameinfo.o xmmap.o
|
COMPAT=bsd-arc4random.o bsd-cray.o bsd-cygwin_util.o bsd-getpeereid.o bsd-misc.o bsd-nextstep.o bsd-snprintf.o bsd-waitpid.o fake-getaddrinfo.o fake-getnameinfo.o xmmap.o
|
||||||
|
|
||||||
PORTS=port-irix.o port-aix.o
|
PORTS=port-irix.o port-aix.o
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,56 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2002 Damien Miller. 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 ``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 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 "includes.h"
|
||||||
|
|
||||||
|
RCSID("$Id: bsd-getpeereid.c,v 1.1 2002/09/12 00:33:02 djm Exp $");
|
||||||
|
|
||||||
|
#if !defined(HAVE_GETPEEREID)
|
||||||
|
|
||||||
|
#if defined(SO_PEERCRED)
|
||||||
|
int
|
||||||
|
getpeereid(int s, uid_t *euid, gid_t *gid)
|
||||||
|
{
|
||||||
|
struct ucred cred;
|
||||||
|
size_t len = sizeof(cred);
|
||||||
|
|
||||||
|
if (getsockopt(s, SOL_SOCKET, SO_PEERCRED, &cred, &len) < 0)
|
||||||
|
return (-1);
|
||||||
|
*euid = cred.uid;
|
||||||
|
*gid = cred.gid;
|
||||||
|
|
||||||
|
return (0);
|
||||||
|
}
|
||||||
|
#else
|
||||||
|
int
|
||||||
|
getpeereid(int s, uid_t *euid, gid_t *gid)
|
||||||
|
{
|
||||||
|
*euid = geteuid();
|
||||||
|
*gid = getgid();
|
||||||
|
|
||||||
|
return (0);
|
||||||
|
}
|
||||||
|
#endif /* defined(SO_PEERCRED) */
|
||||||
|
|
||||||
|
#endif /* !defined(HAVE_GETPEEREID) */
|
|
@ -0,0 +1,14 @@
|
||||||
|
/* $Id: bsd-getpeereid.h,v 1.1 2002/09/12 00:33:02 djm Exp $ */
|
||||||
|
|
||||||
|
#ifndef _BSD_GETPEEREID_H
|
||||||
|
#define _BSD_GETPEEREID_H
|
||||||
|
|
||||||
|
#include "config.h"
|
||||||
|
|
||||||
|
#include <sys/types.h> /* For uid_t, gid_t */
|
||||||
|
|
||||||
|
#ifndef HAVE_GETPEEREID
|
||||||
|
int getpeereid(int , uid_t *, gid_t *);
|
||||||
|
#endif /* HAVE_GETPEEREID */
|
||||||
|
|
||||||
|
#endif /* _BSD_GETPEEREID_H */
|
|
@ -1,4 +1,4 @@
|
||||||
/* $Id: openbsd-compat.h,v 1.16 2002/02/19 20:27:57 mouring Exp $ */
|
/* $Id: openbsd-compat.h,v 1.17 2002/09/12 00:33:02 djm Exp $ */
|
||||||
|
|
||||||
#ifndef _OPENBSD_H
|
#ifndef _OPENBSD_H
|
||||||
#define _OPENBSD_H
|
#define _OPENBSD_H
|
||||||
|
@ -29,6 +29,7 @@
|
||||||
|
|
||||||
/* Home grown routines */
|
/* Home grown routines */
|
||||||
#include "bsd-arc4random.h"
|
#include "bsd-arc4random.h"
|
||||||
|
#include "bsd-getpeereid.h"
|
||||||
#include "bsd-misc.h"
|
#include "bsd-misc.h"
|
||||||
#include "bsd-snprintf.h"
|
#include "bsd-snprintf.h"
|
||||||
#include "bsd-waitpid.h"
|
#include "bsd-waitpid.h"
|
||||||
|
|
Loading…
Reference in New Issue