From bab22b34545c9b6e83ad4b12f21a7dd71383553c Mon Sep 17 00:00:00 2001 From: Michael Meffie Date: Tue, 4 Feb 2025 14:25:23 -0500 Subject: [PATCH] ptserver: Rename db_verify to prdb_check Since before OpenAFS 1.0, the prdb_check tool has been built as db_verify in the build tree and then renamed to prdb_check when installed with 'make install' (or 'make dest'). This was probably done long ago to be more consistent with the vldb_check program name. Rename the main source file for this tool from db_verify.c to prdb_check.c and build the program as prdb_check to avoid having two different names for the same program. Change the "whoami" global to "prdb_check" as well, so the tool will identify itself as "prdb_check" in error messages, instead of "db_verify". Change-Id: Ia534eb239972448cd722104b67b73707c820bd01 Reviewed-on: https://gerrit.openafs.org/16217 Reviewed-by: Andrew Deason Tested-by: Andrew Deason Reviewed-by: Michael Meffie Tested-by: Michael Meffie --- src/ptserver/.gitignore | 2 +- src/ptserver/Makefile.in | 20 ++++++++++---------- src/ptserver/NTMakefile | 6 +++--- src/ptserver/{db_verify.c => prdb_check.c} | 2 +- src/tptserver/.gitignore | 2 +- src/tptserver/Makefile.in | 22 +++++++++++----------- src/tptserver/NTMakefile | 8 ++++---- 7 files changed, 31 insertions(+), 31 deletions(-) rename src/ptserver/{db_verify.c => prdb_check.c} (99%) diff --git a/src/ptserver/.gitignore b/src/ptserver/.gitignore index 41b0e94bc..48d921633 100644 --- a/src/ptserver/.gitignore +++ b/src/ptserver/.gitignore @@ -3,7 +3,7 @@ # to check that you haven't inadvertently ignored any tracked files. /Kptint.h -/db_verify +/prdb_check /pt_util /pterror.c /pterror.h diff --git a/src/ptserver/Makefile.in b/src/ptserver/Makefile.in index 946da08ca..096ded693 100644 --- a/src/ptserver/Makefile.in +++ b/src/ptserver/Makefile.in @@ -52,7 +52,7 @@ LT_deps = $(top_builddir)/src/opr/liboafs_opr.la \ $(top_builddir)/src/auth/liboafs_auth.la LT_libs = -all: ptserver pts pt_util db_verify liboafs_prot.la libprot_pic.la \ +all: ptserver pts pt_util prdb_check liboafs_prot.la libprot_pic.la \ ${TOP_LIBDIR}/libprot.a depinstall readgroup readpwd testpt ptclient generated: \ @@ -148,10 +148,10 @@ Kptint.xdr.c: ptint.xg Kptint.h: ptint.xg ${RXGEN} -A -x -k -h -o Kptint.h ${srcdir}/ptint.xg -db_verify.o: db_verify.c ${INCLS} AFS_component_version_number.c +prdb_check.o: prdb_check.c ${INCLS} AFS_component_version_number.c -db_verify: db_verify.o libprot.a $(LIBS) - $(AFS_LDRULE) db_verify.o libprot.a \ +prdb_check: prdb_check.o libprot.a $(LIBS) + $(AFS_LDRULE) prdb_check.o libprot.a \ $(LIBS) $(LIB_roken) ${XLIBS} ptclient: ptclient.o libprot.a $(LIBS) @@ -166,7 +166,7 @@ pterror.c: pterror.et pterror.h: pterror.et ${COMPILE_ET_H} -p ${srcdir} pterror -db_verify.o db_verify.lo: pterror.h +prdb_check.o prdb_check.lo: pterror.h ptclient.o ptclient.lo: pterror.h ptprocs.o ptprocs.lo: pterror.h pts.o pts.lo: pterror.h @@ -232,7 +232,7 @@ prerror.h: pterror.h # # Installation targets # -install: ptserver pts pt_util db_verify libprot.a ptclient.h pterror.h \ +install: ptserver pts pt_util prdb_check libprot.a ptclient.h pterror.h \ ptint.h ptserver.h ${INSTALL} -d ${DESTDIR}${afssrvlibexecdir} ${INSTALL} -d ${DESTDIR}${afssrvbindir} @@ -245,7 +245,7 @@ install: ptserver pts pt_util db_verify libprot.a ptclient.h pterror.h \ ${INSTALL_PROGRAM} pts ${DESTDIR}${afssrvbindir}/pts; \ ${INSTALL_PROGRAM} pts ${DESTDIR}${bindir}/pts; \ ${INSTALL_PROGRAM} pt_util ${DESTDIR}${afssrvsbindir}/pt_util; \ - ${INSTALL_PROGRAM} db_verify ${DESTDIR}${afssrvsbindir}/prdb_check; \ + ${INSTALL_PROGRAM} prdb_check ${DESTDIR}${afssrvsbindir}/prdb_check; \ fi ${INSTALL_DATA} libprot.a ${DESTDIR}${libdir}/afs/libprot.a ${INSTALL_DATA} ${srcdir}/ptclient.h ${DESTDIR}${includedir}/afs/prclient.h @@ -258,7 +258,7 @@ install: ptserver pts pt_util db_verify libprot.a ptclient.h pterror.h \ ${INSTALL_DATA} ptint.h ${DESTDIR}${includedir}/afs/ptint.h ${INSTALL_DATA} ${srcdir}/ptserver.h ${DESTDIR}${includedir}/afs/ptserver.h -dest: ptserver pts pt_util db_verify libprot.a ptclient.h pterror.h \ +dest: ptserver pts pt_util prdb_check libprot.a ptclient.h pterror.h \ ptint.h ptserver.h ${INSTALL} -d ${DEST}/root.server/usr/afs/bin ${INSTALL} -d ${DEST}/bin @@ -270,7 +270,7 @@ dest: ptserver pts pt_util db_verify libprot.a ptclient.h pterror.h \ ${INSTALL_PROGRAM} pts ${DEST}/root.server/usr/afs/bin/pts; \ ${INSTALL_PROGRAM} pts ${DEST}/bin/pts; \ ${INSTALL_PROGRAM} pt_util ${DEST}/root.server/usr/afs/bin/pt_util; \ - ${INSTALL_PROGRAM} db_verify ${DEST}/etc/prdb_check; \ + ${INSTALL_PROGRAM} prdb_check ${DEST}/etc/prdb_check; \ fi; ${INSTALL_DATA} libprot.a ${DEST}/lib/afs/libprot.a ${INSTALL_DATA} ${srcdir}/ptclient.h ${DEST}/include/afs/prclient.h @@ -289,7 +289,7 @@ dest: ptserver pts pt_util db_verify libprot.a ptclient.h pterror.h \ clean: $(LT_CLEAN) $(RM) -f *.a *.o ptserver ptint.cs.c ptint.ss.c ptclient ptint.xdr.c ptint.h \ - libprot.a pts readgroup readpwd db_verify testpt pt_util pterror.h pterror.c \ + libprot.a pts readgroup readpwd prdb_check testpt pt_util pterror.h pterror.c \ core AFS_component_version_number.c Kptint.cs.c Kptint.h Kptint.xdr.c include ../config/Makefile.version diff --git a/src/ptserver/NTMakefile b/src/ptserver/NTMakefile index d895db8f3..72a06fb45 100644 --- a/src/ptserver/NTMakefile +++ b/src/ptserver/NTMakefile @@ -193,7 +193,7 @@ pterror.h pterror.c: pterror.et # install pts, ptserver and afsprot.lib install: $(INCFILES) ptint.ss.c ptint.cs.c ptint.xdr.c $(LIBFILE) $(PTSERVER) $(PTS) $(PTCLIENT) $(PT_UTIL) $(OUT)\readgroup.exe \ - $(OUT)\readpwd.exe $(OUT)\testpt.exe $(OUT)\db_verify.exe \ + $(OUT)\readpwd.exe $(OUT)\testpt.exe $(OUT)\prdb_check.exe \ $(DESTDIR)\root.server\usr\afs\bin\pts.exe \ $(DESTDIR)\root.server\usr\afs\bin\ptclient.exe \ $(DESTDIR)\root.server\usr\afs\bin\pt_util.exe \ @@ -235,7 +235,7 @@ $(INCFILEDIR)\afs\prclient.h: $(INCFILEDIR)\afs\ptclient.h clean:: $(DEL) ptint.cs.c ptint.ss.c ptint.xdr.c ptint.h - $(DEL) $(OUT)\readgroup.exe $(OUT)\readpwd.exe $(OUT)\db_verify.exe $(OUT)\testpt.exe + $(DEL) $(OUT)\readgroup.exe $(OUT)\readpwd.exe $(OUT)\prdb_check.exe $(OUT)\testpt.exe $(DEL) pterror.h pterror.c $(DEL) $(PTS) $(PTCLIENT) $(PT_UTIL) @@ -261,7 +261,7 @@ $(OUT)\testpt.exe: $(OUT)\testpt.obj $(LIBFILE) $(TEST_LIBS) $(CODESIGN_USERLAND) $(SYMSTORE_IMPORT) -$(OUT)\db_verify.exe: $(OUT)\db_verify.obj $(OUT)\pterror.obj $(OUT)\display.obj $(LIBFILE) $(TEST_LIBS) +$(OUT)\prdb_check.exe: $(OUT)\prdb_check.obj $(OUT)\pterror.obj $(OUT)\display.obj $(LIBFILE) $(TEST_LIBS) $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib shell32.lib $(_VC_MANIFEST_EMBED_EXE) $(CODESIGN_USERLAND) diff --git a/src/ptserver/db_verify.c b/src/ptserver/prdb_check.c similarity index 99% rename from src/ptserver/db_verify.c rename to src/ptserver/prdb_check.c index 7e1ac7efa..e5b18c292 100644 --- a/src/ptserver/db_verify.c +++ b/src/ptserver/prdb_check.c @@ -53,7 +53,7 @@ struct prheader cheader; int fd; const char *pr_dbaseName; -char *whoami = "db_verify"; +char *whoami = "prdb_check"; #define UBIK_HEADERSIZE 64 afs_int32 diff --git a/src/tptserver/.gitignore b/src/tptserver/.gitignore index 7f6420549..a392c553e 100644 --- a/src/tptserver/.gitignore +++ b/src/tptserver/.gitignore @@ -2,7 +2,7 @@ # git ls-files -i --exclude-standard # to check that you haven't inadvertently ignored any tracked files. -/db_verify +/prdb_check /pt_util /ptclient /pterror.c diff --git a/src/tptserver/Makefile.in b/src/tptserver/Makefile.in index cbde711e2..66ea03e9a 100644 --- a/src/tptserver/Makefile.in +++ b/src/tptserver/Makefile.in @@ -42,7 +42,7 @@ LIBS_client= \ $(top_builddir)/src/ptserver/liboafs_prot.la \ $(LIBS_common) -all: ptserver pts pt_util db_verify \ +all: ptserver pts pt_util prdb_check \ depinstall readgroup readpwd testpt generated: \ @@ -93,11 +93,11 @@ ptserver: ptserver.o ptutils.o ptprocs.o ptint.ss.o ptint.xdr.o utils.o map.o \ $(LIBS_server) \ $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} -db_verify.o: ${PTSERVER}/db_verify.c ${INCLS} - $(AFS_CCRULE) $(PTSERVER)/db_verify.c +prdb_check.o: ${PTSERVER}/prdb_check.c ${INCLS} + $(AFS_CCRULE) $(PTSERVER)/prdb_check.c -db_verify: db_verify.o $(LIBS_client) - $(LT_LDRULE_static) db_verify.o \ +prdb_check: prdb_check.o $(LIBS_client) + $(LT_LDRULE_static) prdb_check.o \ $(LIBS_client) $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ptclient: ptclient.o AFS_component_version_number.o $(LIBS_client) @@ -151,7 +151,7 @@ pterror.c: ${PTSERVER}/pterror.et pterror.h: ${PTSERVER}/pterror.et ${COMPILE_ET_H} -p ${PTSERVER} pterror -db_verify.o db_verify.lo: pterror.h +prdb_check.o prdb_check.lo: pterror.h ptclient.o ptclient.lo: pterror.h ptprocs.o ptprocs.lo: pterror.h pts.o pts.lo: pterror.h @@ -169,24 +169,24 @@ prerror.h: pterror.h # # Installation targets # -install: ptserver pts pt_util db_verify +install: ptserver pts pt_util prdb_check if [ "x$(ENABLE_PTHREADED_UBIK)" = "xyes" ] ; then \ ${LT_INSTALL_PROGRAM} ptserver \ ${DESTDIR}${afssrvlibexecdir}/ptserver; \ ${LT_INSTALL_PROGRAM} pts ${DESTDIR}${afssrvbindir}/pts; \ ${LT_INSTALL_PROGRAM} pts ${DESTDIR}${bindir}/pts; \ ${LT_INSTALL_PROGRAM} pt_util ${DESTDIR}${afssrvsbindir}/pt_util; \ - ${LT_INSTALL_PROGRAM} db_verify \ + ${LT_INSTALL_PROGRAM} prdb_check \ ${DESTDIR}${afssrvsbindir}/prdb_check; \ fi -dest: ptserver pts pt_util db_verify +dest: ptserver pts pt_util prdb_check if [ "x$(ENABLE_PTHREADED_UBIK)" = "xyes" ] ; then \ ${INSTALL_PROGRAM} ptserver ${DEST}/root.server/usr/afs/bin/ptserver; \ ${INSTALL_PROGRAM} pts ${DEST}/root.server/usr/afs/bin/pts; \ ${INSTALL_PROGRAM} pts ${DEST}/bin/pts; \ ${INSTALL_PROGRAM} pt_util ${DEST}/root.server/usr/afs/bin/pt_util; \ - ${INSTALL_PROGRAM} db_verify ${DEST}/etc/prdb_check; \ + ${INSTALL_PROGRAM} prdb_check ${DEST}/etc/prdb_check; \ fi # @@ -195,7 +195,7 @@ dest: ptserver pts pt_util db_verify clean: $(LT_CLEAN) $(RM) -f *.a *.o ptserver ptint.cs.c ptint.ss.c ptclient ptint.xdr.c ptint.h \ - pts readgroup readpwd db_verify testpt pt_util pterror.h pterror.c \ + pts readgroup readpwd prdb_check testpt pt_util pterror.h pterror.c \ core AFS_component_version_number.c Kptint.cs.c Kptint.h Kptint.xdr.c include ../config/Makefile.version diff --git a/src/tptserver/NTMakefile b/src/tptserver/NTMakefile index 6ccfd7d83..d8613df97 100644 --- a/src/tptserver/NTMakefile +++ b/src/tptserver/NTMakefile @@ -191,7 +191,7 @@ $(OUT)\pt_util.res: AFS_component_version_number.h # install pts, ptserver and mtafsprot.lib install: $(LIBFILE) $(PTSERVER) $(PTS) $(PTCLIENT) $(PT_UTIL) $(OUT)\readgroup.exe \ - $(OUT)\readpwd.exe $(OUT)\testpt.exe $(OUT)\db_verify.exe \ + $(OUT)\readpwd.exe $(OUT)\testpt.exe $(OUT)\prdb_check.exe \ $(DESTDIR)\root.server\usr\afs\bin\pts.exe \ $(DESTDIR)\root.server\usr\afs\bin\ptclient.exe \ $(DESTDIR)\root.server\usr\afs\bin\pt_util.exe \ @@ -227,7 +227,7 @@ $(INCFILEDIR)\afs\prclient.h: $(INCFILEDIR)\afs\ptclient.h # clean up clean:: - $(DEL) $(OUT)\readgroup.exe $(OUT)\readpwd.exe $(OUT)\db_verify.exe $(OUT)\testpt.exe + $(DEL) $(OUT)\readgroup.exe $(OUT)\readpwd.exe $(OUT)\prdb_check.exe $(OUT)\testpt.exe $(DEL) $(PTS) $(PTCLIENT) $(PT_UTIL) ############################################################################ @@ -238,7 +238,7 @@ TEST_OBJS = \ $(OUT)\readgroup.obj \ $(OUT)\readpwd.obj \ $(OUT)\testpt.obj \ - $(OUT)\db_verify.obj + $(OUT)\prdb_check.obj $(TEST_OBJS): $(SRC_DIR)\$$(@B).c $(C2OBJ) -I$(SRC_DIR) $** @@ -261,7 +261,7 @@ $(OUT)\testpt.exe: $(OUT)\testpt.obj $(LIBFILE) $(TEST_LIBS) $(CODESIGN_USERLAND) $(SYMSTORE_IMPORT) -$(OUT)\db_verify.exe: $(OUT)\db_verify.obj $(OUT)\pterror.obj $(OUT)\display.obj $(LIBFILE) $(TEST_LIBS) +$(OUT)\prdb_check.exe: $(OUT)\prdb_check.obj $(OUT)\pterror.obj $(OUT)\display.obj $(LIBFILE) $(TEST_LIBS) $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib shell32.lib $(_VC_MANIFEST_EMBED_EXE) $(CODESIGN_USERLAND) -- 2.11.4.GIT