From dirkx@foem.leiden.webweaving.org  Sat Jun 22 12:42:55 2002
Return-Path: <dirkx@foem.leiden.webweaving.org>
Received: from foem.leiden.webweaving.org (fia224-72.dsl.hccnet.nl [62.251.72.224])
	by hub.freebsd.org (Postfix) with ESMTP id 02AFA37B405
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 22 Jun 2002 12:42:50 -0700 (PDT)
Received: from foem.leiden.webweaving.org (localhost [127.0.0.1])
	by foem.leiden.webweaving.org (8.12.3/8.11.6) with ESMTP id g5MH3wCC091562
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 22 Jun 2002 19:03:59 +0200 (CEST)
	(envelope-from dirkx@foem.leiden.webweaving.org)
Received: (from dirkx@localhost)
	by foem.leiden.webweaving.org (8.12.3/8.12.3/Submit) id g5MH3wwo091561;
	Sat, 22 Jun 2002 19:03:58 +0200 (CEST)
Message-Id: <200206221703.g5MH3wwo091561@foem.leiden.webweaving.org>
Date: Sat, 22 Jun 2002 19:03:58 +0200 (CEST)
From: Dirk-WIllem van Gulik <dirkx@covalent.net>
Reply-To: Dirk-WIllem van Gulik <dirkx@covalent.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: mknetid segfaults on default /etc/master pwd file
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         39671
>Category:       bin
>Synopsis:       mknetid segfaults on default /etc/master pwd file
>Confidential:   no
>Severity:       serious
>Priority:       low
>Responsible:    maxim
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jun 22 12:50:01 PDT 2002
>Closed-Date:    Wed Nov 27 03:08:11 PST 2002
>Last-Modified:  Wed Nov 27 03:08:11 PST 2002
>Originator:     Dirk-Willem van Gulik
>Release:        FreeBSD 5.0-CURRENT i386
>Organization:
>Environment:
System: FreeBSD foem.leiden.webweaving.org 5.0-CURRENT FreeBSD 5.0-CURRENT #17: Sat May 4 01:04:42 CEST 2002 dirkx@foem.leiden.webweaving.org:/usr/src/sys/i386/compile/FOEM i386
>Description:

When using a standard /etc/master.passwd file with in the header
the usual:

	# $FreeBSD: src/etc/master.passwd,v ....
	#

then a (cd /var/yp; make) will result in tears:

	Updating netid.byname...
	mknetid: bad passwd file entry: # $FreeBSD
	Segmentation fault - core dumped
	...

>How-To-Repeat:

	take -current
	config for YP/nis server

	ypinit -m
	cd /var/yp
	make

>Fix:


>Release-Note:
>Audit-Trail:

From: Lyndon Nerenberg <lyndon@orthanc.ab.ca>
To: freebsd-gnats-submit@freebsd.org, dirkx@covalent.net
Cc:  
Subject: bin/39671 mknetid segfaults on default /etc/master pwd file
Date: Sun, 06 Oct 2002 14:16:02 -0600

 This patch to /usr/src/libexec/mknetid/mknetid.c fixes the
 problem.
 
 --lyndon
 
 http://www.freebsd.org/cgi/query-pr.cgi?pr=bin/39671
 
 Index: mknetid.c
 ===================================================================
 RCS file: /home/ncvs/src/libexec/mknetid/mknetid.c,v
 retrieving revision 1.11
 diff -u -r1.11 mknetid.c
 --- mknetid.c	1999/08/28 00:09:41	1.11
 +++ mknetid.c	2002/10/06 20:11:30
 @@ -182,6 +182,8 @@
  	 * group information we just stored if necessary.
  	 */
  	while(fgets(readbuf, LINSIZ, pfp)) {
 +		if (readbuf[0] == '#')
 +			continue;	/* ignore comment lines */
  		if ((ptr = strchr(readbuf, ':')) == NULL)
  			warnx("bad passwd file entry: %s", readbuf);
  		*ptr = '\0';

From: Maxim Konovalov <maxim@macomnet.ru>
To: bug-followup@freebsd.org
Cc: Lyndon Nerenberg <lyndon@orthanc.ab.ca>
Subject: bin/39671
Date: Fri, 18 Oct 2002 17:36:16 +0400 (MSD)

 What about more comprehensive patch:
 
 o Fix usage() string
 o Do not dump core on unsetted domainname
 o Fix passwd file parsing
 
 Index: mknetid.c
 ===================================================================
 RCS file: /home/ncvs/src/libexec/mknetid/mknetid.c,v
 retrieving revision 1.12
 diff -u -r1.12 mknetid.c
 --- mknetid.c	17 Feb 2002 19:09:20 -0000	1.12
 +++ mknetid.c	18 Oct 2002 13:25:14 -0000
 @@ -91,7 +91,7 @@
  {
  	fprintf (stderr, "%s\n%s\n",
  	"usage: mknetid [-q] [-g group_file] [-p passwd_file] [-h hosts_file]",
 -	"               [-d netid_file] [-d domain]");
 +	"               [-n netid_file] [-d domain]");
  	exit(1);
  }
 
 @@ -111,6 +111,7 @@
  	char *ptr, *pidptr, *gidptr, *hptr;
  	int quiet = 0;
 
 +	domain = NULL;
  	while ((ch = getopt(argc, argv, "g:p:h:n:d:q")) != -1) {
  		switch(ch) {
  		case 'g':
 @@ -180,22 +181,36 @@
  	 * group information we just stored if necessary.
  	 */
  	while(fgets(readbuf, LINSIZ, pfp)) {
 -		if ((ptr = strchr(readbuf, ':')) == NULL)
 +		/* Ignore comments: ^[ \t]*# */
 +		for (ptr = readbuf; *ptr != '\0'; ptr++)
 +			if (*ptr != ' ' && *ptr != '\t')
 +				break;
 +		if (*ptr == '#' || *ptr == '\0')
 +			continue;
 +		if ((ptr = strchr(readbuf, ':')) == NULL) {
  			warnx("bad passwd file entry: %s", readbuf);
 +			continue;
 +		}
  		*ptr = '\0';
  		ptr++;
 -		if ((ptr = strchr(ptr, ':')) == NULL)
 +		if ((ptr = strchr(ptr, ':')) == NULL) {
  			warnx("bad passwd file entry: %s", readbuf);
 +			continue;
 +		}
  		*ptr = '\0';
  		ptr++;
  		pidptr = ptr;
 -		if ((ptr = strchr(ptr, ':')) == NULL)
 +		if ((ptr = strchr(ptr, ':')) == NULL) {
  			warnx("bad passwd file entry: %s", readbuf);
 +			continue;
 +		}
  		*ptr = '\0';
  		ptr++;
  		gidptr = ptr;
 -		if ((ptr = strchr(ptr, ':')) == NULL)
 +		if ((ptr = strchr(ptr, ':')) == NULL) {
  			warnx("bad passwd file entry: %s", readbuf);
 +			continue;
 +		}
  		*ptr = '\0';
  		i = atol(gidptr);
 
 %%%
 
 P.S. The code still has a lot of bugs.
 
 -- 
 Maxim Konovalov, MAcomnet, Internet Dept., system engineer
 phone: +7 (095) 796-9079, mailto:maxim@macomnet.ru
 
 
State-Changed-From-To: open->patched 
State-Changed-By: maxim 
State-Changed-When: Tue Nov 12 06:22:16 PST 2002 
State-Changed-Why:  
Fixed in rev. 1.13 src/libexec/mknetid/mknetid.c in -CURRENT. 


Responsible-Changed-From-To: freebsd-bugs->maxim 
Responsible-Changed-By: maxim 
Responsible-Changed-When: Tue Nov 12 06:22:16 PST 2002 
Responsible-Changed-Why:  
Will MFC the fix to -STABLE in two weeks. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=39671 
State-Changed-From-To: patched->closed 
State-Changed-By: maxim 
State-Changed-When: Wed Nov 27 03:07:02 PST 2002 
State-Changed-Why:  
Fixed in rev. 1.13 and rev. 1.11.2.1 src/libexec/mknetid/mknetid.c 
in -CURRENT and -STABLE. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=39671 
>Unformatted:
