Patch #:	60
Type:		bug fix
Priority:	medium
Affects:	sites using Phase 2 with 'atis reload'
Reported:	Jorma Paananen <jopa@tkk.tele.fi>
Submitted:	David Hornsby <djh@munnari.OZ.AU>
Archived:	munnari.OZ.AU	mac/cap.patches/cap60.patch060
Application:	'cd cap60; patch -p < cap60.patches/cap60.patch060'
Summary:	fix reload code
File:		cap60/etc/nisaux.c

*** etc/nisaux.c.orig	Wed May 29 22:50:28 1991
--- etc/nisaux.c	Thu Sep 19 13:17:48 1991
***************
*** 1,7 ****
  /*
!  * $Author: djh $ $Date: 1991/05/29 12:50:14 $
!  * $Header: /mac/src/cap60/etc/RCS/nisaux.c,v 2.3 1991/05/29 12:50:14 djh Rel djh $
!  * $Revision: 2.3 $
  */
  
  /*
--- 1,7 ----
  /*
!  * $Author: djh $ $Date: 1991/09/19 03:17:30 $
!  * $Header: /mac/src/cap60/etc/RCS/nisaux.c,v 2.4 1991/09/19 03:17:30 djh Rel djh $
!  * $Revision: 2.4 $
  */
  
  /*
***************
*** 237,242 ****
--- 237,244 ----
        return(TRUE);
      if (str[0] == '#' || str[0] == '\n')
        continue;
+     if ((cp = (char *)index(str, '\n')) != NULL)
+       *cp = '\0'; /* delete the newline char */
      sscanf(str, "net=%d.%d, node=%d, skt=%d, enum=%d, !%d!%d!%d! ? ",
  	   &kipnet, &kipsubnet, &node, &skt, &enume,
  	   &osl, &tsl, &zsl);
***************
*** 262,267 ****
--- 264,272 ----
      cp += (osl+1);		/* move past object and : */
      strncpy((char *)nve->ent.typeStr.s, cp, min(32, tsl)); /* get object */
      cp += (tsl+1);		/* move past object and @ */
+ #ifdef PHASE2
+     strncpy((char *)nve->ent.zoneStr.s, cp, sizeof(nve->ent.zoneStr.s));
+ #else  PHASE2
      if (zsl > 1 || *cp != '*') {
        if (strcmpci(cp,GetMyZone()) != 0) {
          logit(6, "%s is not the current zone",cp);
***************
*** 271,276 ****
--- 276,282 ----
      } 
      nve->ent.zoneStr.s[0] = '*';
      nve->ent.zoneStr.s[1] = '\0';
+ #endif PHASE2
      nve->enume = enume;
      logit(5, "Load: %s:%s@%s [%d] - [net %d.%d, node %d, skt %d]",
  	nve->ent.objStr.s, nve->ent.typeStr.s, nve->ent.zoneStr.s,
*** README.orig		Thu Sep 19 13:21:16 1991
--- README		Thu Sep 19 13:20:46 1991
***************
*** 3,9 ****
  	       (For use with AppleTalk/Ethernet bridge)
  
  	o RELEASE NOTES
! 	o CAP Distribution 6.0, Patch Level 59, September 1991
  
  Introduction
  ------------
--- 3,9 ----
  	       (For use with AppleTalk/Ethernet bridge)
  
  	o RELEASE NOTES
! 	o CAP Distribution 6.0, Patch Level 60, September 1991
  
  Introduction
  ------------