===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tcfs/Attic/tcfsrmkey.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -c -r1.3 -r1.4
*** src/usr.bin/tcfs/Attic/tcfsrmkey.c	2000/06/19 20:35:48	1.3
--- src/usr.bin/tcfs/Attic/tcfsrmkey.c	2000/06/19 22:42:29	1.4
***************
*** 1,4 ****
! /*	$OpenBSD: tcfsrmkey.c,v 1.3 2000/06/19 20:35:48 fgsch Exp $	*/
  
  /*
   *	Transparent Cryptographic File System (TCFS) for NetBSD 
--- 1,4 ----
! /*	$OpenBSD: tcfsrmkey.c,v 1.4 2000/06/19 22:42:29 aaron Exp $	*/
  
  /*
   *	Transparent Cryptographic File System (TCFS) for NetBSD 
***************
*** 44,50 ****
  	int havempname = FALSE, havefsname = FALSE, isgroupkey = FALSE;
  	int havename = FALSE, havefspath = FALSE;
  
! 	while ((x = getopt(argc,argv,"f:p:g:")) != EOF) {
  		switch(x) {
  		case 'p':
  			havempname = TRUE;
--- 44,50 ----
  	int havempname = FALSE, havefsname = FALSE, isgroupkey = FALSE;
  	int havename = FALSE, havefspath = FALSE;
  
! 	while ((x = getopt(argc, argv, "f:p:g:")) != EOF) {
  		switch(x) {
  		case 'p':
  			havempname = TRUE;
***************
*** 72,78 ****
  		}
  	}
  	if (argc-optind)
! 		tcfs_error(ER_UNKOPT,NULL);
  
  	if (havefsname && havempname) {
  		tcfs_error(ER_CUSTOM, rmkey_usage);
--- 72,78 ----
  		}
  	}
  	if (argc-optind)
! 		tcfs_error(ER_UNKOPT, NULL);
  
  	if (havefsname && havempname) {
  		tcfs_error(ER_CUSTOM, rmkey_usage);
***************
*** 88,113 ****
  		havename = TRUE;
  
  	if (!havename)
! 		es = tcfs_getfspath("default",fspath);
  
  	if(!es) {
! 		tcfs_error(ER_CUSTOM,"fs-label not found!\n");
  		exit(1);
  	}
  		
  	uid = getuid();
  
  	if (isgroupkey) {
! 		es = tcfs_group_disable(fspath,uid,gid);
  		if(es == -1)
  			tcfs_error(ER_CUSTOM, "problems updating filesystem");
  		exit(0);
  	}
  
! 	es = tcfs_user_disable(fspath,uid);
  
  	if (es == -1)
! 		tcfs_error(ER_CUSTOM,"problems updating filesystem");
  
  	exit(0);
  }
--- 88,113 ----
  		havename = TRUE;
  
  	if (!havename)
! 		es = tcfs_getfspath("default", fspath);
  
  	if(!es) {
! 		tcfs_error(ER_CUSTOM, "fs-label not found!\n");
  		exit(1);
  	}
  		
  	uid = getuid();
  
  	if (isgroupkey) {
! 		es = tcfs_group_disable(fspath, uid, gid);
  		if(es == -1)
  			tcfs_error(ER_CUSTOM, "problems updating filesystem");
  		exit(0);
  	}
  
! 	es = tcfs_user_disable(fspath, uid);
  
  	if (es == -1)
! 		tcfs_error(ER_CUSTOM, "problems updating filesystem");
  
  	exit(0);
  }