diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2008-10-09 11:52:54 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2008-10-09 11:52:54 +0000 |
| commit | 2768ae50dd79b1107d6f03a7fd0b4d9fbd83d0ba (patch) | |
| tree | 23e46e4738f95eaa2a6ec97e405d2ceb15bfb612 | |
| parent | c7a8139540a44a3db904a4b93c03aabe0ce9ba27 (diff) | |
| download | cygnal-2768ae50dd79b1107d6f03a7fd0b4d9fbd83d0ba.tar.gz cygnal-2768ae50dd79b1107d6f03a7fd0b4d9fbd83d0ba.tar.bz2 cygnal-2768ae50dd79b1107d6f03a7fd0b4d9fbd83d0ba.zip | |
* grp.cc (pwdgrp::read_group): Generate more speaking group name
if passwd gid exists under different gid in /etc/group.
| -rw-r--r-- | winsup/cygwin/ChangeLog | 5 | ||||
| -rw-r--r-- | winsup/cygwin/grp.cc | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 40346f669..907f46b8c 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,5 +1,10 @@ 2008-10-09 Corinna Vinschen <corinna@vinschen.de> + * 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 <corinna@vinschen.de> + * 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 a007ae657..d9fe4f343 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", |