From 510921fb382ccaf9a0422db2e57e073856db5cb9 Mon Sep 17 00:00:00 2001
From: "Leigh B. Stoller" <stoller@flux.utah.edu>
Date: Thu, 13 Feb 2003 18:57:33 +0000
Subject: [PATCH] Remove mkacct from the makefile. Change mkacct usage in
 mkproj to tbacct. Change rmuser to invoke tbacct instead of issuing ssh
 commands to ops.

---
 tbsetup/GNUmakefile.in |  6 ++----
 tbsetup/mkproj.in      |  2 +-
 tbsetup/rmuser.in      | 28 ++++++++--------------------
 3 files changed, 11 insertions(+), 25 deletions(-)

diff --git a/tbsetup/GNUmakefile.in b/tbsetup/GNUmakefile.in
index 8fd95e99c..c602238a9 100644
--- a/tbsetup/GNUmakefile.in
+++ b/tbsetup/GNUmakefile.in
@@ -26,7 +26,7 @@ USERBINS        = os_load node_reboot nscheck node_update savelogs \
 SBIN_STUFF	= resetvlans console_setup.proxy sched_reload named_setup \
 		  batch_daemon exports_setup reload_daemon sched_reserve \
 		  console_reset db2ns bwconfig frisbeelauncher \
-		  rmgroup mkgroup mkacct setgroups mkproj \
+		  rmgroup mkgroup setgroups mkproj \
 		  exports_setup.proxy vnode_setup eventsys_start \
 		  sfskey_update sfskey_update.proxy rmuser
 
@@ -36,7 +36,7 @@ LIBEXEC_STUFF	= rmproj wanlinksolve wanlinkinfo \
 		  assign_wrapper ptopgen webnodeupdate \
 		  webdelay_config \
 		  webrmgroup webswapexp webnodecontrol \
-		  webmkgroup webmkacct websetgroups webmkproj \
+		  webmkgroup websetgroups webmkproj \
 		  spewlogfile staticroutes routecalc wanassign \
 		  webidlecheck webnodereboot webrmuser
 
@@ -94,8 +94,6 @@ post-install:
 	chmod u+s $(INSTALL_LIBEXECDIR)/rmproj
 	chown root $(INSTALL_SBINDIR)/rmgroup
 	chmod u+s $(INSTALL_SBINDIR)/rmgroup
-	chown root $(INSTALL_SBINDIR)/mkacct
-	chmod u+s $(INSTALL_SBINDIR)/mkacct
 	chown root $(INSTALL_SBINDIR)/mkgroup
 	chmod u+s $(INSTALL_SBINDIR)/mkgroup
 	chown root $(INSTALL_SBINDIR)/frisbeelauncher
diff --git a/tbsetup/mkproj.in b/tbsetup/mkproj.in
index 1f8b80cc4..cd26b9a36 100755
--- a/tbsetup/mkproj.in
+++ b/tbsetup/mkproj.in
@@ -23,7 +23,7 @@ use English;
 my $TB       = "@prefix@";
 my $TBOPS    = "@TBOPSEMAIL@";
 my $MKGROUP  = "$TB/sbin/mkgroup";
-my $MKACCT   = "$TB/sbin/mkacct";
+my $MKACCT   = "$TB/sbin/tbacct add";
 
 my $PROJROOT = "/proj";
 my $GRPROOT  = "/groups";
diff --git a/tbsetup/rmuser.in b/tbsetup/rmuser.in
index f6fc3cda6..c3642b63f 100755
--- a/tbsetup/rmuser.in
+++ b/tbsetup/rmuser.in
@@ -25,9 +25,8 @@ my $CONTROL = "@USERNODE@";
 my $BOSSNODE= "@BOSSNODE@";
 
 my $HOMEDIR	= "/users";
-my $SSH		= "$TB/bin/sshtb";
 my $SETGROUPS	= "$TB/sbin/setgroups";
-my $USERDEL	= "/usr/sbin/pw userdel";
+my $DELACCT	= "$TB/sbin/tbacct del";
 
 my $dbuid;
 my $user;
@@ -239,33 +238,22 @@ DBQueryFatal("delete from userslastlogin where uid='$user'");
 #
 # Remove user from both local and control node.
 #
-# All this stuff must be done as root (ssh).
-#
-$UID = $EUID;
+$EUID = $UID;
 
-print "Removing user $user from local node.\n";
-if (system("$USERDEL $user")) {
-    if (($? >> 8) != 67) {
-	fatal("Could not remove user $user from local node.");
-    }
-}
+system("$DELACCT $user") == 0 or
+    fatal("$DELACCT $user failed!");
 
-if ($control_node ne $BOSSNODE) {
-    print "Removing user $user from $control_node.\n";
-    if (system("$SSH -host $control_node '$USERDEL $user'")) {
-	if (($? >> 8) != 67) {
-	    fatal("Could not remove user $user from $control_node.");
-	}
-    }
-}
+$EUID = 0;
 
 #
 # Rename the users home dir if its there.
 #
 if (-d "$HOMEDIR/$user") {
-    my $newname = "HOMEDIR/$user-" . TBDateTimeFSSafe();
+    my $newname = "$HOMEDIR/$user-" . TBDateTimeFSSafe();
 
     if (rename("$HOMEDIR/$user", $newname)) {
+	print "Renamed homedir to $newname. Remember to delete it!\n";
+	
 	#
 	# Chown the owner/group to root and set the permissions so no
 	# one is allowed to look inside.
-- 
GitLab