[src/netbsd-2-1]: src/dist/ntp/ntpd Pull up following revision(s) (requested ...

[tron <tron%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/9eb6c65839ce
branches:  netbsd-2-1
changeset: 564112:9eb6c65839ce
user:      tron <tron%NetBSD.org@localhost>
date:      Mon Oct 31 21:00:45 2005 +0000

description:
Pull up following revision(s) (requested by dan in ticket #5958):
        dist/ntp/ntpd/ntpd.c: revision 1.8
Use group-id from ``gr'' and not ``pw''.
Fixes security issue addressed by CAN-2005-2496.
Thanks to Adrian Portelli for notifying me about this.

diffstat:

 dist/ntp/ntpd/ntpd.c |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (18 lines):

diff -r ffd734f16f74 -r 9eb6c65839ce dist/ntp/ntpd/ntpd.c
--- a/dist/ntp/ntpd/ntpd.c      Mon Oct 31 21:00:23 2005 +0000
+++ b/dist/ntp/ntpd/ntpd.c      Mon Oct 31 21:00:45 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ntpd.c,v 1.5 2003/12/04 16:23:37 drochner Exp $        */
+/*     $NetBSD: ntpd.c,v 1.5.6.1 2005/10/31 21:00:45 tron Exp $        */
 
 /*
  * ntpd.c - main program for the fixed point NTP daemon
@@ -865,7 +865,7 @@
                } else {
 getgroup:      
                        if ((gr = getgrnam(group)) != NULL) {
-                               sw_gid = pw->pw_gid;
+                               sw_gid = gr->gr_gid;
                        } else {
                                errno = 0;
                                msyslog(LOG_ERR, "Cannot find group `%s'", group);