From c77dd333c50d2cebe1b1592459a9bfcc85ee1bf4 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Tue, 9 Feb 2010 10:14:04 -0800
Subject: [PATCH] rename authtool -> cauthtool

---
 src/Makefile.am                   |  8 ++++----
 src/{authtool.cc => cauthtool.cc} |  0
 src/mkcephfs.in                   | 14 +++++++-------
 src/vstart.sh                     |  8 ++++----
 4 files changed, 15 insertions(+), 15 deletions(-)
 rename src/{authtool.cc => cauthtool.cc} (100%)

diff --git a/src/Makefile.am b/src/Makefile.am
index a401252a635c7..83f13f1d8cf49 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -31,9 +31,9 @@ mkmonfs_SOURCES = mkmonfs.cc
 mkmonfs_LDADD = libmon.a libcrush.a libcommon.a -lpthread -lm -lcrypto
 cconf_SOURCES = cconf.cc
 cconf_LDADD = libcommon.a -lpthread -lm -lcrypto
-authtool_SOURCES = authtool.cc
-authtool_LDADD = libcommon.a -lpthread -lm -lcrypto
-bin_PROGRAMS += ceph mkmonfs cconf authtool
+cauthtool_SOURCES = cauthtool.cc
+cauthtool_LDADD = libcommon.a -lpthread -lm -lcrypto
+bin_PROGRAMS += ceph mkmonfs cconf cauthtool
 
 monmaptool_SOURCES = monmaptool.cc
 monmaptool_LDADD = libcommon.a -lpthread -lm -lcrypto
@@ -730,7 +730,7 @@ noinst_HEADERS = \
 	rgw/rgw_user.h\
 	sample.ceph.conf
 
-all_sources = $(cmon_SOURCES) $(ceph_SOURCES) $(mkmonfs_SOURCES) $(authtool_SOURCES) $(monmaptool_SOURCES) \
+all_sources = $(cmon_SOURCES) $(ceph_SOURCES) $(mkmonfs_SOURCES) $(cauthtool_SOURCES) $(monmaptool_SOURCES) \
 	$(crushtool_SOURCES) $(osdmaptool_SOURCES) $(cconf_SOURCES) $(mount_ceph_SOURCES) $(cmds_SOURCES) \
 	$(dumpjournal_SOURCES) $(cosd_SOURCES) $(dupstore_SOURCES) $(streamtest_SOURCES) $(csyn_SOURCES)  \
 	$(testmsgr_SOURCES) $(cfuse_SOURCES) $(fakefuse_SOURCES) $(psim_SOURCES) \
diff --git a/src/authtool.cc b/src/cauthtool.cc
similarity index 100%
rename from src/authtool.cc
rename to src/cauthtool.cc
diff --git a/src/mkcephfs.in b/src/mkcephfs.in
index 4b28f7a60cc3a..70ee32d3462d5 100644
--- a/src/mkcephfs.in
+++ b/src/mkcephfs.in
@@ -135,15 +135,15 @@ if echo $what | grep -q mon0 ; then
 	mds = "allow"
 EOF
     [ -e "$monkeyring" ] && rm -f $monkeyring
-    $BINDIR/authtool --create-keyring --gen-key --name=client.admin --caps=/tmp/admin_caps.$$ $adminkeyring
+    $BINDIR/cauthtool --create-keyring --gen-key --name=client.admin --caps=/tmp/admin_caps.$$ $adminkeyring
     rm /tmp/admin_caps.$$
 
     # mon keyring (for monitor)
     echo Building monitor keyring with all service keys
     monkeyring="/tmp/monkeyring.$$"
-    $BINDIR/authtool --create-keyring --gen-key --name=mon. $monkeyring
+    $BINDIR/cauthtool --create-keyring --gen-key --name=mon. $monkeyring
 
-    $BINDIR/authtool --import-keyring $adminkeyring $monkeyring
+    $BINDIR/cauthtool --import-keyring $adminkeyring $monkeyring
 
     cat <<EOF > /tmp/osd.caps.$$
 ; generated by mkcephfs on `date`
@@ -162,12 +162,12 @@ EOF
 	id=`echo $name | cut -c 4- | sed 's/\\.//'`
 
 	if [ "$type" = "osd" ]; then
-	    $BINDIR/authtool --create-keyring --gen-key --name=osd.$id --caps=/tmp/osd.caps.$$ /tmp/keyring.osd.$id
-	    $BINDIR/authtool --import-keyring /tmp/keyring.osd.$id $monkeyring
+	    $BINDIR/cauthtool --create-keyring --gen-key --name=osd.$id --caps=/tmp/osd.caps.$$ /tmp/keyring.osd.$id
+	    $BINDIR/cauthtool --import-keyring /tmp/keyring.osd.$id $monkeyring
 	fi
 	if [ "$type" = "mds" ]; then
-	    $BINDIR/authtool --create-keyring --gen-key --name=mds.$id --caps=/tmp/mds.caps.$$ /tmp/keyring.mds.$id
-	    $BINDIR/authtool --import-keyring /tmp/keyring.mds.$id $monkeyring
+	    $BINDIR/cauthtool --create-keyring --gen-key --name=mds.$id --caps=/tmp/mds.caps.$$ /tmp/keyring.mds.$id
+	    $BINDIR/cauthtool --import-keyring /tmp/keyring.mds.$id $monkeyring
 	fi
     done
 
diff --git a/src/vstart.sh b/src/vstart.sh
index b834a88e7e7db..1a730552a4a60 100755
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -278,8 +278,8 @@ EOF
 EOF
 		fi
 
-	        [ "$cephx" -eq 1 ] && $SUDO $CEPH_BIN/authtool --create-keyring --gen-key --name=mon. $keyring_fn
-	        [ "$cephx" -eq 1 ] && $SUDO $CEPH_BIN/authtool --create-keyring --gen-key --name=client.admin --caps=$admin_caps $keyring_fn
+	        [ "$cephx" -eq 1 ] && $SUDO $CEPH_BIN/cauthtool --create-keyring --gen-key --name=mon. $keyring_fn
+	        [ "$cephx" -eq 1 ] && $SUDO $CEPH_BIN/cauthtool --create-keyring --gen-key --name=client.admin --caps=$admin_caps $keyring_fn
 
 		# build a fresh fs monmap, mon fs
 		str="$CEPH_BIN/monmaptool --create --clobber"
@@ -346,7 +346,7 @@ EOF
 	osd = "allow rwx"
 EOF
 		fi
-		$SUDO $CEPH_BIN/authtool --create-keyring --gen-key --name=osd.$osd --caps=$osd_caps $key_fn
+		$SUDO $CEPH_BIN/cauthtool --create-keyring --gen-key --name=osd.$osd --caps=$osd_caps $key_fn
 		echo adding osd$osd key to auth repository
 		$SUDO $CEPH_ADM -i $key_fn auth add osd.$osd
 	    fi
@@ -385,7 +385,7 @@ EOF
 EOF
 		fi
 	    fi
-	    $SUDO $CEPH_BIN/authtool --create-keyring --gen-key --name=mds.$name --caps=$mds_caps $key_fn
+	    $SUDO $CEPH_BIN/cauthtool --create-keyring --gen-key --name=mds.$name --caps=$mds_caps $key_fn
 	    $SUDO $CEPH_ADM -i $key_fn auth add mds.$name
 	fi
 	
-- 
2.39.5