From 458162143a1270f91c1d8ac4e9008deb24b50ac6 Mon Sep 17 00:00:00 2001 From: corinna Date: Thu, 9 Oct 2008 11:52:54 +0000 Subject: [PATCH] * grp.cc (pwdgrp::read_group): Generate more speaking group name if passwd gid exists under different gid in /etc/group. --- winsup/cygwin/ChangeLog | 5 +++++ winsup/cygwin/grp.cc | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 40346f669b..907f46b8c8 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,5 +1,10 @@ 2008-10-09 Corinna Vinschen + * grp.cc (pwdgrp::read_group): Generate more speaking group name + if passwd gid exists under different gid in /etc/group. + +2008-10-09 Corinna Vinschen + * path.cc (path_conv::is_binary): Always check for GetBinaryType. * syscalls.cc (rename): Fix test for just changing case of name on case insensitive filesystems. diff --git a/winsup/cygwin/grp.cc b/winsup/cygwin/grp.cc index a007ae6577..d9fe4f3435 100644 --- a/winsup/cygwin/grp.cc +++ b/winsup/cygwin/grp.cc @@ -84,7 +84,8 @@ pwdgrp::read_group () cygheap->user.groups.pgsid.string (strbuf); if ((gr = internal_getgrsid (cygheap->user.groups.pgsid))) - strlcpy (group_name, gr->gr_name, sizeof (group_name)); + snprintf (group_name, sizeof (group_name), + "passwd/group_GID_clash(%lu/%lu)", myself->gid, gr->gr_gid); if (myself->uid == UNKNOWN_UID) strcpy (group_name, "mkpasswd"); /* Feedback... */ snprintf (linebuf, sizeof (linebuf), "%s:%s:%lu:%s", -- 2.11.0