From 9c9b906c8a5779c48afecfa098b15206f041665d Mon Sep 17 00:00:00 2001 From: Simon Wilkinson Date: Sun, 10 Jul 2011 10:24:26 +0100 Subject: [PATCH] Move string manipulation functions out of util Some functions in libafsutil depend upon the RX libraries, which means that pulling in other functions in this library can create a dependency upon RX. This is less than ideal for low-level libraries such as cmd and comerr. So, create a new low-level library (currently named 'opr') which can contain low-level functions from util, and elsewhere. This library should have no dependencies other than on system libraries and libroken. Change-Id: I703db3da4d8faf79ee82bf572af09d07152d9b25 Reviewed-on: http://gerrit.openafs.org/5363 Reviewed-by: Derrick Brashear Tested-by: Derrick Brashear --- Makefile.in | 7 +++++- NTMakefile | 18 +++++++++++++-- configure.ac | 1 + src/WINNT/afsd/NTMakefile | 5 ++++ src/WINNT/afssvrmgr/NTMakefile | 1 + src/WINNT/aklog/NTMakefile | 1 + src/WINNT/bosctlsvc/NTMakefile | 1 + src/WINNT/client_config/NTMakefile | 1 + src/WINNT/client_creds/NTMakefile | 1 + src/afsd/Makefile.in | 10 +++++++- src/auth/NTMakefile | 1 + src/auth/cellconfig.c | 1 + src/auth/ktc.c | 1 + src/auth/userok.c | 1 + src/auth/writeconfig.c | 1 + src/bozo/Makefile.in | 1 + src/bozo/NTMakefile | 2 ++ src/bozo/bos.c | 1 + src/bozo/fsbnodeops.c | 1 + src/bucoord/Makefile.in | 3 ++- src/bucoord/NTMakefile | 1 + src/budb/Makefile.in | 3 ++- src/budb/NTMakefile | 1 + src/butc/Makefile.in | 1 + src/butc/NTMakefile | 1 + src/butc/tcmain.c | 2 ++ src/butm/NTMakefile | 1 + src/comerr/Makefile.in | 4 ++-- src/comerr/NTMakefile | 1 + src/comerr/compile_et.c | 2 +- src/comerr/et_name.c | 2 +- src/config/NTMakefile | 3 +++ src/dviced/Makefile.in | 6 +++-- src/dviced/NTMakefile | 1 + src/dvolser/NTMakefile | 1 + src/finale/Makefile.in | 1 + src/fsprobe/Makefile.in | 4 ++-- src/kauth/Makefile.in | 2 ++ src/kauth/NTMakefile | 1 + src/kauth/admin_tools.c | 1 + src/kauth/authclient.c | 1 + src/kauth/client.c | 1 + src/kauth/kalocalcell.c | 1 + src/kauth/kaprocs.c | 1 + src/kauth/kaserver.c | 1 + src/kauth/katoken.c | 1 + src/kauth/kpasswd.c | 1 + src/kauth/krb_tf.c | 1 + src/libadmin/adminutil/NTMakefile | 1 + src/libafsauthent/NTMakefile | 2 +- src/libafsrpc/Makefile.in | 5 ++-- src/libafsrpc/NTMakefile | 3 ++- src/libuafs/Makefile.common.in | 8 +++---- src/log/Makefile.in | 9 ++++---- src/log/unlog.c | 1 + src/opr/Makefile.in | 25 ++++++++++++++++++++ src/opr/NTMakefile | 37 ++++++++++++++++++++++++++++++ src/{util => opr}/casestrcpy.c | 2 ++ src/opr/opr.h | 18 +++++++++++++++ src/ptserver/Makefile.in | 1 + src/ptserver/NTMakefile | 2 ++ src/ptserver/ptclient.c | 1 + src/ptserver/ptprocs.c | 1 + src/ptserver/ptserver.c | 1 + src/ptserver/ptuser.c | 1 + src/ptserver/readgroup.c | 1 + src/ptserver/testpt.c | 1 + src/rx/rx_pthread.c | 1 + src/rx/rx_user.c | 2 ++ src/scout/Makefile.in | 5 ++-- src/shlibafsauthent/NTMakefile | 4 ---- src/shlibafsrpc/Makefile.in | 5 ++-- src/shlibafsrpc/libafsrpc.map | 8 +++---- src/sys/Makefile.in | 3 ++- src/tbutc/NTMakefile | 1 + src/tsalvaged/Makefile.in | 6 +++-- src/tsm41/Makefile.in | 2 ++ src/tviced/NTMakefile | 1 + src/tvolser/NTMakefile | 1 + src/ubik/Makefile.in | 3 ++- src/ubik/NTMakefile | 1 + src/update/Makefile.in | 5 ++-- src/update/NTMakefile | 1 + src/update/client.c | 1 + src/update/server.c | 1 + src/uss/Makefile.in | 1 + src/util/Makefile.in | 8 ++----- src/util/NTMakefile | 2 -- src/util/afsutil_prototypes.h | 7 ------ src/util/dirpath.c | 1 + src/util/ktime.c | 1 + src/venus/Makefile.in | 14 +++++++---- src/viced/Makefile.in | 1 + src/viced/NTMakefile | 1 + src/viced/host.c | 1 + src/vlserver/Makefile.in | 1 + src/vlserver/NTMakefile | 1 + src/vol/Makefile.in | 2 +- src/vol/NTMakefile | 1 + src/vol/daemon_com.c | 1 + src/volser/Makefile.in | 12 ++++++---- src/volser/NTMakefile | 1 + 102 files changed, 263 insertions(+), 70 deletions(-) create mode 100644 src/opr/Makefile.in create mode 100644 src/opr/NTMakefile rename src/{util => opr}/casestrcpy.c (99%) create mode 100644 src/opr/opr.h diff --git a/Makefile.in b/Makefile.in index a51ad4f72..3125245c3 100644 --- a/Makefile.in +++ b/Makefile.in @@ -145,7 +145,10 @@ config: prelude procmgmt: $(DIR_roken) config +${COMPILE_PART1} procmgmt ${COMPILE_PART2} -util: $(DIR_roken) procmgmt hcrypto lwp_depinstall rx_depinstall +opr: config $(DIR_roken) + +${COMPILE_PART1} opr ${COMPILE_PART2} + +util: opr $(DIR_roken) procmgmt hcrypto lwp_depinstall rx_depinstall +${COMPILE_PART1} util ${COMPILE_PART2} libafscp: util afs volser vlserver rx auth fsint @@ -694,6 +697,7 @@ clean2: -${COMPILE_PART1} config ${COMPILE_CLEAN} -${COMPILE_PART1} procmgmt ${COMPILE_CLEAN} -${COMPILE_PART1} util ${COMPILE_CLEAN} + -${COMPILE_PART1} opr ${COMPILE_CLEAN} -${COMPILE_PART1} libafscp ${COMPILE_CLEAN} -${COMPILE_PART1} audit ${COMPILE_CLEAN} -${COMPILE_PART1} comerr ${COMPILE_CLEAN} @@ -869,6 +873,7 @@ distclean: clean src/log/test/Makefile \ src/lwp/Makefile \ src/lwp/test/Makefile \ + src/opr/Makefile \ src/packaging/Debian/changelog \ src/packaging/MacOS/OpenAFS-debug.Description.plist \ src/packaging/MacOS/OpenAFS-debug.Info.plist \ diff --git a/NTMakefile b/NTMakefile index 7198d4291..deab98b98 100644 --- a/NTMakefile +++ b/NTMakefile @@ -89,13 +89,20 @@ rx_headers: $(NTMAKE_HEADERS) $(CD) ..\.. -util_headers: roken_headers +util_headers: opr_headers @echo ***** $@ $(DOCD) $(SRC)\util $(CD) $(SRC)\util $(NTMAKE_HEADERS) $(CD) ..\.. +opr_headers: roken_headers + @echo ***** $@ + $(DOCD) $(SRC)\opr + $(CD) $(SRC)\opr + $(NTMAKE_HEADERS) + $(CD) ..\.. + roken_headers: @echo ***** $@ $(DOCD) $(SRC)\roken @@ -117,7 +124,7 @@ pthread: hcrypto_headers $(NTMAKE) $(CD) ..\..\.. -util: procmgmt_headers afsreg_headers lwp_headers rx_headers hcrypto +util: procmgmt_headers afsreg_headers lwp_headers rx_headers opr @echo ***** $@ $(DOCD) $(SRC)\$@ $(CD) $(SRC)\$@ @@ -173,6 +180,13 @@ rxgen: lwp $(NTMAKE) $(CD) ..\.. +opr: hcrypto + @echo ***** $@ + $(DOCD) $(SRC)\opr + $(CD) $(SRC)\opr + $(NTMAKE) + $(CD) ..\..\.. + hcrypto: roken @echo ***** $@ $(DOCD) $(SRC)\crypto\hcrypto diff --git a/configure.ac b/configure.ac index 56ee4c22d..478098825 100644 --- a/configure.ac +++ b/configure.ac @@ -190,6 +190,7 @@ src/log/Makefile \ src/log/test/Makefile \ src/lwp/Makefile \ src/lwp/test/Makefile \ +src/opr/Makefile \ src/packaging/Debian/changelog \ src/packaging/MacOS/OpenAFS-debug.Description.plist \ src/packaging/MacOS/OpenAFS-debug.Info.plist \ diff --git a/src/WINNT/afsd/NTMakefile b/src/WINNT/afsd/NTMakefile index 8e23f97e6..77b0a0c65 100644 --- a/src/WINNT/afsd/NTMakefile +++ b/src/WINNT/afsd/NTMakefile @@ -299,6 +299,7 @@ LOGON_DLLLIBS =\ $(DESTDIR)\lib\libafsconf.lib \ $(DESTDIR)\lib\afs\afscom_err.lib \ $(DESTDIR)\lib\afs\afsutil.lib \ + $(DESTDIR)\lib\opr.lib \ $(DESTDIR)\lib\afsroken.lib \ $(LANAHELPERLIB) \ $(AFSKFWLIB) @@ -381,6 +382,7 @@ EXELIBS = \ $(DESTDIR)\lib\afslwp.lib \ $(DESTDIR)\lib\libosi.lib \ $(DESTDIR)\lib\libafsconf.lib \ + $(DESTDIR)\lib\opr.lib \ $(DESTDIR)\lib\afshcrypto.lib \ $(DESTDIR)\lib\afsroken.lib @@ -396,12 +398,14 @@ EXELIBS2 = \ $(DESTDIR)\lib\afslwp.lib \ $(DESTDIR)\lib\libosi.lib \ $(DESTDIR)\lib\libafsconf.lib \ + $(DESTDIR)\lib\opr.lib \ $(DESTDIR)\lib\afshcrypto.lib \ $(DESTDIR)\lib\afsroken.lib EXELIBS3 = \ $(DESTDIR)\lib\afs\afscmd.lib \ $(DESTDIR)\lib\afsrxkad.lib \ + $(DESTDIR)\lib\opr.lib \ $(DESTDIR)\lib\afshcrypto.lib \ $(DESTDIR)\lib\afsroken.lib @@ -554,6 +558,7 @@ KPASSWD_LIBS =\ $(DESTDIR)\lib\afsrpc.lib \ $(DESTDIR)\lib\afs\afscmd.lib \ $(DESTDIR)\lib\afs\mtafsutil.lib \ + $(DESTDIR)\lib\opr.lib \ $(DESTDIR)\lib\afshcrypto.lib \ $(DESTDIR)\lib\afsroken.lib diff --git a/src/WINNT/afssvrmgr/NTMakefile b/src/WINNT/afssvrmgr/NTMakefile index ed45e5bc0..258732048 100644 --- a/src/WINNT/afssvrmgr/NTMakefile +++ b/src/WINNT/afssvrmgr/NTMakefile @@ -102,6 +102,7 @@ EXELIBS = \ $(DESTDIR)\lib\afs\AfsClass.lib \ $(DESTDIR)\lib\afs\TaAfsAppLib.lib \ $(DESTDIR)\lib\afs\afsutil.lib \ + $(DESTDIR)\lib\opr.lib \ $(DESTDIR)\lib\afsroken.lib ############################################################################ diff --git a/src/WINNT/aklog/NTMakefile b/src/WINNT/aklog/NTMakefile index 8cfac1d33..92a67586a 100644 --- a/src/WINNT/aklog/NTMakefile +++ b/src/WINNT/aklog/NTMakefile @@ -38,6 +38,7 @@ EXELIBS = \ $(DESTDIR)\lib\afs\afskauth.lib \ $(DESTDIR)\lib\afs\afscom_err.lib \ $(DESTDIR)\lib\afs\afsutil.lib \ + $(DESTDIR)\lib\opr.lib \ $(DESTDIR)\lib\afsroken.lib !IF "$(CPU)" == "IA64" || "$(CPU)" == "AMD64" || "$(CPU)" == "ALPHA64" diff --git a/src/WINNT/bosctlsvc/NTMakefile b/src/WINNT/bosctlsvc/NTMakefile index 9be873e5d..2c94e6f6c 100644 --- a/src/WINNT/bosctlsvc/NTMakefile +++ b/src/WINNT/bosctlsvc/NTMakefile @@ -23,6 +23,7 @@ EXELIBS =\ $(DESTDIR)\lib\afs\afseventlog.lib \ $(DESTDIR)\lib\afs\afsreg.lib \ $(DESTDIR)\lib\afs\afsprocmgmt.lib \ + $(DESTDIR)\lib\opr.lib \ $(DESTDIR)\lib\afsroken.lib \ $(DESTDIR)\lib\afsicf.obj diff --git a/src/WINNT/client_config/NTMakefile b/src/WINNT/client_config/NTMakefile index 239f6886b..19aa04736 100644 --- a/src/WINNT/client_config/NTMakefile +++ b/src/WINNT/client_config/NTMakefile @@ -69,6 +69,7 @@ EXELIBS = \ $(DESTDIR)\lib\lanahelper.lib \ $(DESTDIR)\lib\afs\afsreg.lib \ $(DESTDIR)\lib\afs\afsutil.lib \ + $(DESTDIR)\lib\opr.lib \ $(DESTDIR)\lib\afsroken.lib ############################################################################ diff --git a/src/WINNT/client_creds/NTMakefile b/src/WINNT/client_creds/NTMakefile index ca9ff933c..2e3f6d0ad 100644 --- a/src/WINNT/client_creds/NTMakefile +++ b/src/WINNT/client_creds/NTMakefile @@ -71,6 +71,7 @@ EXELIBS = \ $(DESTDIR)\lib\afskfw.lib \ $(DESTDIR)\lib\afs\afscom_err.lib \ $(DESTDIR)\lib\afs\afsutil.lib \ + $(DESTDIR)\lib\opr.lib \ $(DESTDIR)\lib\afsroken.lib diff --git a/src/afsd/Makefile.in b/src/afsd/Makefile.in index 20a23b3da..973c10a52 100644 --- a/src/afsd/Makefile.in +++ b/src/afsd/Makefile.in @@ -20,7 +20,15 @@ all: afsd vsys @ENABLE_FUSE_CLIENT@ # Programs # -AFSLIBS=${TOP_LIBDIR}/libauth.a ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/libsys.a ${TOP_LIBDIR}/util.a ${TOP_LIBDIR}/librx.a ${TOP_LIBDIR}/liblwp.a ${TOP_LIBDIR}/util.a +AFSLIBS=${TOP_LIBDIR}/libauth.a \ + ${TOP_LIBDIR}/libcmd.a \ + ${TOP_LIBDIR}/libsys.a \ + ${TOP_LIBDIR}/util.a \ + ${TOP_LIBDIR}/librx.a \ + ${TOP_LIBDIR}/liblwp.a \ + ${TOP_LIBDIR}/util.a \ + $(TOP_LIBDIR)/libopr.a + UAFSLIBS=${TOP_LIBDIR}/libuafs.a ${TOP_LIBDIR}/libafsutil.a ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/libafsutil.a FUSE_LIBS=@FUSE_LIBS@ diff --git a/src/auth/NTMakefile b/src/auth/NTMakefile index a04197774..1c5b5411b 100644 --- a/src/auth/NTMakefile +++ b/src/auth/NTMakefile @@ -94,6 +94,7 @@ EXELIBS =\ $(EXELIBDIR)\afs\afseventlog.lib \ $(EXELIBDIR)\afs\afsreg.lib \ $(EXELIBDIR)\libafsconf.lib \ + $(EXELIBDIR)\opr.lib \ $(EXELIBDIR)\afshcrypto.lib \ $(EXELIBDIR)\afsroken.lib diff --git a/src/auth/cellconfig.c b/src/auth/cellconfig.c index 896c5e7c2..46e1c7368 100644 --- a/src/auth/cellconfig.c +++ b/src/auth/cellconfig.c @@ -12,6 +12,7 @@ #include #include +#include #ifdef AFS_NT40_ENV #include diff --git a/src/auth/ktc.c b/src/auth/ktc.c index 482b6ea7a..5beb2d81c 100644 --- a/src/auth/ktc.c +++ b/src/auth/ktc.c @@ -15,6 +15,7 @@ #include #include +#include #include #include diff --git a/src/auth/userok.c b/src/auth/userok.c index b8f81662e..3630e7cdb 100644 --- a/src/auth/userok.c +++ b/src/auth/userok.c @@ -12,6 +12,7 @@ #include #include +#include #include diff --git a/src/auth/writeconfig.c b/src/auth/writeconfig.c index 3372d271f..771e0fc19 100644 --- a/src/auth/writeconfig.c +++ b/src/auth/writeconfig.c @@ -11,6 +11,7 @@ #include #include +#include #include #include diff --git a/src/bozo/Makefile.in b/src/bozo/Makefile.in index 2b32f949c..d9e326c91 100644 --- a/src/bozo/Makefile.in +++ b/src/bozo/Makefile.in @@ -35,6 +35,7 @@ LIBS= ${TOP_LIBDIR}/librx.a \ ${TOP_LIBDIR}/liblwp.a \ ${TOP_LIBDIR}/libafscom_err.a \ ${TOP_LIBDIR}/util.a \ + ${TOP_LIBDIR}/libopr.a \ ${TOP_LIBDIR}/libsys.a \ ${TOP_LIBDIR}/libprocmgmt.a \ ${TOP_LIBDIR}/libafshcrypto_lwp.a diff --git a/src/bozo/NTMakefile b/src/bozo/NTMakefile index 01df04cea..c6376cc38 100644 --- a/src/bozo/NTMakefile +++ b/src/bozo/NTMakefile @@ -68,6 +68,7 @@ BOSSERVER_EXELIBS =\ $(DESTDIR)\lib\afs\afsprocmgmt.lib \ $(DESTDIR)\lib\libafsconf.lib \ $(DESTDIR)\lib\afs\afspioctl.lib \ + $(DESTDIR)\lib\opr.lib \ $(DESTDIR)\lib\afshcrypto.lib \ $(DESTDIR)\lib\afsroken.lib @@ -106,6 +107,7 @@ BOS_EXELIBS =\ $(DESTDIR)\lib\afs\afsprocmgmt.lib \ $(DESTDIR)\lib\afs\afspioctl.lib \ $(DESTDIR)\lib\libafsconf.lib \ + $(DESTDIR)\lib\opr.lib \ $(DESTDIR)\lib\afshcrypto.lib \ $(DESTDIR)\lib\afsroken.lib diff --git a/src/bozo/bos.c b/src/bozo/bos.c index e108f225e..fe9ea215e 100644 --- a/src/bozo/bos.c +++ b/src/bozo/bos.c @@ -13,6 +13,7 @@ #include #include +#include #include diff --git a/src/bozo/fsbnodeops.c b/src/bozo/fsbnodeops.c index ed4f02d57..14a233ae4 100644 --- a/src/bozo/fsbnodeops.c +++ b/src/bozo/fsbnodeops.c @@ -12,6 +12,7 @@ #include #include +#include #include #include diff --git a/src/bucoord/Makefile.in b/src/bucoord/Makefile.in index 67ae0d8e7..d8d07d464 100644 --- a/src/bucoord/Makefile.in +++ b/src/bucoord/Makefile.in @@ -19,8 +19,9 @@ LIBS=${TOP_LIBDIR}/libbudb.a ${TOP_LIBDIR}/libbubasics.a \ ${TOP_LIBDIR}/librx.a ${TOP_LIBDIR}/libsys.a \ ${TOP_LIBDIR}/liblwp.a ${TOP_LIBDIR}/libcmd.a \ ${TOP_LIBDIR}/libafscom_err.a \ + ${TOP_LIBDIR}/util.a \ + $(TOP_LIBDIR)/libopr.a \ ${TOP_LIBDIR}/libafshcrypto_lwp.a \ - ${TOP_LIBDIR}/util.a all: ${TOP_LIBDIR}/libbxdb.a ${TOP_INCDIR}/afs/bucoord_prototypes.h ${TOP_INCDIR}/afs/bc.h backup diff --git a/src/bucoord/NTMakefile b/src/bucoord/NTMakefile index 4c6a76c4a..3085b95cc 100644 --- a/src/bucoord/NTMakefile +++ b/src/bucoord/NTMakefile @@ -91,6 +91,7 @@ EXELIBS =\ $(DESTDIR)\lib\afs\afspioctl.lib \ $(DESTDIR)\lib\afs\afsreg.lib \ $(DESTDIR)\lib\libafsconf.lib \ + $(DESTDIR)\lib\opr.lib \ $(DESTDIR)\lib\afshcrypto.lib \ $(DESTDIR)\lib\afsroken.lib diff --git a/src/budb/Makefile.in b/src/budb/Makefile.in index 4b3b77a3d..73fccb396 100644 --- a/src/budb/Makefile.in +++ b/src/budb/Makefile.in @@ -40,8 +40,9 @@ LIBS=${TOP_LIBDIR}/libbubasics.a \ ${TOP_LIBDIR}/liblwp.a \ ${TOP_LIBDIR}/libcmd.a \ ${TOP_LIBDIR}/libafscom_err.a \ + ${TOP_LIBDIR}/util.a \ + ${TOP_LIBDIR}/libopr.a \ ${TOP_LIBDIR}/libafshcrypto_lwp.a \ - ${TOP_LIBDIR}/util.a COMMON_OBJS = database.o db_alloc.o db_dump.o db_hash.o struct_ops.o ol_verify.o diff --git a/src/budb/NTMakefile b/src/budb/NTMakefile index fb01a1a8a..a396dcb7b 100644 --- a/src/budb/NTMakefile +++ b/src/budb/NTMakefile @@ -79,6 +79,7 @@ EXELIBS =\ $(DESTDIR)\lib\afs\afsprocmgmt.lib \ $(DESTDIR)\lib\libafsconf.lib \ $(DESTDIR)\lib\afs\afspioctl.lib \ + $(DESTDIR)\lib\opr.lib \ $(DESTDIR)\lib\afshcrypto.lib \ $(DESTDIR)\lib\afsroken.lib diff --git a/src/butc/Makefile.in b/src/butc/Makefile.in index d005763e6..e6c006e33 100644 --- a/src/butc/Makefile.in +++ b/src/butc/Makefile.in @@ -44,6 +44,7 @@ LIBS=${TOP_LIBDIR}/libbudb.a \ ${TOP_LIBDIR}/libafshcrypto_lwp.a \ ${TOP_LIBDIR}/libusd.a \ ${TOP_LIBDIR}/util.a \ + $(TOP_LIBDIR)/libopr.a \ ${TOP_LIBDIR}/libprocmgmt.a TESTOBJS=test.o diff --git a/src/butc/NTMakefile b/src/butc/NTMakefile index 8a4c9d355..cb9d7a7f1 100644 --- a/src/butc/NTMakefile +++ b/src/butc/NTMakefile @@ -53,6 +53,7 @@ EXELIBS =\ $(DESTDIR)\lib\afs\afseventlog.lib \ $(DESTDIR)\lib\afs\afsreg.lib \ $(DESTDIR)\lib\libafsconf.lib \ + $(DESTDIR)\lib\opr.lib \ $(DESTDIR)\lib\afshcrypto.lib \ $(DESTDIR)\lib\afsroken.lib diff --git a/src/butc/tcmain.c b/src/butc/tcmain.c index 61c28f809..de2e02021 100644 --- a/src/butc/tcmain.c +++ b/src/butc/tcmain.c @@ -11,7 +11,9 @@ #include #include + #include +#include #ifdef IGNORE_SOME_GCC_WARNINGS # pragma GCC diagnostic warning "-Wimplicit-function-declaration" diff --git a/src/butm/NTMakefile b/src/butm/NTMakefile index f18e07a07..1012849a3 100644 --- a/src/butm/NTMakefile +++ b/src/butm/NTMakefile @@ -46,6 +46,7 @@ TESTLIBS = $(DESTDIR)\lib\afslwp.lib \ $(DESTDIR)\lib\afs\afsusd.lib \ $(DESTDIR)\lib\afs\afsutil.lib \ $(DESTDIR)\lib\afs\afsbubasics.lib \ + $(DESTDIR)\lib\opr.lib \ $(DESTDIR)\lib\afsroken.lib $(OUT)\test_ftm.exe: $(OUT)\test_ftm.obj $(LIBFILE) $(TESTLIBS) diff --git a/src/comerr/Makefile.in b/src/comerr/Makefile.in index a01b952f2..5712f2e87 100644 --- a/src/comerr/Makefile.in +++ b/src/comerr/Makefile.in @@ -32,9 +32,9 @@ et_lex.lex.c: et_lex.lex.l compile_et: compile_et.o error_table.o case $(SYS_NAME) in \ *_linux* | *_umlinux* ) \ - $(AFS_LDRULE) compile_et.o error_table.o -L${TOP_LIBDIR} -lafsutil;; \ + $(AFS_LDRULE) compile_et.o error_table.o -L${TOP_LIBDIR} -lopr;; \ * ) \ - $(AFS_LDRULE) compile_et.o error_table.o -L${TOP_LIBDIR} -lafsutil -ll;; \ + $(AFS_LDRULE) compile_et.o error_table.o -L${TOP_LIBDIR} -lopr -ll;; \ esac libafscom_err.a: error_msg.o et_name.o com_err.o AFS_component_version_number.o diff --git a/src/comerr/NTMakefile b/src/comerr/NTMakefile index 7301cc23e..e855c970a 100644 --- a/src/comerr/NTMakefile +++ b/src/comerr/NTMakefile @@ -61,6 +61,7 @@ $(COMPILE_ET_EXEOBJS): $$(@B).c COMPILE_ET_EXELIBS =\ $(DESTDIR)\lib\afs\afsutil.lib \ + $(DESTDIR)\lib\opr.lib \ $(DESTDIR)\lib\afsroken.lib $(COMPILE_ET_EXEFILE): $(COMPILE_ET_EXEOBJS) $(COMPILE_ET_EXERES) $(COMPILE_ET_EXELIBS) diff --git a/src/comerr/compile_et.c b/src/comerr/compile_et.c index 666ea6d03..01d5e69d1 100644 --- a/src/comerr/compile_et.c +++ b/src/comerr/compile_et.c @@ -12,8 +12,8 @@ #include #include +#include -#include #include "mit-sipb-cr.h" #include "internal.h" #include "compiler.h" diff --git a/src/comerr/et_name.c b/src/comerr/et_name.c index fcd73f705..81d326b25 100644 --- a/src/comerr/et_name.c +++ b/src/comerr/et_name.c @@ -9,7 +9,7 @@ #include -#include +#include #include "error_table.h" #include "mit-sipb-cr.h" diff --git a/src/config/NTMakefile b/src/config/NTMakefile index 231d79b14..e24e1f7b7 100644 --- a/src/config/NTMakefile +++ b/src/config/NTMakefile @@ -109,6 +109,9 @@ idirs: doclink ! IF (!EXIST($(OJT)\libacl)) $(MKDIR) $(OJT)\libacl ! ENDIF +! IF (!EXIST($(OJT)\opr)) + $(MKDIR) $(OJT)\opr +! ENDIF ! IF (!EXIST($(OJT)\roken)) $(MKDIR) $(OJT)\roken ! ENDIF diff --git a/src/dviced/Makefile.in b/src/dviced/Makefile.in index 6ec87b5e1..3615cf81e 100644 --- a/src/dviced/Makefile.in +++ b/src/dviced/Makefile.in @@ -50,9 +50,11 @@ RXOBJS = rx_pthread.o objects= ${VICEDOBJS} ${VLSERVEROBJS} ${LWPOBJS} ${LIBACLOBJS} \ ${UTILOBJS} ${DIROBJS} ${VOLOBJS} ${FSINTOBJS} ${RXOBJS} -SDBGOBJS = state_analyzer.o uuid.o dirpath.o fileutil.o ${TOP_LIBDIR}/util.a +SDBGOBJS = state_analyzer.o uuid.o dirpath.o fileutil.o ${TOP_LIBDIR}/util.a \ + ${TOP_LIBDIR}/libopr.a -LIBS=${TOP_LIBDIR}/libafsauthent.a ${TOP_LIBDIR}/libafsrpc.a ${TOP_LIBDIR}/util.a +LIBS=${TOP_LIBDIR}/libafsauthent.a ${TOP_LIBDIR}/libafsrpc.a ${TOP_LIBDIR}/util.a \ + ${TOP_LIBDIR}/libopr.a all: dafileserver state_analyzer diff --git a/src/dviced/NTMakefile b/src/dviced/NTMakefile index a428617fa..9dcf58d9a 100644 --- a/src/dviced/NTMakefile +++ b/src/dviced/NTMakefile @@ -79,6 +79,7 @@ EXELIBS = \ $(DESTDIR)\lib\afs\daafsvol.lib \ $(DESTDIR)\lib\afs\mtafsvldb.lib \ $(DESTDIR)\lib\afspthread.lib \ + $(DESTDIR)\lib\opr.lib \ $(DESTDIR)\lib\afsroken.lib $(EXEFILE): $(EXEOBJS) $(EXELIBS) diff --git a/src/dvolser/NTMakefile b/src/dvolser/NTMakefile index 477cad286..f4e194bc9 100644 --- a/src/dvolser/NTMakefile +++ b/src/dvolser/NTMakefile @@ -91,6 +91,7 @@ VOLSERVER_EXELIBS = \ $(DESTDIR)\lib\afs\afsprocmgmt.lib \ $(DESTDIR)\lib\afs\afseventlog.lib \ $(DESTDIR)\lib\afs\mtafsutil.lib \ + $(DESTDIR)\lib\opr.lib \ $(DESTDIR)\lib\afspthread.lib \ $(DESTDIR)\lib\afsroken.lib diff --git a/src/finale/Makefile.in b/src/finale/Makefile.in index 5cab03a8b..c15415a3a 100644 --- a/src/finale/Makefile.in +++ b/src/finale/Makefile.in @@ -39,6 +39,7 @@ LIBS=${TOP_LIBDIR}/libubik.a \ ${TOP_LIBDIR}/util.a \ ${TOP_LIBDIR}/libkauth.a \ ${TOP_LIBDIR}/libprot.a \ + ${TOP_LIBDIR}/libopr.a \ ${XLIBS} all: translate_et diff --git a/src/fsprobe/Makefile.in b/src/fsprobe/Makefile.in index e7cd34d33..6b1b9e7df 100644 --- a/src/fsprobe/Makefile.in +++ b/src/fsprobe/Makefile.in @@ -25,8 +25,8 @@ LIBS=${TOP_LIBDIR}/libvolser.a ${TOP_LIBDIR}/vlib.a ${TOP_LIBDIR}/libacl.a \ ${TOP_LIBDIR}/librx.a \ ${TOP_LIBDIR}/liblwp.a \ ${TOP_LIBDIR}/libsys.a \ - ${TOP_LIBDIR}/libafshcrypto_lwp.a \ - ${TOP_LIBDIR}/util.a + ${TOP_LIBDIR}/util.a ${TOP_LIBDIR}/libopr.a \ + ${TOP_LIBDIR}/libafshcrypto_lwp.a all: ${TOP_INCDIR}/afs/fsprobe.h ${TOP_LIBDIR}/libfsprobe.a fsprobe_test diff --git a/src/kauth/Makefile.in b/src/kauth/Makefile.in index ead1d26d8..ebd615913 100644 --- a/src/kauth/Makefile.in +++ b/src/kauth/Makefile.in @@ -31,6 +31,7 @@ LIBS=${TOP_LIBDIR}/libubik.a \ ${TOP_LIBDIR}/libcmd.a \ ${TOP_LIBDIR}/libafscom_err.a \ ${TOP_LIBDIR}/libafsutil.a \ + ${TOP_LIBDIR}/libopr.a \ $(DBM) \ ${TOP_LIBDIR}/libafshcrypto_lwp.a @@ -48,6 +49,7 @@ KLIBS=${TOP_LIBDIR}/libubik.a \ ${TOP_LIBDIR}/libcmd.a \ ${TOP_LIBDIR}/libafscom_err.a \ ${TOP_LIBDIR}/libafsutil.a \ + ${TOP_LIBDIR}/libopr.a \ ${TOP_LIBDIR}/libafshcrypto_lwp.a OBJS=kauth.xdr.o kauth.cs.o kaaux.o client.o authclient.o katoken.o kautils.o kalocalcell.o kaerrors.o user.o krb_tf.o diff --git a/src/kauth/NTMakefile b/src/kauth/NTMakefile index 7a6c556ce..a1efbd94d 100644 --- a/src/kauth/NTMakefile +++ b/src/kauth/NTMakefile @@ -93,6 +93,7 @@ AFSLIBS = \ $(DESTDIR)\lib\afs\afseventlog.lib \ $(DESTDIR)\lib\afsrxkad.lib \ $(DESTDIR)\lib\libafsconf.lib \ + $(DESTDIR)\lib\opr.lib \ $(DESTDIR)\lib\afshcrypto.lib \ $(DESTDIR)\lib\afsroken.lib diff --git a/src/kauth/admin_tools.c b/src/kauth/admin_tools.c index 6509b32aa..f65c9aedf 100644 --- a/src/kauth/admin_tools.c +++ b/src/kauth/admin_tools.c @@ -17,6 +17,7 @@ #include #include +#include #include diff --git a/src/kauth/authclient.c b/src/kauth/authclient.c index 70237a699..652996c6d 100644 --- a/src/kauth/authclient.c +++ b/src/kauth/authclient.c @@ -14,6 +14,7 @@ #include #include +#include #ifdef IGNORE_SOME_GCC_WARNINGS # pragma GCC diagnostic warning "-Wstrict-prototypes" diff --git a/src/kauth/client.c b/src/kauth/client.c index 7f5015cf1..4bc8a9217 100644 --- a/src/kauth/client.c +++ b/src/kauth/client.c @@ -12,6 +12,7 @@ #include #include +#include #include #include diff --git a/src/kauth/kalocalcell.c b/src/kauth/kalocalcell.c index 68d11b499..c152db7c3 100644 --- a/src/kauth/kalocalcell.c +++ b/src/kauth/kalocalcell.c @@ -11,6 +11,7 @@ #include #include +#include #include #include diff --git a/src/kauth/kaprocs.c b/src/kauth/kaprocs.c index 5da46efbd..9d2d04e28 100644 --- a/src/kauth/kaprocs.c +++ b/src/kauth/kaprocs.c @@ -12,6 +12,7 @@ #include #include +#include #ifdef HAVE_SYS_RESOURCE_H # include diff --git a/src/kauth/kaserver.c b/src/kauth/kaserver.c index df5a485c9..4868ba0b3 100644 --- a/src/kauth/kaserver.c +++ b/src/kauth/kaserver.c @@ -12,6 +12,7 @@ #include #include +#include #ifdef AFS_NT40_ENV #include diff --git a/src/kauth/katoken.c b/src/kauth/katoken.c index 71521b0ab..0387a102c 100644 --- a/src/kauth/katoken.c +++ b/src/kauth/katoken.c @@ -16,6 +16,7 @@ #include #include +#include #ifdef UKERNEL # include "afsincludes.h" diff --git a/src/kauth/kpasswd.c b/src/kauth/kpasswd.c index 031f8953d..0ea591546 100644 --- a/src/kauth/kpasswd.c +++ b/src/kauth/kpasswd.c @@ -13,6 +13,7 @@ #include #include +#include #include diff --git a/src/kauth/krb_tf.c b/src/kauth/krb_tf.c index 9bd3eae52..ce1b2ebd9 100644 --- a/src/kauth/krb_tf.c +++ b/src/kauth/krb_tf.c @@ -48,6 +48,7 @@ #include #include +#include #include #include diff --git a/src/libadmin/adminutil/NTMakefile b/src/libadmin/adminutil/NTMakefile index 776d78d87..610893f14 100644 --- a/src/libadmin/adminutil/NTMakefile +++ b/src/libadmin/adminutil/NTMakefile @@ -141,6 +141,7 @@ DLLLIBS =\ $(DESTDIR)\lib\afs\afsutil.lib \ $(DESTDIR)\lib\afsauthent.lib \ $(DESTDIR)\lib\afs\afsreg.lib \ + $(DESTDIR)\lib\opr.lib \ $(DESTDIR)\lib\afsroken.lib !IF "$(CPU)" == "IA64" || "$(CPU)" == "AMD64" || "$(CPU)" == "ALPHA64" diff --git a/src/libafsauthent/NTMakefile b/src/libafsauthent/NTMakefile index 195f55ee6..684c6aec6 100644 --- a/src/libafsauthent/NTMakefile +++ b/src/libafsauthent/NTMakefile @@ -69,7 +69,6 @@ UBIKOBJS = \ UTILOBJS = \ $(OUT)\pthread_glock.obj \ $(OUT)\get_krbrlm.obj \ - $(OUT)\casestrcpy.obj \ $(OUT)\fileutil.obj \ $(OUT)\dirpath.obj \ $(OUT)\readdir_nt.obj @@ -147,6 +146,7 @@ DLLLIBS =\ $(DESTDIR)\lib\afslwp.lib \ $(DESTDIR)\lib\lanahelper.lib \ $(DESTDIR)\lib\libafsconf.lib \ + $(DESTDIR)\lib\opr.lib \ $(DESTDIR)\lib\afshcrypto.lib \ $(DESTDIR)\lib\afsroken.lib diff --git a/src/libafsrpc/Makefile.in b/src/libafsrpc/Makefile.in index dab6a4448..1082f429c 100644 --- a/src/libafsrpc/Makefile.in +++ b/src/libafsrpc/Makefile.in @@ -25,6 +25,7 @@ RXSTAT = ${srcdir}/../rxstat FSINT = ${srcdir}/../fsint COMERR = ${srcdir}/../comerr UTIL = ${srcdir}/../util +OPR = $(srcdir)/../opr SYS = ${srcdir}/../sys LWP = ${srcdir}/../lwp @@ -259,8 +260,8 @@ com_err.o: ${COMERR}/com_err.c $(AFS_CCRULE) $(COMERR)/com_err.c -casestrcpy.o: ${UTIL}/casestrcpy.c - $(AFS_CCRULE) $(UTIL)/casestrcpy.c +casestrcpy.o: ${OPR}/casestrcpy.c + $(AFS_CCRULE) $(OPR)/casestrcpy.c assert.o: ${UTIL}/assert.c $(AFS_CCRULE) $(UTIL)/assert.c diff --git a/src/libafsrpc/NTMakefile b/src/libafsrpc/NTMakefile index 74f2657f9..18161d302 100644 --- a/src/libafsrpc/NTMakefile +++ b/src/libafsrpc/NTMakefile @@ -46,7 +46,7 @@ LIBRXKAD_OBJS = $(OUT)\rxkad_client.obj $(OUT)\rxkad_server.obj $(OUT)\rxkad_com LIBRXKAD_REGOBJS = $(OUT)\bg-fcrypt.obj -UTILOBJS = $(OUT)\casestrcpy.obj $(OUT)\winsock_nt.obj +UTILOBJS = $(OUT)\winsock_nt.obj COMERRBJS = $(OUT)\error_msg.obj $(OUT)\et_name.obj $(OUT)\com_err.obj @@ -91,6 +91,7 @@ DLLLIBS =\ !ENDIF $(DESTDIR)\lib\afs\afsutil.lib \ $(DESTDIR)\lib\afs\afsreg.lib \ + $(DESTDIR)\lib\opr.lib \ $(DESTDIR)\lib\afshcrypto.lib \ $(DESTDIR)\lib\afsroken.lib diff --git a/src/libuafs/Makefile.common.in b/src/libuafs/Makefile.common.in index e6a382fe2..72e2aef77 100644 --- a/src/libuafs/Makefile.common.in +++ b/src/libuafs/Makefile.common.in @@ -1082,7 +1082,7 @@ $(UOBJ)/cellconfig.o: $(TOP_SRCDIR)/auth/cellconfig.c $(CRULE1) $(UOBJ)/keys.o: $(TOP_SRCDIR)/auth/keys.c $(CRULE1) -$(UOBJ)/casestrcpy.o: $(TOP_SRCDIR)/util/casestrcpy.c +$(UOBJ)/casestrcpy.o: $(TOP_SRCDIR)/opr/casestrcpy.c $(CRULE1) $(UOBJ)/dirpath.o: $(TOP_SRCDIR)/util/dirpath.c $(CRULE1) @@ -1379,7 +1379,7 @@ $(PICOBJ)/cellconfig.o: $(TOP_SRCDIR)/auth/cellconfig.c $(CRULEPIC) $(PICOBJ)/keys.o: $(TOP_SRCDIR)/auth/keys.c $(CRULEPIC) -$(PICOBJ)/casestrcpy.o: $(TOP_SRCDIR)/util/casestrcpy.c +$(PICOBJ)/casestrcpy.o: $(TOP_SRCDIR)/opr/casestrcpy.c $(CRULEPIC) $(PICOBJ)/dirpath.o: $(TOP_SRCDIR)/util/dirpath.c $(CRULEPIC) @@ -1685,7 +1685,7 @@ $(WEBOBJ)/cellconfig.o: $(TOP_SRCDIR)/auth/cellconfig.c $(CRULE2) $(WEBOBJ)/keys.o: $(TOP_SRCDIR)/auth/keys.c $(CRULE2) -$(WEBOBJ)/casestrcpy.o: $(TOP_SRCDIR)/util/casestrcpy.c +$(WEBOBJ)/casestrcpy.o: $(TOP_SRCDIR)/opr/casestrcpy.c $(CRULE1) $(WEBOBJ)/dirpath.o: $(TOP_SRCDIR)/util/dirpath.c $(CRULE1) @@ -1977,7 +1977,7 @@ $(JUAFS)/cellconfig.o: $(TOP_SRCDIR)/auth/cellconfig.c $(CRULE1) $(JUAFS)/keys.o: $(TOP_SRCDIR)/auth/keys.c $(CRULE1) -$(JUAFS)/casestrcpy.o: $(TOP_SRCDIR)/util/casestrcpy.c +$(JUAFS)/casestrcpy.o: $(TOP_SRCDIR)/opr/casestrcpy.c $(CRULE1) $(JUAFS)/dirpath.o: $(TOP_SRCDIR)/util/dirpath.c $(CRULE1) diff --git a/src/log/Makefile.in b/src/log/Makefile.in index 0a7b61347..c70f7ccf8 100644 --- a/src/log/Makefile.in +++ b/src/log/Makefile.in @@ -21,15 +21,16 @@ LIBRARIES=${TOP_LIBDIR}/libauth.a \ ${TOP_LIBDIR}/libsys.a ${TOP_LIBDIR}/librx.a \ ${TOP_LIBDIR}/libsys.a \ ${TOP_LIBDIR}/liblwp.a ${TOP_LIBDIR}/libcmd.a \ - ${TOP_LIBDIR}/libafshcrypto_lwp.a \ - ${TOP_LIBDIR}/util.a + ${TOP_LIBDIR}/util.a ${TOP_LIBDIR}/libopr.a \ + ${TOP_LIBDIR}/libafshcrypto_lwp.a + KLIBRARIES=${TOP_LIBDIR}/libauth.krb.a \ ${TOP_LIBDIR}/librxkad.a \ ${TOP_LIBDIR}/libsys.a ${TOP_LIBDIR}/librx.a \ ${TOP_LIBDIR}/libsys.a \ ${TOP_LIBDIR}/liblwp.a ${TOP_LIBDIR}/libcmd.a \ - ${TOP_LIBDIR}/libafshcrypto_lwp.a \ - ${TOP_LIBDIR}/util.a + ${TOP_LIBDIR}/util.a ${TOP_LIBDIR}/libopr.a \ + ${TOP_LIBDIR}/libafshcrypto_lwp.a # # Main targets diff --git a/src/log/unlog.c b/src/log/unlog.c index 929ab3016..9e39ce6cf 100644 --- a/src/log/unlog.c +++ b/src/log/unlog.c @@ -30,6 +30,7 @@ #include #include +#include #include diff --git a/src/opr/Makefile.in b/src/opr/Makefile.in new file mode 100644 index 000000000..d339cfc03 --- /dev/null +++ b/src/opr/Makefile.in @@ -0,0 +1,25 @@ +srcdir=@srcdir@ +include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.pthread + +objects = casestrcpy.o + +all: $(TOP_INCDIR)/afs/opr.h $(TOP_LIBDIR)/libopr.a + +libopr.a: $(objects) + -$(RM) -f $@ + $(AR) crv $@ $(objects) + $(RANLIB) $@ + +$(TOP_LIBDIR)/libopr.a: libopr.a + $(INSTALL_DATA) libopr.a $@ + +$(TOP_INCDIR)/afs/opr.h: opr.h + $(INSTALL_DATA) opr.h $@ + +install: libopr.a + $(INSTALL_DATA) libopr.a $(DESTDIR)$(libdir)/libopr.a + +dest: libopr.a + $(INSTALL_DATA) libopr.a $(DEST)/lib/libopr.a + diff --git a/src/opr/NTMakefile b/src/opr/NTMakefile new file mode 100644 index 000000000..6784827e4 --- /dev/null +++ b/src/opr/NTMakefile @@ -0,0 +1,37 @@ +# Copyright 2011, Your File System Inc +# All rights reserved +# +# This software has been released under the terms of the BSD License +# For details, see the LICENSE file in the top level source directory + +RELDIR=opr +!include ..\config\NTMakefile.$(SYS_NAME) +!include ..\config\NTMakefile.version + +INCFILEDIR = $(DESTDIR)\include\afs + +INCFILES = \ + $(INCFILEDIR)\opr.h + +LIBFILE = $(DESTDIR)\lib\opr.lib + +LIBOBJS = \ + $(OUT)\casestrcpy.obj \ + $(OUT)\AFS_component_version_number.obj + +$(LIBOBJS): $(INCFILES) + +!if !defined(NMAKE) +NTMAKE = nmake /nologo /f ntmakefile +!endif + +$(LIBFILE): $(LIBOBJS) + $(LIBARCH) + +install_headers: $(INCFILES) + +install: install_headers $(LIBFILE) + +clean:: + $(DEL) $(INCFILES) + $(DEL) $(LIBFILE) diff --git a/src/util/casestrcpy.c b/src/opr/casestrcpy.c similarity index 99% rename from src/util/casestrcpy.c rename to src/opr/casestrcpy.c index 606a898d6..7f80dedda 100644 --- a/src/util/casestrcpy.c +++ b/src/opr/casestrcpy.c @@ -14,6 +14,8 @@ #include +#include + /* Just like strncpy but shift-case in transit and forces null termination */ char * lcstring(char *d, char *s, int n) diff --git a/src/opr/opr.h b/src/opr/opr.h new file mode 100644 index 000000000..dacc70355 --- /dev/null +++ b/src/opr/opr.h @@ -0,0 +1,18 @@ +#ifndef OPENAFS_OPR_OPR_H +#define OPENAFS_OPR_OPR_H 1 + +/* casestrcpy.c */ + +#define lcstring opr_lcstring +#define ucstring opr_ucstring +#define stolower opr_stolower +#define stoupper opr_stoupper +#define strcompose opr_strcompose + +extern char *opr_lcstring(char *d, char *s, int n); +extern char *opr_ucstring(char *d, char *s, int n); +extern void opr_stolower(char *s); +extern void opr_stoupper(char *s); +extern char *opr_strcompose(char *buf, size_t len, ...); + +#endif diff --git a/src/ptserver/Makefile.in b/src/ptserver/Makefile.in index 811630bf5..c40c11d10 100644 --- a/src/ptserver/Makefile.in +++ b/src/ptserver/Makefile.in @@ -38,6 +38,7 @@ LIBS= ${TOP_LIBDIR}/libubik.a \ ${TOP_LIBDIR}/libafscom_err.a \ ${TOP_LIBDIR}/libsys.a \ ${TOP_LIBDIR}/libafsutil.a \ + ${TOP_LIBDIR}/libopr.a \ ${TOP_LIBDIR}/libafshcrypto_lwp.a diff --git a/src/ptserver/NTMakefile b/src/ptserver/NTMakefile index e571c0e8c..d6180bb91 100644 --- a/src/ptserver/NTMakefile +++ b/src/ptserver/NTMakefile @@ -71,6 +71,7 @@ PTSERVER_EXELIBS =\ $(DESTDIR)\lib\afs\afsreg.lib \ $(DESTDIR)\lib\libafsconf.lib \ $(DESTDIR)\lib\afs\afspioctl.lib \ + $(DESTDIR)\lib\opr.lib \ $(DESTDIR)\lib\afshcrypto.lib \ $(DESTDIR)\lib\afsroken.lib @@ -123,6 +124,7 @@ PTS_EXELIBS =\ $(DESTDIR)\lib\afs\afseventlog.lib \ $(DESTDIR)\lib\afs\afspioctl.lib \ $(DESTDIR)\lib\libafsconf.lib \ + $(DESTDIR)\lib\opr.lib \ $(DESTDIR)\lib\afshcrypto.lib \ $(DESTDIR)\lib\afsroken.lib diff --git a/src/ptserver/ptclient.c b/src/ptserver/ptclient.c index efae5c3a5..2ed47ed51 100644 --- a/src/ptserver/ptclient.c +++ b/src/ptserver/ptclient.c @@ -12,6 +12,7 @@ #include #include +#include #ifdef AFS_NT40_ENV #include diff --git a/src/ptserver/ptprocs.c b/src/ptserver/ptprocs.c index 570a0bdb3..35a844d88 100644 --- a/src/ptserver/ptprocs.c +++ b/src/ptserver/ptprocs.c @@ -52,6 +52,7 @@ #include #include +#include #include diff --git a/src/ptserver/ptserver.c b/src/ptserver/ptserver.c index bbf735f22..a5c5009b2 100644 --- a/src/ptserver/ptserver.c +++ b/src/ptserver/ptserver.c @@ -113,6 +113,7 @@ #include #include +#include #ifdef AFS_NT40_ENV #include diff --git a/src/ptserver/ptuser.c b/src/ptserver/ptuser.c index 63e57303a..29114cdbc 100644 --- a/src/ptserver/ptuser.c +++ b/src/ptserver/ptuser.c @@ -12,6 +12,7 @@ #include #include +#include #include #include diff --git a/src/ptserver/readgroup.c b/src/ptserver/readgroup.c index c48d135de..a4904f90e 100644 --- a/src/ptserver/readgroup.c +++ b/src/ptserver/readgroup.c @@ -11,6 +11,7 @@ #include #include +#include #ifdef AFS_NT40_ENV #include diff --git a/src/ptserver/testpt.c b/src/ptserver/testpt.c index 1b28245fd..cf8a68f4b 100644 --- a/src/ptserver/testpt.c +++ b/src/ptserver/testpt.c @@ -11,6 +11,7 @@ #include #include +#include #include #include diff --git a/src/rx/rx_pthread.c b/src/rx/rx_pthread.c index 820797658..8bf91e4ba 100644 --- a/src/rx/rx_pthread.c +++ b/src/rx/rx_pthread.c @@ -19,6 +19,7 @@ #include #include +#include #include diff --git a/src/rx/rx_user.c b/src/rx/rx_user.c index 7f0b5fa1a..4e5742871 100644 --- a/src/rx/rx_user.c +++ b/src/rx/rx_user.c @@ -16,6 +16,8 @@ #include +#include + #ifdef AFS_NT40_ENV # include #else diff --git a/src/scout/Makefile.in b/src/scout/Makefile.in index 401de74f6..53e8b2db3 100644 --- a/src/scout/Makefile.in +++ b/src/scout/Makefile.in @@ -41,8 +41,9 @@ LIBS=${TOP_LIBDIR}/libgtx.a \ ${TOP_LIBDIR}/libaudit.a \ ${TOP_LIBDIR}/libafscom_err.a \ ${TOP_LIBDIR}/liblwp.a \ - ${TOP_LIBDIR}/libafshcrypto_lwp.a \ - ${TOP_LIBDIR}/util.a + ${TOP_LIBDIR}/util.a \ + ${TOP_LIBDIR}/libopr.a \ + ${TOP_LIBDIR}/libafshcrypto_lwp.a all: scout diff --git a/src/shlibafsauthent/NTMakefile b/src/shlibafsauthent/NTMakefile index d1ab06c8f..fedb2f515 100644 --- a/src/shlibafsauthent/NTMakefile +++ b/src/shlibafsauthent/NTMakefile @@ -57,7 +57,6 @@ UBIKOBJS = \ UTILOBJS = \ $(OUT)\pthread_glock.obj \ $(OUT)\get_krbrlm.obj \ - $(OUT)\casestrcpy.obj \ $(OUT)\fileutil.obj \ $(OUT)\dirpath.obj \ $(OUT)\readdir_nt.obj @@ -171,9 +170,6 @@ fileutil.obj: $(UTIL)\fileutil.c readdir_nt.obj: $(UTIL)\readdir_nt.c $(C2OBJ) $(UTIL)\readdir_nt.c -casestrcpy.obj: $(UTIL)\casestrcpy.c - $(C2OBJ) $(UTIL)\casestrcpy.c - pthread_glock.obj: $(UTIL)\pthread_glock.c $(C2OBJ) $(UTIL)\pthread_glock.c diff --git a/src/shlibafsrpc/Makefile.in b/src/shlibafsrpc/Makefile.in index f51ff6616..a0a7403e1 100644 --- a/src/shlibafsrpc/Makefile.in +++ b/src/shlibafsrpc/Makefile.in @@ -29,6 +29,7 @@ RXSTAT = $(srcdir)/../rxstat FSINT = $(srcdir)/../fsint COMERR = $(srcdir)/../comerr UTIL = $(srcdir)/../util +OPR = $(srcdir)/../opr SYS = ${srcdir}/../sys LWP = ${srcdir}/../lwp @@ -270,8 +271,8 @@ et_name.o: ${COMERR}/et_name.c com_err.o: ${COMERR}/com_err.c $(AFS_CCRULE) $(COMERR)/com_err.c -casestrcpy.o: ${UTIL}/casestrcpy.c - $(AFS_CCRULE) $(UTIL)/casestrcpy.c +casestrcpy.o: ${OPR}/casestrcpy.c + $(AFS_CCRULE) $(OPR)/casestrcpy.c assert.o: ${UTIL}/assert.c $(AFS_CCRULE) $(UTIL)/assert.c diff --git a/src/shlibafsrpc/libafsrpc.map b/src/shlibafsrpc/libafsrpc.map index ce468e48a..41670549a 100755 --- a/src/shlibafsrpc/libafsrpc.map +++ b/src/shlibafsrpc/libafsrpc.map @@ -109,10 +109,10 @@ RXSTATS_ClearPeerRPCStats; TM_GetTimeOfDay; FT_GetTimeOfDay; - strcompose; - stolower; - ucstring; - lcstring; + opr_strcompose; + opr_stolower; + opr_ucstring; + opr_lcstring; AssertionFailed; rx_GetLocalPeers; rx_GetMaxReceiveWindow; diff --git a/src/sys/Makefile.in b/src/sys/Makefile.in index ee64977eb..8161579e2 100644 --- a/src/sys/Makefile.in +++ b/src/sys/Makefile.in @@ -17,7 +17,8 @@ LIBS=libsys.a \ ${TOP_LIBDIR}/librx.a \ libsys.a \ ${TOP_LIBDIR}/liblwp.a \ - ${TOP_LIBDIR}/util.a \ + $(TOP_LIBDIR)/libafsutil.a \ + ${TOP_LIBDIR}/libopr.a \ ${TOP_LIBDIR}/libafshcrypto_lwp.a \ ${XLIBS} diff --git a/src/tbutc/NTMakefile b/src/tbutc/NTMakefile index 3d362c6ab..4eb24e2ad 100644 --- a/src/tbutc/NTMakefile +++ b/src/tbutc/NTMakefile @@ -81,6 +81,7 @@ BUTCLIBS=$(DESTDIR)\lib\afs\afsbudb.lib \ $(DESTDIR)\lib\afspthread.lib \ $(DESTDIR)\lib\afsauthent.lib \ $(DESTDIR)\lib\libafsconf.lib \ + $(DESTDIR)\lib\opr.lib \ $(DESTDIR)\lib\afshcrypto.lib \ $(DESTDIR)\lib\afsroken.lib diff --git a/src/tsalvaged/Makefile.in b/src/tsalvaged/Makefile.in index 72a74dc39..b4346df0d 100644 --- a/src/tsalvaged/Makefile.in +++ b/src/tsalvaged/Makefile.in @@ -53,7 +53,8 @@ SSSDEBUG_OBJS = salvsync-debug.o physio.o common.o ${UTILOBJS} ${VLIBOBJS} ${DIR LIBS= ${TOP_LIBDIR}/libafsauthent.a \ ${TOP_LIBDIR}/libafsrpc.a \ ${TOP_LIBDIR}/util.a \ - ${TOP_LIBDIR}/libcmd.a + ${TOP_LIBDIR}/libcmd.a \ + ${TOP_LIBDIR}/libopr.a SLIBS= ${TOP_LIBDIR}/libcmd.a \ ${TOP_LIBDIR}/libdir.a \ @@ -61,7 +62,8 @@ SLIBS= ${TOP_LIBDIR}/libcmd.a \ ${TOP_LIBDIR}/liblwp.a \ ${TOP_LIBDIR}/libsys.a \ ${TOP_LIBDIR}/libacl.a \ - ${TOP_LIBDIR}/util.a + ${TOP_LIBDIR}/util.a \ + ${TOP_LIBDIR}/libopr.a all: salvageserver dafssync-debug salvsync-debug dasalvager diff --git a/src/tsm41/Makefile.in b/src/tsm41/Makefile.in index 6b92a3c17..a8f72bb38 100644 --- a/src/tsm41/Makefile.in +++ b/src/tsm41/Makefile.in @@ -24,6 +24,7 @@ AFSLIBS = \ ${TOP_LIBDIR}/libcmd.a \ ${TOP_LIBDIR}/libafscom_err.a \ ${TOP_LIBDIR}/util.a \ + ${TOP_LIBDIR}/libopr.a \ ${TOP_LIBDIR}/libaudit.a KAFSLIBS = \ @@ -39,6 +40,7 @@ KAFSLIBS = \ ${TOP_LIBDIR}/libcmd.a \ ${TOP_LIBDIR}/libafscom_err.a \ ${TOP_LIBDIR}/util.a \ + ${TOP_LIBDIR}/libopr.a \ ${TOP_LIBDIR}/libaudit.a AUTH_OBJS = \ diff --git a/src/tviced/NTMakefile b/src/tviced/NTMakefile index d1375b7a3..557338298 100644 --- a/src/tviced/NTMakefile +++ b/src/tviced/NTMakefile @@ -81,6 +81,7 @@ EXELIBS = \ $(DESTDIR)\lib\afs\mtafsvol.lib \ $(DESTDIR)\lib\afs\mtafsvldb.lib \ $(DESTDIR)\lib\afs\mtafsdir.lib \ + $(DESTDIR)\lib\opr.lib \ $(DESTDIR)\lib\afspthread.lib \ $(DESTDIR)\lib\afsroken.lib diff --git a/src/tvolser/NTMakefile b/src/tvolser/NTMakefile index cd9906e32..6a0262d5c 100644 --- a/src/tvolser/NTMakefile +++ b/src/tvolser/NTMakefile @@ -93,6 +93,7 @@ VOLSERVER_EXELIBS = \ $(DESTDIR)\lib\afs\afsprocmgmt.lib \ $(DESTDIR)\lib\afs\afseventlog.lib \ $(DESTDIR)\lib\afs\mtafsutil.lib \ + $(DESTDIR)\lib\opr.lib \ $(DESTDIR)\lib\afspthread.lib \ $(DESTDIR)\lib\afshcrypto.lib \ $(DESTDIR)\lib\afsroken.lib diff --git a/src/ubik/Makefile.in b/src/ubik/Makefile.in index 007662387..b1b435804 100644 --- a/src/ubik/Makefile.in +++ b/src/ubik/Makefile.in @@ -20,7 +20,8 @@ INCLS=${TOP_INCDIR}/lwp.h ${TOP_INCDIR}/lock.h \ LIBS=${TOP_LIBDIR}/librx.a ${TOP_LIBDIR}/liblwp.a \ ${TOP_LIBDIR}/libafscom_err.a ${TOP_LIBDIR}/libcmd.a \ - ${TOP_LIBDIR}/util.a ${TOP_LIBDIR}/libsys.a ${XLIBS} + ${TOP_LIBDIR}/libsys.a ${TOP_LIBDIR}/libopr.a \ + $(TOP_LIBDIR)/libafsutil.a ${XLIBS} all: depinstall ${TOP_LIBDIR}/libubik.a udebug utst_server utst_client diff --git a/src/ubik/NTMakefile b/src/ubik/NTMakefile index 05170c3de..d1ccf56fc 100644 --- a/src/ubik/NTMakefile +++ b/src/ubik/NTMakefile @@ -136,6 +136,7 @@ UDBG_EXELIBS =\ $(DESTDIR)\lib\afs\afscom_err.lib \ $(DESTDIR)\lib\afs\afscmd.lib \ $(DESTDIR)\lib\afs\afsutil.lib \ + $(DESTDIR)\lib\opr.lib \ $(DESTDIR)\lib\afsroken.lib diff --git a/src/update/Makefile.in b/src/update/Makefile.in index e7b52a299..96fb5d1e3 100644 --- a/src/update/Makefile.in +++ b/src/update/Makefile.in @@ -17,8 +17,9 @@ LIBS=${TOP_LIBDIR}/libauth.a \ ${TOP_LIBDIR}/librx.a \ ${TOP_LIBDIR}/liblwp.a \ ${TOP_LIBDIR}/libafscom_err.a \ - ${TOP_LIBDIR}/libafshcrypto_lwp.a \ - ${TOP_LIBDIR}/util.a + ${TOP_LIBDIR}/util.a \ + ${TOP_LIBDIR}/libopr.a \ + ${TOP_LIBDIR}/libafshcrypto_lwp.a all: upserver upclient diff --git a/src/update/NTMakefile b/src/update/NTMakefile index a1529ed77..baf6e1486 100644 --- a/src/update/NTMakefile +++ b/src/update/NTMakefile @@ -23,6 +23,7 @@ LIBS = \ $(DESTDIR)\lib\afs\afsprocmgmt.lib \ $(DESTDIR)\lib\libafsconf.lib \ $(DESTDIR)\lib\afs\afspioctl.lib \ + $(DESTDIR)\lib\opr.lib \ $(DESTDIR)\lib\afshcrypto.lib \ $(DESTDIR)\lib\afsroken.lib diff --git a/src/update/client.c b/src/update/client.c index d63a3d343..a9be509a7 100644 --- a/src/update/client.c +++ b/src/update/client.c @@ -13,6 +13,7 @@ #include #include +#include #ifdef AFS_NT40_ENV #include diff --git a/src/update/server.c b/src/update/server.c index e4846a5ee..bd0c7c13e 100644 --- a/src/update/server.c +++ b/src/update/server.c @@ -13,6 +13,7 @@ #include #include +#include #ifdef AFS_NT40_ENV #include diff --git a/src/uss/Makefile.in b/src/uss/Makefile.in index 5076b6614..0fe78676d 100644 --- a/src/uss/Makefile.in +++ b/src/uss/Makefile.in @@ -29,6 +29,7 @@ LIBS=${TOP_LIBDIR}/libvolser.a \ ${TOP_LIBDIR}/libcmd.a \ ${TOP_LIBDIR}/libafscom_err.a \ ${TOP_LIBDIR}/util.a \ + ${TOP_LIBDIR}/libopr.a \ ${TOP_LIBDIR}/libafshcrypto_lwp.a OBJS = uss_procs.o \ diff --git a/src/util/Makefile.in b/src/util/Makefile.in index 80ae6918f..9c1b17c67 100644 --- a/src/util/Makefile.in +++ b/src/util/Makefile.in @@ -12,7 +12,7 @@ include @TOP_OBJDIR@/src/config/Makefile.lwp HELPER_SPLINT=@HELPER_SPLINT@ -objects = assert.o base64.o casestrcpy.o config_file.o ktime.o volparse.o \ +objects =assert.o base64.o config_file.o ktime.o volparse.o \ hostparse.o exec.o \ hputil.o kreltime.o get_krbrlm.o uuid.o serverLog.o \ dirpath.o fileutil.o netutils.o flipbase64.o fstab.o \ @@ -22,7 +22,6 @@ objects = assert.o base64.o casestrcpy.o config_file.o ktime.o volparse.o \ objects_pic = \ assert_pic.o \ base64_pic.o \ - casestrcpy_pic.o \ config_file_pic.o \ ktime_pic.o \ volparse_pic.o \ @@ -203,9 +202,6 @@ assert_pic.o: ${srcdir}/assert.c ${includes} base64_pic.o: ${srcdir}/base64.c ${includes} $(SHD_CCRULE) ${srcdir}/base64.c -casestrcpy_pic.o: ${srcdir}/casestrcpy.c ${includes} - $(SHD_CCRULE) ${srcdir}/casestrcpy.c - config_file_pic.o: ${TOP_SRCDIR}/external/heimdal/krb5/config_file.c krb5_locl.h $(SHD_CCRULE) ${TOP_SRCDIR}/external/heimdal/krb5/config_file.c @@ -346,7 +342,7 @@ include ../config/Makefile.version check-splint: sh $(HELPER_SPLINT) $(CFLAGS) \ - assert.c base64.c casestrcpy.c ktime.c volparse.c hostparse.c \ + base64.c ktime.c volparse.c hostparse.c \ hputil.c kreltime.c get_krbrlm.c uuid.c serverLog.c \ dirpath.c fileutil.c netutils.c flipbase64.c \ afs_atomlist.c afs_lhash.c fstab.c diff --git a/src/util/NTMakefile b/src/util/NTMakefile index 514fb226d..9285da87b 100644 --- a/src/util/NTMakefile +++ b/src/util/NTMakefile @@ -45,7 +45,6 @@ MT_LIBFILE = $(DESTDIR)\lib\afs\mtafsutil.lib LIBOBJS = \ $(OUT)\assert.obj \ $(OUT)\base32.obj \ - $(OUT)\casestrcpy.obj \ $(OUT)\get_krbrlm.obj \ $(OUT)\hostparse.obj \ $(OUT)\krb5_nt.obj \ @@ -66,7 +65,6 @@ LIBOBJS = \ MT_LIBOBJS = \ $(OUT)\assert.obj \ $(OUT)\base32.obj \ - $(OUT)\casestrcpy.obj \ $(OUT)\get_krbrlm.obj \ $(OUT)\hostparse.obj \ $(OUT)\krb5_nt.obj \ diff --git a/src/util/afsutil_prototypes.h b/src/util/afsutil_prototypes.h index 58c7b6acc..25f92cb78 100644 --- a/src/util/afsutil_prototypes.h +++ b/src/util/afsutil_prototypes.h @@ -32,13 +32,6 @@ extern int base32_to_int(char *s); extern char *int_to_base64(b64_string_t s, int a); extern int base64_to_int(char *s); -/* casestrcpy.c */ -extern char *lcstring(char *d, char *s, int n); -extern char *ucstring(char *d, char *s, int n); -extern char *strcompose(char *buf, size_t len, ...); -extern void stolower(char *s); -extern void stoupper(char *s); - /* config_file.c && krb5_locl.h */ typedef struct afs_config_section_struct afs_config_section; extern int afs_config_parse_file_multi(const char *, afs_config_section **); diff --git a/src/util/dirpath.c b/src/util/dirpath.c index 5a1a7d3e6..dd894b015 100644 --- a/src/util/dirpath.c +++ b/src/util/dirpath.c @@ -11,6 +11,7 @@ #include #include +#include #include #include diff --git a/src/util/ktime.c b/src/util/ktime.c index eec1f3be9..f15ee289d 100644 --- a/src/util/ktime.c +++ b/src/util/ktime.c @@ -11,6 +11,7 @@ #include #include +#include #include diff --git a/src/venus/Makefile.in b/src/venus/Makefile.in index 023054ac0..04d78f539 100644 --- a/src/venus/Makefile.in +++ b/src/venus/Makefile.in @@ -29,7 +29,8 @@ AFSIO_LIBS=${TOP_LIBDIR}/libafscp.a \ ${TOP_LIBDIR}/libafsauthent.a \ ${TOP_LIBDIR}/libafsrpc.a \ ${TOP_LIBDIR}/libcmd.a \ - $(TOP_LIBDIR)/libafsutil.a + $(TOP_LIBDIR)/libafsutil.a \ + $(TOP_LIBDIR)/libopr.a FSLIBS=${TOP_LIBDIR}/libsys.a \ ${TOP_LIBDIR}/libvldb.a \ @@ -44,8 +45,9 @@ FSLIBS=${TOP_LIBDIR}/libsys.a \ ${TOP_LIBDIR}/libsys.a \ ${TOP_LIBDIR}/liblwp.a \ ${TOP_LIBDIR}/libaudit.a \ + $(TOP_LIBDIR)/libafsutil.a \ + $(TOP_LIBDIR)/libopr.a \ ${TOP_LIBDIR}/libafshcrypto_lwp.a \ - $(TOP_LIBDIR)/libafsutil.a CMLIBS=${TOP_LIBDIR}/libsys.a \ ${TOP_LIBDIR}/libafsint.a \ @@ -56,6 +58,7 @@ CMLIBS=${TOP_LIBDIR}/libsys.a \ ${TOP_LIBDIR}/librx.a \ ${TOP_LIBDIR}/libsys.a \ ${TOP_LIBDIR}/liblwp.a \ + $(TOP_LIBDIR)/libopr.a \ $(TOP_LIBDIR)/libafsutil.a LIBS = ${FSLIBS} @@ -124,13 +127,14 @@ fstrace.o: fstrace.c AFS_component_version_number.c fstrace: fstrace.o case ${SYS_NAME} in \ sun4_411 | sun4c_411 | sun4m_412 ) \ - ${CCXPG2} ${AFS_CFLAGS} -o fstrace fstrace.o ${TOP_LIBDIR}/libsys.a ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/util.a ;; \ + ${CCXPG2} ${AFS_CFLAGS} -o fstrace fstrace.o ${TOP_LIBDIR}/libsys.a ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/util.a $(TOP_LIBDIR)/libopr.a;; \ sun*_4* ) \ - ${CC} -L/usr/xpg2lib -L/usr/5lib ${AFS_CFLAGS} -g -o fstrace fstrace.o ${TOP_LIBDIR}/libsys.a ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/util.a -lxpg ;; \ + ${CC} -L/usr/xpg2lib -L/usr/5lib ${AFS_CFLAGS} -g -o fstrace fstrace.o ${TOP_LIBDIR}/libsys.a ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/util.a $(TOP_LIBDIR)/libopr.a -lxpg ;; \ * ) \ $(AFS_LDRULE) fstrace.o ${TOP_LIBDIR}/libsys.a \ ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/util.a \ - ${XLIBS} $(LIB_roken);; \ + $(TOP_LIBDIR)/libopr.a ${XLIBS} \ + $(LIB_roken);; \ esac cmdebug.o: cmdebug.c ${INCLS} AFS_component_version_number.c diff --git a/src/viced/Makefile.in b/src/viced/Makefile.in index 4391e9e93..a8a4148c1 100644 --- a/src/viced/Makefile.in +++ b/src/viced/Makefile.in @@ -29,6 +29,7 @@ LIBS=${TOP_LIBDIR}/libacl.a \ ${TOP_LIBDIR}/libafscom_err.a \ ${TOP_LIBDIR}/liblwp.a \ ${TOP_LIBDIR}/libafsutil.a \ + $(TOP_LIBDIR)/libopr.a \ ${TOP_LIBDIR}/libafshcrypto_lwp.a headers=${TOP_INCDIR}/lwp.h \ diff --git a/src/viced/NTMakefile b/src/viced/NTMakefile index e613ad9ea..aca371376 100644 --- a/src/viced/NTMakefile +++ b/src/viced/NTMakefile @@ -60,6 +60,7 @@ EXELIBS = \ $(DESTDIR)\lib\afs\afsprocmgmt.lib \ $(DESTDIR)\lib\afs\afseventlog.lib \ $(DESTDIR)\lib\afs\afspioctl.lib \ + $(DESTDIR)\lib\opr.lib \ $(DESTDIR)\lib\afshcrypto.lib \ $(DESTDIR)\lib\afsroken.lib diff --git a/src/viced/host.c b/src/viced/host.c index ac9ec9c1b..fab7fcb95 100644 --- a/src/viced/host.c +++ b/src/viced/host.c @@ -14,6 +14,7 @@ #include #include +#include #ifdef HAVE_SYS_FILE_H #include diff --git a/src/vlserver/Makefile.in b/src/vlserver/Makefile.in index e70b02f2c..548bc78bd 100644 --- a/src/vlserver/Makefile.in +++ b/src/vlserver/Makefile.in @@ -31,6 +31,7 @@ LIBS=\ ${TOP_LIBDIR}/libcmd.a \ ${TOP_LIBDIR}/libsys.a \ ${TOP_LIBDIR}/libafsutil.a \ + $(TOP_LIBDIR)/libopr.a \ ${TOP_LIBDIR}/libafshcrypto_lwp.a OBJS=vldbint.xdr.o vldbint.cs.o vl_errors.o diff --git a/src/vlserver/NTMakefile b/src/vlserver/NTMakefile index 561ee9e25..412bc1932 100644 --- a/src/vlserver/NTMakefile +++ b/src/vlserver/NTMakefile @@ -90,6 +90,7 @@ VLSERVER_EXECLIBS = \ $(DESTDIR)\lib\afs\afsprocmgmt.lib \ $(DESTDIR)\lib\libafsconf.lib \ $(DESTDIR)\lib\afs\afspioctl.lib \ + $(DESTDIR)\lib\opr.lib \ $(DESTDIR)\lib\afshcrypto.lib \ $(DESTDIR)\lib\afsroken.lib diff --git a/src/vol/Makefile.in b/src/vol/Makefile.in index 6ec97d7cd..fd7bf9e4a 100644 --- a/src/vol/Makefile.in +++ b/src/vol/Makefile.in @@ -16,7 +16,7 @@ HELPER_SPLINT=@HELPER_SPLINT@ LIBS=${TOP_LIBDIR}/libcmd.a vlib.a ${TOP_LIBDIR}/util.a \ ${TOP_LIBDIR}/libdir.a ${TOP_LIBDIR}/librx.a \ ${TOP_LIBDIR}/liblwp.a ${TOP_LIBDIR}/libsys.a \ - ${TOP_LIBDIR}/libacl.a + ${TOP_LIBDIR}/libacl.a ${TOP_LIBDIR}/libopr.a MODULE_CFLAGS= -D${SYS_NAME} ${FSINCLUDES} \ -DFSSYNC_BUILD_SERVER -DFSSYNC_BUILD_CLIENT diff --git a/src/vol/NTMakefile b/src/vol/NTMakefile index ef1340bb5..d3605c32b 100644 --- a/src/vol/NTMakefile +++ b/src/vol/NTMakefile @@ -183,6 +183,7 @@ EXEC_LIBS = \ $(DESTDIR)\lib\afs\afsprocmgmt.lib \ $(DESTDIR)\lib\afs\afseventlog.lib \ $(DESTDIR)\lib\afspthread.lib \ + $(DESTDIR)\lib\opr.lib \ $(DESTDIR)\lib\afsroken.lib ############################################################################ diff --git a/src/vol/daemon_com.c b/src/vol/daemon_com.c index 44d182440..07094a52a 100644 --- a/src/vol/daemon_com.c +++ b/src/vol/daemon_com.c @@ -22,6 +22,7 @@ #include #include +#include #include #include diff --git a/src/volser/Makefile.in b/src/volser/Makefile.in index b8db42c89..112e68a87 100644 --- a/src/volser/Makefile.in +++ b/src/volser/Makefile.in @@ -39,23 +39,25 @@ LIBS=\ ${TOP_LIBDIR}/libafscom_err.a \ ${TOP_LIBDIR}/libkauth.a \ ${TOP_LIBDIR}/libusd.a \ - ${TOP_LIBDIR}/libafshcrypto_lwp.a \ - ${TOP_LIBDIR}/util.a + ${TOP_LIBDIR}/util.a \ + ${TOP_LIBDIR}/libopr.a \ + ${TOP_LIBDIR}/libafshcrypto_lwp.a VOLDUMP_LIBS = \ ../vol/ihandle.o \ ../vol/physio.o \ ../vol/vlib.a \ ${TOP_LIBDIR}/libcmd.a \ - ${TOP_LIBDIR}/util.a \ ${TOP_LIBDIR}/libafscom_err.a \ ${TOP_LIBDIR}/libdir.a \ ${TOP_LIBDIR}/librx.a \ ${TOP_LIBDIR}/liblwp.a \ ${TOP_LIBDIR}/libsys.a \ - ${TOP_LIBDIR}/libacl.a + ${TOP_LIBDIR}/libacl.a \ + ${TOP_LIBDIR}/util.a \ + $(TOP_LIBDIR)/libopr.a -VSOBJS=vsprocs.o vsutils.o lockprocs.o volint.xdr.o volerr.o +VSOBJS=vsutils.o vsprocs.o lockprocs.o volint.xdr.o volerr.o SOBJS=volmain.o volprocs.o physio.o common.o voltrans.o volerr.o \ volint.cs.o dumpstuff.o volint.ss.o volint.xdr.o vol_split.o diff --git a/src/volser/NTMakefile b/src/volser/NTMakefile index 7c42e0807..990f8cfc8 100644 --- a/src/volser/NTMakefile +++ b/src/volser/NTMakefile @@ -73,6 +73,7 @@ EXEC_LIBS = \ $(DESTDIR)\lib\afs\afseventlog.lib \ $(DESTDIR)\lib\libafsconf.lib \ $(DESTDIR)\lib\afs\afspioctl.lib \ + $(DESTDIR)\lib\opr.lib \ $(DESTDIR)\lib\afshcrypto.lib \ $(DESTDIR)\lib\afsroken.lib -- 2.39.5