Patch #:	147
Type:		operational change
Priority:	none
Modification:	allow user name to be used for CREATE_AFPVOL volume name
Submitted:	Craig A Zook <zook@pat.mdc.com>
Archived:	munnari.OZ.AU	mac/cap.patches/cap60.patch147
Application:	'cd cap60; patch -p < cap60.patches/cap60.patch147'
Summary:	add CREATE_AFPVOL_NAME flag to m4.features
File:		cap60/applications/aufs/afpvols.c
File:		cap60/CAP60.README
File:		cap60/Configure

*** applications/aufs/afpvols.c.orig	Wed Jul  1 23:08:38 1992
--- applications/aufs/afpvols.c		Mon Aug  2 20:09:21 1993
***************
*** 1,7 ****
  /*
!  * $Author: djh $ $Date: 1992/07/01 13:08:12 $
!  * $Header: /mac/src/cap60/applications/aufs/RCS/afpvols.c,v 2.6 1992/07/01 13:08:12 djh Rel djh $
!  * $Revision: 2.6 $
  */
  
  /*
--- 1,7 ----
  /*
!  * $Author: djh $ $Date: 1993/08/02 10:09:06 $
!  * $Header: /mac/src/cap60/applications/aufs/RCS/afpvols.c,v 2.7 1993/08/02 10:09:06 djh Rel djh $
!  * $Revision: 2.7 $
  */
  
  /*
***************
*** 611,621 ****
--- 611,629 ----
      logit(0, "CREATE_AFPVOL: can't open %s for writing", volfname);
      return(-1);
    }
+ #ifdef CREATE_AFPVOL_NAME
+   if (fprintf(fp, "%s/%s:%s\n", home, CREATE_AFPVOL, usr) < 0) {
+     logit(0, "CREATE_AFPVOL: error in fprintf()");
+     (void)fclose(fp);
+     return(-1);
+   }
+ #else  CREATE_AFPVOL_NAME
    if (fprintf(fp, "%s/%s:%s\n", home, CREATE_AFPVOL, CREATE_AFPVOL) < 0) {
      logit(0, "CREATE_AFPVOL: error in fprintf()");
      (void)fclose(fp);
      return(-1);
    }
+ #endif CREATE_AFPVOL_NAME
    (void)fclose(fp);
    sprintf(subdir, "%s/%s", home, FIDIRFN);
    if (mkdir(subdir, 0700) < 0) {
*** Configure.orig	Sun Aug  1 18:03:34 1993
--- Configure		Mon Aug  2 20:12:59 1993
***************
*** 1,7 ****
  #!/bin/sh
! # $Author: djh $ $Date: 1993/08/01 08:03:25 $
! # $Header: /mac/src/cap60/RCS/Configure,v 2.56 1993/08/01 08:03:25 djh Rel djh $
! # $Revision: 2.56 $
  # CAP configuration shell script.  This ain't perfect, but it's a start.
  # Execute with /bin/sh Configure if your system won't run it (ksh is okay too)
  # 
--- 1,7 ----
  #!/bin/sh
! # $Author: djh $ $Date: 1993/08/02 10:12:52 $
! # $Header: /mac/src/cap60/RCS/Configure,v 2.57 1993/08/02 10:12:52 djh Rel djh $
! # $Revision: 2.57 $
  # CAP configuration shell script.  This ain't perfect, but it's a start.
  # Execute with /bin/sh Configure if your system won't run it (ksh is okay too)
  # 
***************
*** 750,755 ****
--- 750,758 ----
  #
  # + CREATE_AFPVOL create user .afpvols and 'mac' directories if non-existent
  # define(`specialcflags',concat(specialcflags,` -DCREATE_AFPVOL=\"mac\"'))
+ #
+ # + CREATE_AFPVOL_NAME use the user name for the volume (modifies CREATE_AFPVOL)
+ # define(`specialcflags',concat(specialcflags,` -DCREATE_AFPVOL_NAME'))
  #
  #
  #
*** CAP60.README.orig	Mon Aug  3 02:17:54 1992
--- CAP60.README	Mon Aug  2 20:16:02 1993
***************
*** 170,175 ****
--- 170,180 ----
  		An alternate subdirectory/volume name is specified with
  		the string -DCREATE_AFPVOL=\"other\" in m4.features
  				Heather Ebey <hebey@ucsd.edu>
+ 	CREATE_AFPVOL_NAME
+ 		Modifies the CREATE_AFPVOL option to use the user/account
+ 		name for the volume label instead of the value of the
+ 		CREATE_AFPVOL variable.  Assumes CREATE_AFPVOL.
+ 				Craig Zook <zook@pat.mdc.com>
  	NETWORKTRASH
  		Under System 7.0, the "Network Trash Folder" mode is set
  		to 0x707 (world writeable). Defining NETWORKTRASH sets the
*** lib/cap/abversion.c.orig	Mon Aug  2 19:38:59 1993
--- lib/cap/abversion.c		Mon Aug  2 20:17:11 1993
***************
*** 1,7 ****
  /*
!  * $Author: djh $ $Date: 1993/08/02 09:38:50 $
!  * $Header: /mac/src/cap60/lib/cap/RCS/abversion.c,v 2.46 1993/08/02 09:38:50 djh Rel djh $
!  * $Revision: 2.46 $
  */
  
  /*
--- 1,7 ----
  /*
!  * $Author: djh $ $Date: 1993/08/02 10:17:06 $
!  * $Header: /mac/src/cap60/lib/cap/RCS/abversion.c,v 2.47 1993/08/02 10:17:06 djh Rel djh $
!  * $Revision: 2.47 $
  */
  
  /*
***************
*** 31,37 ****
    myversion.cv_name = "CAP";
    myversion.cv_version = 6;
    myversion.cv_subversion = 0;
!   myversion.cv_patchlevel = 146;
    myversion.cv_rmonth = "August";
    myversion.cv_ryear = "1993";
    switch (lap_proto) {
--- 31,37 ----
    myversion.cv_name = "CAP";
    myversion.cv_version = 6;
    myversion.cv_subversion = 0;
!   myversion.cv_patchlevel = 147;
    myversion.cv_rmonth = "August";
    myversion.cv_ryear = "1993";
    switch (lap_proto) {
*** README.orig		Mon Aug  2 19:38:10 1993
--- README		Mon Aug  2 20:18:02 1993
***************
*** 2,8 ****
  	       CAP - Columbia AppleTalk Package for UNIX
  
  	o RELEASE NOTES
! 	o CAP Distribution 6.0, Patch Level 146, August 1993
  
  Notice
  ------
--- 2,8 ----
  	       CAP - Columbia AppleTalk Package for UNIX
  
  	o RELEASE NOTES
! 	o CAP Distribution 6.0, Patch Level 147, August 1993
  
  Notice
  ------