Patch #:	88
Type:		operational change
Priority:	none
Modification:	make AUFS able to ignore home directory of users
Submitted:	Heiji Horde <horde@reed.edu>
Archived:	munnari.OZ.AU	mac/cap.patches/cap60.patch088
Application:	'cd cap60; patch -p < cap60.patches/cap60.patch088'
Summary:	add -u flag
File:		cap60/applications/aufs/aufs.c
File:		cap60/applications/aufs/afpos.c

*** applications/aufs/aufs.c.orig	Sun Nov 17 20:14:09 1991
--- applications/aufs/aufs.c		Mon Feb 17 21:16:04 1992
***************
*** 1,7 ****
  /*
!  * $Author: djh $ $Date: 1991/11/17 09:13:46 $
!  * $Header: /mac/src/cap60/applications/aufs/RCS/aufs.c,v 2.8 1991/11/17 09:13:46 djh Rel djh $
!  * $Revision: 2.8 $
  */
  
  /*
--- 1,7 ----
  /*
!  * $Author: djh $ $Date: 1992/02/17 10:15:54 $
!  * $Header: /mac/src/cap60/applications/aufs/RCS/aufs.c,v 2.9 1992/02/17 10:15:54 djh Rel djh $
!  * $Revision: 2.9 $
  */
  
  /*
***************
*** 91,96 ****
--- 91,97 ----
  export int sqs = atpMaxNum;	/* maximum send quantum */
  export int n_rrpkts = atpMaxNum; /* maximum send quantum to allow remote */
  				/* (used in spwrtcontinue) */
+ export int nousrvol = FALSE;	/* no user home dir/vol flag */
  #ifdef AUFS_README
  export char *aufsreadme;	/* path of readme file */
  export char *aufsreadmename;	/* pointer into aufsreadme with just name */
***************
*** 173,183 ****
    fprintf(stderr,"[-n name] [-t packets] [-s] [-V afpvols]\n");
  #endif LWSRV_AUFS_SECURITY
  #ifdef APPLICATION_MANAGER
!   fprintf(stderr,"[-A applistfile]");
  #endif APPLICATION_MANAGER
  #ifdef AUFS_README
!   fprintf(stderr,"[-r readme_path]");
  #endif AUFS_README
    fprintf(stderr,"\n\t-d for CAP debugging flags:\n");
    fprintf(stderr,"\t   l = lap, d = ddp, a = atp, n = nbp, p = pap,");
    fprintf(stderr,"i = ini, s = asp\n");
--- 174,185 ----
    fprintf(stderr,"[-n name] [-t packets] [-s] [-V afpvols]\n");
  #endif LWSRV_AUFS_SECURITY
  #ifdef APPLICATION_MANAGER
!   fprintf(stderr,"[-A applistfile] ");
  #endif APPLICATION_MANAGER
  #ifdef AUFS_README
!   fprintf(stderr,"[-r readme_path] ");
  #endif AUFS_README
+   fprintf(stderr,"[-u] ");
    fprintf(stderr,"\n\t-d for CAP debugging flags:\n");
    fprintf(stderr,"\t   l = lap, d = ddp, a = atp, n = nbp, p = pap,");
    fprintf(stderr,"i = ini, s = asp\n");
***************
*** 189,194 ****
--- 191,197 ----
    fprintf(stderr,"\t   [I|O|B]CmdName\n");
    fprintf(stderr,"\t-n for setting the server's name\n");
    fprintf(stderr,"\t-s for statistics\n");
+   fprintf(stderr,"\t-u do not show user home directory or vols\n");
    fprintf(stderr,"\t-V VolsFile for server wide afp volumes\n");
    fprintf(stderr,"\t-G <username> to set guest id for <anonymous> logins\n");
    fprintf(stderr,"\t-P LookAsidePasswordFile for scrambled transactions\n");
***************
*** 238,244 ****
    int c;
    extern char *optarg;
    extern int optind;
!   static char optlist[64] = "a:d:D:n:N:t:sV:U:G:P:c:l:z:S:R:";
    
  #ifdef LWSRV_AUFS_SECURITY
    strcat(optlist, "X:");
--- 241,247 ----
    int c;
    extern char *optarg;
    extern int optind;
!   static char optlist[64] = "a:d:D:n:N:t:suV:U:G:P:c:l:z:S:R:";
    
  #ifdef LWSRV_AUFS_SECURITY
    strcat(optlist, "X:");
***************
*** 262,267 ****
--- 265,273 ----
        break;
      case 's':
        statflg = TRUE;
+       break;
+     case 'u':
+       nousrvol = TRUE;			/* don't show home dir */
        break;
      case 'd':
        dbugarg(optarg);			/* '-d' is debug */
*** applications/aufs/afpos.c.orig	Mon Feb 17 14:14:47 1992
--- applications/aufs/afpos.c		Mon Feb 17 21:16:58 1992
***************
*** 1,7 ****
  /*
!  * $Author: djh $ $Date: 1992/02/17 03:14:10 $
!  * $Header: /mac/src/cap60/applications/aufs/RCS/afpos.c,v 2.19 1992/02/17 03:14:10 djh Rel djh $
!  * $Revision: 2.19 $
   */
  
  /*
--- 1,7 ----
  /*
!  * $Author: djh $ $Date: 1992/02/17 10:16:43 $
!  * $Header: /mac/src/cap60/applications/aufs/RCS/afpos.c,v 2.20 1992/02/17 10:16:43 djh Rel djh $
!  * $Revision: 2.20 $
   */
  
  /*
***************
*** 3054,3059 ****
--- 3054,3060 ----
    extern char *userlogindir;
    int namlen;
  #endif LWSRV_AUFS_SECURITY
+   extern int nousrvol;
  
    safedebug = (DBOSI || (getuid() != 0 && geteuid() != 0));
  
***************
*** 3208,3215 ****
    logit(0,"Login: user %s, home directory %s",
        usrnam, usrdir == NULL ? "none" : usrdir);
  
!   if (usrdir != NULL)
      VInit(usrnam,usrdir);	/* initialize volume stuff */
    return(noErr);
  }
  
--- 3209,3217 ----
    logit(0,"Login: user %s, home directory %s",
        usrnam, usrdir == NULL ? "none" : usrdir);
  
!   if ((usrdir != NULL) && (nousrvol != TRUE))
      VInit(usrnam,usrdir);	/* initialize volume stuff */
+ 
    return(noErr);
  }
  
*** README.orig		Mon Feb 17 21:17:30 1992
--- README		Mon Feb 17 21:18:05 1992
***************
*** 3,9 ****
  	       (For use with AppleTalk/Ethernet bridge)
  
  	o RELEASE NOTES
! 	o CAP Distribution 6.0, Patch Level 87, February 1992
  
  Introduction
  ------------
--- 3,9 ----
  	       (For use with AppleTalk/Ethernet bridge)
  
  	o RELEASE NOTES
! 	o CAP Distribution 6.0, Patch Level 88, February 1992
  
  Introduction
  ------------