diff options
author | Corinna Vinschen <corinna@vinschen.de> | 2012-02-14 18:12:11 +0400 |
---|---|---|
committer | Corinna Vinschen <corinna@vinschen.de> | 2012-02-14 18:12:11 +0400 |
commit | ab9108200f4dd4bda1e5e33d22f17cfb53dff243 (patch) | |
tree | 20ce13c68b75aafb4d23e5a2d9c735fb1da87aee /winsup/cygserver | |
parent | a8c8f19a43534cb9172539fcfcc6e83a39f48b9d (diff) |
* transport_pipes.cc (transport_layer_pipes::transport_layer_pipes):
Always use cygwin_internal to fetch installation key.
Diffstat (limited to 'winsup/cygserver')
-rw-r--r-- | winsup/cygserver/ChangeLog | 5 | ||||
-rw-r--r-- | 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 <corinna@vinschen.de> + + * transport_pipes.cc (transport_layer_pipes::transport_layer_pipes): + Always use cygwin_internal to fetch installation key. + 2011-10-10 Corinna Vinschen <corinna@vinschen.de> * 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 <rbtcollins@hotmail.com> @@ -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 () |