===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tcfs/Attic/tcfsrmkey.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -c -r1.5 -r1.6
*** src/usr.bin/tcfs/Attic/tcfsrmkey.c	2000/06/20 01:29:14	1.5
--- src/usr.bin/tcfs/Attic/tcfsrmkey.c	2000/06/20 08:59:53	1.6
***************
*** 1,4 ****
! /*	$OpenBSD: tcfsrmkey.c,v 1.5 2000/06/20 01:29:14 provos Exp $	*/
  
  /*
   *	Transparent Cryptographic File System (TCFS) for NetBSD 
--- 1,4 ----
! /*	$OpenBSD: tcfsrmkey.c,v 1.6 2000/06/20 08:59:53 fgsch Exp $	*/
  
  /*
   *	Transparent Cryptographic File System (TCFS) for NetBSD 
***************
*** 36,43 ****
  rmkey_main(int argc, char *argv[])
  {
  	uid_t uid;
! 	gid_t gid;
! 	int es;
  	char x;
  	char fslabel[MAXPATHLEN], fspath[MAXPATHLEN];
  	int havempname = FALSE, havefsname = FALSE, isgroupkey = FALSE;
--- 36,43 ----
  rmkey_main(int argc, char *argv[])
  {
  	uid_t uid;
! 	gid_t gid = 0;
! 	int es = 0;
  	char x;
  	char fslabel[MAXPATHLEN], fspath[MAXPATHLEN];
  	int havempname = FALSE, havefsname = FALSE, isgroupkey = FALSE;
***************
*** 73,82 ****
  	if (argc-optind)
  		tcfs_error(ER_UNKOPT, NULL);
  
! 	if (havefsname && havempname) {
  		tcfs_error(ER_CUSTOM, rmkey_usage);
- 		exit(1);
- 	}
  			 
  	if (havefsname) {
  		es = tcfs_getfspath(fslabel, fspath);
--- 73,80 ----
  	if (argc-optind)
  		tcfs_error(ER_UNKOPT, NULL);
  
! 	if (havefsname && havempname)
  		tcfs_error(ER_CUSTOM, rmkey_usage);
  			 
  	if (havefsname) {
  		es = tcfs_getfspath(fslabel, fspath);