From 02f97e2b119bcd216e4ce68850d48d21029fa2f5 Mon Sep 17 00:00:00 2001
From: Dirk Koopman <djk@tobit.co.uk>
Date: Sun, 28 Dec 2008 23:30:18 +0000
Subject: [PATCH] make it more difficult to have $mycall & $myalias the same

---
 perl/Version.pm      | 2 +-
 perl/cluster.pl      | 1 +
 perl/create_sysop.pl | 2 ++
 perl/update_sysop.pl | 2 ++
 4 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/perl/Version.pm b/perl/Version.pm
index 8a4fab3e..fbd3298d 100644
--- a/perl/Version.pm
+++ b/perl/Version.pm
@@ -11,6 +11,6 @@ use vars qw($version $subversion $build);
 
 $version = '1.55';
 $subversion = '0';
-$build = '33';
+$build = '34';
 
 1;
diff --git a/perl/cluster.pl b/perl/cluster.pl
index bc57440f..7b889fc4 100755
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -405,6 +405,7 @@ DXUser->init($userfn, 1);
 
 # look for the sysop and the alias user and complain if they aren't there
 {
+	die "\$myalias \& \$mycall are the same ($mycall)!, they must be different (hint: make \$mycall = '${mycall}-2';). Oh and don't forget to rerun create_sysop.pl!" if $mycall eq $myalias;
 	my $ref = DXUser::get($mycall);
 	die "$mycall missing, run the create_sysop.pl script and please RTFM" unless $ref && $ref->priv == 9;
 	$ref = DXUser::get($myalias);
diff --git a/perl/create_sysop.pl b/perl/create_sysop.pl
index c0ac9e3a..c59358b6 100755
--- a/perl/create_sysop.pl
+++ b/perl/create_sysop.pl
@@ -76,6 +76,8 @@ sub create_it
 
 }
 
+die "\$myalias \& \$mycall are the same ($mycall)!, they must be different (hint: make \$mycall = '${mycall}-2';).\n" if $mycall eq $myalias;
+
 $lockfn = "$root/local/cluster.lck";       # lock file name
 if (-e $lockfn) {
 	open(CLLOCK, "$lockfn") or die "Can't open Lockfile ($lockfn) $!";
diff --git a/perl/update_sysop.pl b/perl/update_sysop.pl
index 2fccbb5a..6700b98f 100755
--- a/perl/update_sysop.pl
+++ b/perl/update_sysop.pl
@@ -83,6 +83,8 @@ sub create_it
 
 }
 
+die "\$myalias \& \$mycall are the same ($mycall)!, they must be different (hint: make \$mycall = '${mycall}-2';).\n" if $mycall eq $myalias;
+
 $lockfn = "$root/local/cluster.lck";       # lock file name
 if (-e $lockfn) {
 	open(CLLOCK, "$lockfn") or die "Can't open Lockfile ($lockfn) $!";
-- 
2.34.1