tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- (stevesk) [monitor_fdpass.c] fatal() for UsePrivilegeSeparation=yes 

and no fd passing support.
This commit is contained in:
Kevin Steves 2002-04-07 16:39:12 +00:00
parent a44e0351ee
commit c3c825575c
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,6 +1,8 @@
20020407 20020407
- (stevesk) HAVE_CONTROL_IN_MSGHDR; not used right now. - (stevesk) HAVE_CONTROL_IN_MSGHDR; not used right now.
Future: we may want to test if fd passing works correctly. Future: we may want to test if fd passing works correctly.
- (stevesk) [monitor_fdpass.c] fatal() for UsePrivilegeSeparation=yes
and no fd passing support.
20020406 20020406
- (djm) Typo in Suse SPEC file. Fix from Carsten Grohmann - (djm) Typo in Suse SPEC file. Fix from Carsten Grohmann
@ -8191,4 +8193,4 @@
- Wrote replacements for strlcpy and mkdtemp - Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1 - Released 1.0pre1
$Id: ChangeLog,v 1.2034 2002/04/07 16:18:03 stevesk Exp $ $Id: ChangeLog,v 1.2035 2002/04/07 16:39:12 stevesk Exp $

10
monitor_fdpass.c
View File

@ -34,6 +34,7 @@ RCSID("$OpenBSD: monitor_fdpass.c,v 1.2 2002/03/24 17:53:16 stevesk Exp $");
void void
mm_send_fd(int socket, int fd) mm_send_fd(int socket, int fd)
{ {
#if defined(HAVE_ACCRIGHTS_IN_MSGHDR) || defined(HAVE_CONTROL_IN_MSGHDR)
struct msghdr msg; struct msghdr msg;
struct iovec vec; struct iovec vec;
char ch = '\0'; char ch = '\0';
@ -68,11 +69,16 @@ mm_send_fd(int socket, int fd)
if (n != 1) if (n != 1)
fatal("%s: sendmsg: expected sent 1 got %d", fatal("%s: sendmsg: expected sent 1 got %d",
__FUNCTION__, n); __FUNCTION__, n);
#else
fatal("%s: UsePrivilegeSeparation=yes not supported",
__FUNCTION__);
#endif
} }
int int
mm_receive_fd(int socket) mm_receive_fd(int socket)
{ {
#if defined(HAVE_ACCRIGHTS_IN_MSGHDR) || defined(HAVE_CONTROL_IN_MSGHDR)
struct msghdr msg; struct msghdr msg;
struct iovec vec; struct iovec vec;
char ch; char ch;
@ -112,4 +118,8 @@ mm_receive_fd(int socket)
fd = (*(int *)CMSG_DATA(cmsg)); fd = (*(int *)CMSG_DATA(cmsg));
#endif #endif
return fd; return fd;
#else
fatal("%s: UsePrivilegeSeparation=yes not supported",
__FUNCTION__);
#endif
} }