From ab9108200f4dd4bda1e5e33d22f17cfb53dff243 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Tue, 14 Feb 2012 14:12:11 +0000 Subject: [PATCH] * transport_pipes.cc (transport_layer_pipes::transport_layer_pipes): Always use cygwin_internal to fetch installation key. --- winsup/cygserver/ChangeLog | 5 +++++ winsup/cygserver/transport_pipes.cc | 8 +------- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/winsup/cygserver/ChangeLog b/winsup/cygserver/ChangeLog index 47ad90900..cf198d4b7 100644 --- a/winsup/cygserver/ChangeLog +++ b/winsup/cygserver/ChangeLog @@ -1,3 +1,8 @@ +2012-02-14 Corinna Vinschen + + * transport_pipes.cc (transport_layer_pipes::transport_layer_pipes): + Always use cygwin_internal to fetch installation key. + 2011-10-10 Corinna Vinschen * cygserver.cc (print_usage): Align output to utilities in utils diff --git a/winsup/cygserver/transport_pipes.cc b/winsup/cygserver/transport_pipes.cc index 87a91db42..b44b98427 100644 --- a/winsup/cygserver/transport_pipes.cc +++ b/winsup/cygserver/transport_pipes.cc @@ -1,6 +1,6 @@ /* transport_pipes.cc - Copyright 2001, 2002, 2003, 2004, 2009 Red Hat Inc. + Copyright 2001, 2002, 2003, 2004, 2009, 2012 Red Hat Inc. Written by Robert Collins @@ -84,17 +84,11 @@ transport_layer_pipes::transport_layer_pipes () _is_accepted_endpoint (false), _is_listening_endpoint (false) { -#ifdef __INSIDE_CYGWIN__ - extern WCHAR installation_key_buf[18]; - wcpcpy (wcpcpy (wcpcpy (_pipe_name, PIPE_NAME_PREFIX), installation_key_buf), - PIPE_NAME_SUFFIX); -#else wchar_t cyg_instkey[18]; wchar_t *p = wcpcpy (_pipe_name, PIPE_NAME_PREFIX); if (!cygwin_internal (CW_GET_INSTKEY, cyg_instkey)) wcpcpy (wcpcpy (p, cyg_instkey), PIPE_NAME_SUFFIX); -#endif } transport_layer_pipes::~transport_layer_pipes ()