* 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

@@ -1,3 +1,9 @@
+2002-08-02  Corinna Vinschen  <corinna@vinschen.de>
+
+	* 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  <cgf@redhat.com>
 
 	* configure.in: Check for libiconv.a.

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
   */

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;
     }
 
+  if (disp_username == NULL)
+    {
+#if 0
       /*
        * Get `Everyone' group
       */
-  if (disp_username == NULL)
-    {
       print_special (print_sids, &sid_world_auth, 1, SECURITY_WORLD_RID,
 		     0, 0, 0, 0, 0, 0, 0);
+#endif
       /*
        * Get `system' group
       */