From 32c803daa29eaa1b0a03ec844fd36a22e8898629 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Fri, 2 Aug 2002 11:14:35 +0000 Subject: [PATCH] * mkgroup.c (main): Don't print an entry for "Everyone". * mkpasswd.c (print_special): Set pw_gid to 544 for SYSTEM user. (main): Don't print an entry for "Everyone". --- winsup/utils/ChangeLog | 6 ++++++ winsup/utils/mkgroup.c | 3 +++ winsup/utils/mkpasswd.c | 10 ++++++---- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog index 1af2b10f8..0833bc389 100644 --- a/winsup/utils/ChangeLog +++ b/winsup/utils/ChangeLog @@ -1,3 +1,9 @@ +2002-08-02 Corinna Vinschen + + * mkgroup.c (main): Don't print an entry for "Everyone". + * mkpasswd.c (print_special): Set pw_gid to 544 for SYSTEM user. + (main): Don't print an entry for "Everyone". + 2002-07-06 Christopher Faylor * configure.in: Check for libiconv.a. diff --git a/winsup/utils/mkgroup.c b/winsup/utils/mkgroup.c index 666fdec7e..1f637890d 100644 --- a/winsup/utils/mkgroup.c +++ b/winsup/utils/mkgroup.c @@ -567,11 +567,14 @@ main (int argc, char **argv) return 1; } +#if 0 /* * Get `Everyone' group */ print_special (print_sids, &sid_world_auth, 1, SECURITY_WORLD_RID, 0, 0, 0, 0, 0, 0, 0); +#endif + /* * Get `system' group */ diff --git a/winsup/utils/mkpasswd.c b/winsup/utils/mkpasswd.c index 63a81aabd..b324cb6ba 100644 --- a/winsup/utils/mkpasswd.c +++ b/winsup/utils/mkpasswd.c @@ -386,7 +386,7 @@ print_special (int print_sids, else rid = sub1; printf ("%s:*:%lu:%lu:%s%s::\n", - name, rid, rid, + name, rid, rid == 18 ? 544 : rid, /* SYSTEM hack */ print_sids ? "," : "", print_sids ? put_sid (sid) : ""); } @@ -573,13 +573,15 @@ main (int argc, char **argv) return 1; } - /* - * Get `Everyone' group - */ if (disp_username == NULL) { +#if 0 + /* + * Get `Everyone' group + */ print_special (print_sids, &sid_world_auth, 1, SECURITY_WORLD_RID, 0, 0, 0, 0, 0, 0, 0); +#endif /* * Get `system' group */