From e2b4fde0b5850e42cb0ed00852f581fb7d24f8ff Mon Sep 17 00:00:00 2001 From: Simon Wilkinson Date: Sat, 30 Oct 2010 15:17:09 +0100 Subject: [PATCH] libroken: Build on windows A minimal change set to get libroken to build on Windows. Sadly, libroken contains definitions for a number of platform compatibility macros which were previously scattered throughout the windows code. These scattered macros have to be removed in order to build libroken. The impact of this removal is that a very large number of files throughout the tree require the addition of "roken.h" to pick up the new compatibility code. The bulk of this change is adding these includes. In addition, some of the added includes add roken dependencies to the Unix build. So, also add libroken to the build rules in affected Unix Makefiles. Change-Id: Ifba431bd37e67b1e273fbc6f69b805a232193456 Reviewed-on: http://gerrit.openafs.org/3205 Tested-by: BuildBot Reviewed-by: Derrick Brashear --- NTMakefile | 18 +++- src/WINNT/afsadmsvr/TaAfsAdmSvr.cpp | 2 + src/WINNT/afsadmsvr/TaAfsAdmSvrCallback.cpp | 2 + src/WINNT/afsadmsvr/TaAfsAdmSvrCell.cpp | 2 + src/WINNT/afsadmsvr/TaAfsAdmSvrDebug.cpp | 2 + src/WINNT/afsadmsvr/TaAfsAdmSvrGeneral.cpp | 2 + src/WINNT/afsadmsvr/TaAfsAdmSvrGroup.cpp | 2 + src/WINNT/afsadmsvr/TaAfsAdmSvrMain.cpp | 2 + src/WINNT/afsadmsvr/TaAfsAdmSvrProperties.cpp | 2 + src/WINNT/afsadmsvr/TaAfsAdmSvrSearch.cpp | 2 + src/WINNT/afsadmsvr/TaAfsAdmSvrUser.cpp | 2 + src/WINNT/afsapplib/al_browse.cpp | 3 + src/WINNT/afsapplib/al_creds.cpp | 2 + src/WINNT/afsapplib/al_dynlink.cpp | 2 + src/WINNT/afsapplib/al_misc.cpp | 2 + src/WINNT/afsclass/afsclassfn.cpp | 2 + src/WINNT/afsclass/c_agg.cpp | 2 + src/WINNT/afsclass/c_cell.cpp | 2 + src/WINNT/afsclass/c_grp.cpp | 2 + src/WINNT/afsclass/c_ident.cpp | 2 + src/WINNT/afsclass/c_identlist.cpp | 2 + src/WINNT/afsclass/c_notify.cpp | 2 + src/WINNT/afsclass/c_set.cpp | 2 + src/WINNT/afsclass/c_svc.cpp | 2 + src/WINNT/afsclass/c_svr.cpp | 2 + src/WINNT/afsclass/c_usr.cpp | 2 + src/WINNT/afsclass/internal.cpp | 2 + src/WINNT/afsclass/worker.cpp | 2 + src/WINNT/afsd/NTMakefile | 10 +- src/WINNT/afsd/afscpcc.c | 4 + src/WINNT/afsd/afsd_eventlog.c | 4 + src/WINNT/afsd/afsd_flushvol.c | 3 + src/WINNT/afsd/afsd_init.c | 4 + src/WINNT/afsd/afsd_service.c | 4 + src/WINNT/afsd/afskfw.c | 4 + src/WINNT/afsd/afslogon.c | 5 +- src/WINNT/afsd/cklog.c | 4 + src/WINNT/afsd/cm_access.c | 3 + src/WINNT/afsd/cm_aclent.c | 3 + src/WINNT/afsd/cm_btree.c | 4 + src/WINNT/afsd/cm_buf.c | 3 + src/WINNT/afsd/cm_callback.c | 3 + src/WINNT/afsd/cm_cell.c | 3 + src/WINNT/afsd/cm_config.c | 6 +- src/WINNT/afsd/cm_conn.c | 3 + src/WINNT/afsd/cm_daemon.c | 3 + src/WINNT/afsd/cm_dcache.c | 4 + src/WINNT/afsd/cm_dir.c | 3 + src/WINNT/afsd/cm_dnlc.c | 3 + src/WINNT/afsd/cm_dns.c | 4 + src/WINNT/afsd/cm_freelance.c | 3 + src/WINNT/afsd/cm_ioctl.c | 3 + src/WINNT/afsd/cm_memmap.c | 5 + src/WINNT/afsd/cm_performance.c | 4 + src/WINNT/afsd/cm_rpc.c | 3 + src/WINNT/afsd/cm_scache.c | 3 + src/WINNT/afsd/cm_server.c | 3 + src/WINNT/afsd/cm_user.c | 4 + src/WINNT/afsd/cm_utils.c | 3 + src/WINNT/afsd/cm_vnodeops.c | 3 + src/WINNT/afsd/cm_volstat.c | 3 + src/WINNT/afsd/cm_volume.c | 3 + src/WINNT/afsd/ctokens.c | 4 + src/WINNT/afsd/cunlog.c | 3 + src/WINNT/afsd/fs.c | 3 + src/WINNT/afsd/fs_utils.c | 3 + src/WINNT/afsd/msrpc.c | 4 + src/WINNT/afsd/rawops.c | 4 + src/WINNT/afsd/rpc_srvsvc.c | 5 + src/WINNT/afsd/rpc_wkssvc.c | 5 + src/WINNT/afsd/smb.c | 3 + src/WINNT/afsd/smb3.c | 3 + src/WINNT/afsd/smb_ioctl.c | 3 + src/WINNT/afsd/smb_rpc.c | 3 + src/WINNT/afsd/symlink.c | 3 + src/WINNT/afsreg/afssw.c | 2 +- src/WINNT/afssvrcfg/admin_info_dlg.cpp | 2 + src/WINNT/afssvrcfg/afscfg.cpp | 2 + src/WINNT/afssvrcfg/backup_server_page.cpp | 2 + src/WINNT/afssvrcfg/cfg_utils.cpp | 2 + src/WINNT/afssvrcfg/config_server_page.cpp | 2 + src/WINNT/afssvrcfg/create_partition_dlg.cpp | 2 + src/WINNT/afssvrcfg/db_server_page.cpp | 2 + src/WINNT/afssvrcfg/file_server_page.cpp | 2 + src/WINNT/afssvrcfg/get_cur_config.cpp | 2 + src/WINNT/afssvrcfg/get_pw_dlg.cpp | 2 + src/WINNT/afssvrcfg/graphics.cpp | 2 + src/WINNT/afssvrcfg/info2_page.cpp | 2 + src/WINNT/afssvrcfg/info_page.cpp | 2 + src/WINNT/afssvrcfg/intro_page.cpp | 2 + src/WINNT/afssvrcfg/logfile.cpp | 2 + src/WINNT/afssvrcfg/partition_page.cpp | 2 + src/WINNT/afssvrcfg/partition_utils.cpp | 2 + src/WINNT/afssvrcfg/partitions_page.cpp | 2 + src/WINNT/afssvrcfg/replicatition_page.cpp | 2 + src/WINNT/afssvrcfg/root_afs_page.cpp | 2 + src/WINNT/afssvrcfg/salvage_dlg.cpp | 2 + src/WINNT/afssvrcfg/salvage_results_dlg.cpp | 6 ++ src/WINNT/afssvrcfg/services_page.cpp | 2 + src/WINNT/afssvrcfg/sys_control_page.cpp | 2 + src/WINNT/afssvrcfg/toolbox.cpp | 2 + src/WINNT/afssvrcfg/validation.cpp | 6 ++ src/WINNT/afssvrcfg/volume_utils.cpp | 2 + src/WINNT/afssvrmgr/creds.cpp | 2 + src/WINNT/aklog/NTMakefile | 4 +- src/WINNT/aklog/aklog.c | 4 + src/WINNT/client_config/drivemap.cpp | 2 + src/WINNT/client_config/tab_general.cpp | 2 + src/WINNT/client_config/tab_hosts.cpp | 2 + src/WINNT/client_creds/advtab.cpp | 2 + src/WINNT/client_creds/afswiz.cpp | 2 + src/WINNT/client_creds/creds.cpp | 4 +- src/WINNT/client_creds/credstab.cpp | 2 + src/WINNT/client_creds/ipaddrchg.c | 5 + src/WINNT/client_creds/main.cpp | 2 + src/WINNT/client_creds/misc.cpp | 2 + src/WINNT/client_creds/mounttab.cpp | 3 + src/WINNT/client_creds/settings.cpp | 2 + src/WINNT/client_creds/shortcut.cpp | 2 + src/WINNT/client_creds/trayicon.cpp | 2 + src/WINNT/client_creds/window.cpp | 2 + src/WINNT/client_exp/gui2fs.cpp | 2 + src/WINNT/client_exp/klog_dlg.cpp | 3 +- src/WINNT/client_exp/unlog_dlg.cpp | 2 + src/WINNT/netidmgr_plugin/afsconfigdlg.c | 4 + src/WINNT/netidmgr_plugin/afsext.c | 4 + src/WINNT/netidmgr_plugin/afsfuncs.c | 5 + src/WINNT/netidmgr_plugin/afshelp.c | 5 + src/WINNT/netidmgr_plugin/afsicon.c | 4 + src/WINNT/netidmgr_plugin/afsnewcreds.c | 4 + src/WINNT/netidmgr_plugin/afsplugin.c | 4 + src/WINNT/netidmgr_plugin/main.c | 5 + src/afs/UKERNEL/sysincludes.h | 3 +- src/afsd/Makefile.in | 7 +- src/afsmonitor/Makefile.in | 5 +- src/aklog/Makefile.in | 7 +- src/audit/audit.c | 1 + src/auth/NTMakefile | 3 +- src/auth/authcon.c | 2 + src/auth/cellconfig.c | 1 + src/auth/ktc_nt.c | 3 +- src/auth/setkey.c | 1 + src/auth/token.c | 3 + src/auth/userok.c | 1 + src/auth/writeconfig.c | 1 + src/bozo/Makefile.in | 9 +- src/bozo/NTMakefile | 6 +- src/bozo/bnode.c | 2 + src/bozo/bos.c | 2 + src/bozo/bosoprocs.c | 1 + src/bozo/bosserver.c | 3 + src/bozo/cronbnodeops.c | 2 + src/bozo/ezbnodeops.c | 2 + src/bozo/fsbnodeops.c | 2 + src/bubasics/NTMakefile | 16 ++-- src/bucoord/Makefile.in | 2 +- src/bucoord/NTMakefile | 3 +- src/bucoord/bc_status.c | 1 + src/bucoord/commands.c | 1 + src/bucoord/config.c | 1 + src/bucoord/dlq.c | 3 + src/bucoord/dsstub.c | 1 + src/bucoord/dsvs.c | 1 + src/bucoord/dump.c | 1 + src/bucoord/dump_sched.c | 1 + src/bucoord/main.c | 1 + src/bucoord/restore.c | 1 + src/bucoord/server.c | 1 + src/bucoord/status.c | 1 + src/bucoord/tape_hosts.c | 1 + src/bucoord/ubik_db_if.c | 2 + src/bucoord/vol_sets.c | 1 + src/bucoord/volstub.c | 1 + src/budb/Makefile.in | 2 +- src/budb/NTMakefile | 11 ++- src/budb/database.c | 1 + src/budb/db_alloc.c | 1 + src/budb/db_dump.c | 1 + src/budb/db_hash.c | 1 + src/budb/db_lock.c | 1 + src/budb/db_text.c | 1 + src/budb/dbs_dump.c | 1 + src/budb/ol_verify.c | 1 + src/budb/procs.c | 1 + src/budb/server.c | 1 + src/budb/struct_ops.c | 1 + src/butc/Makefile.in | 6 +- src/butc/NTMakefile | 3 +- src/butc/dbentries.c | 1 + src/butc/dump.c | 11 +-- src/butc/list.c | 1 + src/butc/lwps.c | 3 + src/butc/recoverDb.c | 1 + src/butc/tcmain.c | 4 + src/butc/tcprocs.c | 2 + src/butc/tcstatus.c | 1 + src/butc/tcudbprocs.c | 3 + src/butm/NTMakefile | 3 +- src/butm/file_tm.c | 2 + src/butm/test_ftm.c | 1 + src/comerr/error_msg.c | 1 + src/config/NTMakefile | 3 + src/config/afsconfig-windows.h | 31 ++++-- src/config/param.amd64_w2k.h | 5 - src/crypto/hcrypto/NTMakefile | 1 + src/crypto/hcrypto/roken.h | 8 ++ src/dir/buffer.c | 1 + src/dviced/Makefile.in | 6 +- src/dviced/NTMakefile | 4 +- src/dvolser/Makefile.in | 2 +- src/dvolser/NTMakefile | 3 +- src/external/heimdal/roken/getopt.c | 3 + src/finale/Makefile.in | 2 +- src/finale/translate_et_nt.c | 1 + src/fsint/afsaux.c | 1 + src/fsprobe/Makefile.in | 3 +- src/kauth/Makefile.in | 38 +++++--- src/kauth/NTMakefile | 3 +- src/kauth/admin_tools.c | 1 + src/kauth/authclient.c | 2 + src/kauth/client.c | 2 + src/kauth/kaaux.c | 1 + src/kauth/kaauxdb.c | 1 + src/kauth/kadatabase.c | 1 + src/kauth/kalocalcell.c | 2 + src/kauth/kalog.c | 1 + src/kauth/kaprocs.c | 1 + src/kauth/kas.c | 1 + src/kauth/kaserver.c | 1 + src/kauth/katoken.c | 2 + src/kauth/kautils.c | 1 + src/kauth/kpasswd.c | 1 + src/kauth/krb_tf.c | 1 + src/kauth/krb_udp.c | 1 + src/kauth/rebuild.c | 1 + src/kauth/user_nt.c | 1 + src/libacl/aclprocs.c | 1 + src/libacl/netprocs.c | 1 + src/libadmin/adminutil/afs_utilAdmin.c | 1 + src/libadmin/bos/afs_bosAdmin.c | 1 + src/libadmin/cfg/cfgclient.c | 1 + src/libadmin/cfg/cfgdb.c | 1 + src/libadmin/cfg/cfghost.c | 1 + src/libadmin/cfg/cfginternal.c | 1 + src/libadmin/cfg/cfgservers.c | 1 + src/libadmin/client/afs_clientAdmin.c | 1 + src/libadmin/kas/afs_kasAdmin.c | 1 + src/libadmin/pts/afs_ptsAdmin.c | 1 + src/libadmin/samples/Makefile.in | 42 ++++----- src/libadmin/test/Makefile.in | 3 +- src/libadmin/test/afscp.c | 1 + src/libadmin/test/bos.c | 2 + src/libadmin/test/client.c | 1 + src/libadmin/test/kas.c | 1 + src/libadmin/test/pts.c | 1 + src/libadmin/test/util.c | 1 + src/libadmin/test/vos.c | 3 + src/libadmin/vos/afs_vosAdmin.c | 1 + src/libadmin/vos/lockprocs.c | 1 + src/libadmin/vos/vosutils.c | 1 + src/libadmin/vos/vsprocs.c | 1 + src/libafsauthent/NTMakefile | 3 +- src/libafsrpc/NTMakefile | 3 +- src/libuafs/Makefile.common.in | 6 +- src/log/Makefile.in | 8 +- src/lwp/lock.c | 2 + src/ptserver/Makefile.in | 23 +++-- src/ptserver/NTMakefile | 6 +- src/ptserver/db_verify.c | 1 + src/ptserver/display.c | 1 + src/ptserver/pt_util.c | 4 + src/ptserver/ptclient.c | 1 + src/ptserver/ptprocs.c | 1 + src/ptserver/pts.c | 1 + src/ptserver/ptserver.c | 1 + src/ptserver/ptuser.c | 2 + src/ptserver/ptutils.c | 1 + src/ptserver/readgroup.c | 1 + src/ptserver/readpwd.c | 1 + src/ptserver/testpt.c | 1 + src/ptserver/ubik.c | 1 + src/ptserver/utils.c | 2 + src/roken/NTMakefile | 94 +++++++++++++++++++ src/roken/afsroken.def | 26 +++++ src/roken/afsroken.rc | 15 +++ src/roken/config.h | 1 - src/rx/rx.c | 1 + src/rx/rx_conncache.c | 4 + src/rx/rx_event.c | 1 + src/rx/rx_globals.c | 13 +-- src/rx/rx_identity.c | 1 + src/rx/rx_lwp.c | 3 + src/rx/rx_misc.c | 2 +- src/rx/rx_multi.c | 5 +- src/rx/rx_null.c | 2 + src/rx/rx_opaque.c | 1 + src/rx/rx_packet.c | 1 + src/rx/rx_packet.h | 8 +- src/rx/rx_pthread.c | 3 + src/rx/rx_rdwr.c | 1 + src/rx/rx_stats.c | 1 + src/rx/rx_trace.c | 3 + src/rx/rx_user.c | 3 + src/rx/rx_xmit_nt.c | 22 ++--- src/rx/rx_xmit_nt.h | 17 +--- src/rx/xdr.c | 3 +- src/rx/xdr_array.c | 8 +- src/rx/xdr_refernce.c | 5 + src/rx/xdr_rx.c | 2 +- src/rxdebug/Makefile.in | 4 +- src/rxdebug/rxdebug.c | 1 + src/rxgen/rpc_main.c | 8 ++ src/rxkad/bg-fcrypt.c | 1 + src/rxkad/crc.c | 1 + src/rxkad/crypt_conn.c | 1 + src/rxkad/md4.c | 2 + src/rxkad/md5.c | 2 + src/rxkad/rxkad_client.c | 1 + src/rxkad/rxkad_common.c | 1 + src/rxkad/rxkad_server.c | 1 + src/rxkad/ticket.c | 2 + src/rxkad/ticket5.c | 2 + src/rxstat/rxstat.c | 3 + src/scout/Makefile.in | 2 +- src/sys/Makefile.in | 6 +- src/sys/pioctl_nt.c | 1 + src/tbutc/Makefile.in | 3 +- src/tbutc/NTMakefile | 3 +- src/tsalvaged/Makefile.in | 17 +++- src/tsm41/Makefile.in | 9 +- src/tviced/Makefile.in | 2 +- src/tviced/NTMakefile | 4 +- src/tviced/serialize_state.c | 1 + src/tvolser/Makefile.in | 5 +- src/tvolser/NTMakefile | 3 +- src/ubik/Makefile.in | 6 +- src/ubik/beacon.c | 1 + src/ubik/disk.c | 1 + src/ubik/lock.c | 1 + src/ubik/phys.c | 1 + src/ubik/recovery.c | 1 + src/ubik/remote.c | 1 + src/ubik/ubik.c | 1 + src/ubik/ubikclient.c | 2 + src/ubik/ubikcmd.c | 1 + src/ubik/udebug.c | 1 + src/ubik/uinit.c | 1 + src/ubik/vote.c | 1 + src/update/Makefile.in | 6 +- src/update/NTMakefile | 3 +- src/update/client.c | 3 + src/update/server.c | 2 + src/update/utils.c | 1 + src/uss/Makefile.in | 2 +- src/util/get_krbrlm.c | 1 + src/util/netutils.c | 1 + src/util/serverLog.c | 3 + src/util/uuid.c | 1 + src/venus/Makefile.in | 22 +++-- src/venus/afsio.c | 3 + src/venus/cmdebug.c | 2 +- src/viced/Makefile.in | 8 +- src/viced/NTMakefile | 3 +- src/viced/afsfileprocs.c | 1 + src/viced/callback.c | 1 + src/viced/host.c | 1 + src/viced/physio.c | 1 + src/viced/viced.c | 2 + src/vlserver/Makefile.in | 13 +-- src/vlserver/NTMakefile | 3 +- src/vlserver/vlclient.c | 1 + src/vlserver/vldb_check.c | 1 + src/vlserver/vlprocs.c | 1 + src/vlserver/vlserver.c | 1 + src/vlserver/vlutils.c | 1 + src/vol/Makefile.in | 15 ++- src/vol/NTMakefile | 3 +- src/vol/clone.c | 1 + src/vol/daemon_com.c | 1 + src/vol/fssync-client.c | 1 + src/vol/fssync-server.c | 1 + src/vol/ihandle.c | 1 + src/vol/namei_ops.c | 2 + src/vol/ntops.c | 1 + src/vol/nuke.c | 1 + src/vol/partition.c | 1 + src/vol/physio.c | 1 + src/vol/purge.c | 1 + src/vol/salvager.c | 3 +- src/vol/vg_cache.c | 2 + src/vol/vg_scan.c | 2 + src/vol/vnode.c | 3 + src/vol/vol-info.c | 1 + src/vol/vol-salvage.c | 2 + src/vol/volume.c | 1 + src/vol/vutil.c | 1 + src/volser/Makefile.in | 11 ++- src/volser/NTMakefile | 3 +- src/volser/common.c | 2 + src/volser/dumpstuff.c | 1 + src/volser/lockprocs.c | 1 + src/volser/physio.c | 1 + src/volser/volmain.c | 1 + src/volser/volprocs.c | 1 + src/volser/voltrans.c | 1 + src/volser/vos.c | 2 + src/volser/vsprocs.c | 4 +- src/volser/vsutils.c | 1 + src/xstat/Makefile.in | 6 +- src/xstat/NTMakefile | 3 +- src/xstat/xstat_cm.c | 2 +- src/xstat/xstat_cm_test.c | 1 + src/xstat/xstat_fs.c | 2 +- src/xstat/xstat_fs_callback.c | 2 + src/xstat/xstat_fs_test.c | 1 + tests/rpctestlib/NTMakefile | 3 +- tests/rpctestlib/rpc_test_cb_procs.c | 3 + tests/rpctestlib/rpc_test_main.c | 3 + tests/rpctestlib/rpc_test_procs.c | 3 + 419 files changed, 1143 insertions(+), 249 deletions(-) create mode 100644 src/roken/NTMakefile create mode 100644 src/roken/afsroken.def create mode 100644 src/roken/afsroken.rc diff --git a/NTMakefile b/NTMakefile index a46dec226..97e687d54 100644 --- a/NTMakefile +++ b/NTMakefile @@ -82,13 +82,20 @@ rx_headers: $(NTMAKE_HEADERS) $(CD) ..\.. -util_headers: +util_headers: roken_headers @echo ***** $@ $(DOCD) $(SRC)\util $(CD) $(SRC)\util $(NTMAKE_HEADERS) $(CD) ..\.. +roken_headers: + @echo ***** $@ + $(DOCD) $(SRC)\roken + $(CD) $(SRC)\roken + $(NTMAKE_HEADERS) + $(CD) ..\.. + hcrypto_headers: util_headers @echo ***** $@ $(DOCD) $(SRC)\crypto\hcrypto @@ -166,13 +173,20 @@ des: rxgen $(NTMAKE) $(CD) ..\.. -hcrypto: des +hcrypto: roken @echo ***** $@ $(DOCD) $(SRC)\crypto\hcrypto $(CD) $(SRC)\crypto\hcrypto $(NTMAKE) $(CD) ..\..\.. +roken: des + @echo ***** $@ + $(DOCD) $(SRC)\roken + $(CD) $(SRC)\roken + $(NTMAKE) + $(CD) ..\.. + rx: hcrypto @echo ***** $@ $(DOCD) $(SRC)\$@ diff --git a/src/WINNT/afsadmsvr/TaAfsAdmSvr.cpp b/src/WINNT/afsadmsvr/TaAfsAdmSvr.cpp index e9f8cd777..7cf4f4a1c 100644 --- a/src/WINNT/afsadmsvr/TaAfsAdmSvr.cpp +++ b/src/WINNT/afsadmsvr/TaAfsAdmSvr.cpp @@ -10,8 +10,10 @@ #include #include +#include #include #include +#include #include "TaAfsAdmSvrInternal.h" diff --git a/src/WINNT/afsadmsvr/TaAfsAdmSvrCallback.cpp b/src/WINNT/afsadmsvr/TaAfsAdmSvrCallback.cpp index 4d9554ad8..4d8d54ee5 100644 --- a/src/WINNT/afsadmsvr/TaAfsAdmSvrCallback.cpp +++ b/src/WINNT/afsadmsvr/TaAfsAdmSvrCallback.cpp @@ -10,8 +10,10 @@ #include #include +#include #include #include +#include #include "TaAfsAdmSvrInternal.h" diff --git a/src/WINNT/afsadmsvr/TaAfsAdmSvrCell.cpp b/src/WINNT/afsadmsvr/TaAfsAdmSvrCell.cpp index 05102a64b..0a75b3360 100644 --- a/src/WINNT/afsadmsvr/TaAfsAdmSvrCell.cpp +++ b/src/WINNT/afsadmsvr/TaAfsAdmSvrCell.cpp @@ -10,8 +10,10 @@ #include #include +#include #include #include +#include #include "TaAfsAdmSvrInternal.h" diff --git a/src/WINNT/afsadmsvr/TaAfsAdmSvrDebug.cpp b/src/WINNT/afsadmsvr/TaAfsAdmSvrDebug.cpp index 35e0e3886..35494728b 100644 --- a/src/WINNT/afsadmsvr/TaAfsAdmSvrDebug.cpp +++ b/src/WINNT/afsadmsvr/TaAfsAdmSvrDebug.cpp @@ -11,8 +11,10 @@ #include extern "C" { +#include #include #include +#include } #include "TaAfsAdmSvrInternal.h" diff --git a/src/WINNT/afsadmsvr/TaAfsAdmSvrGeneral.cpp b/src/WINNT/afsadmsvr/TaAfsAdmSvrGeneral.cpp index 684a4dcff..b944b27c6 100644 --- a/src/WINNT/afsadmsvr/TaAfsAdmSvrGeneral.cpp +++ b/src/WINNT/afsadmsvr/TaAfsAdmSvrGeneral.cpp @@ -11,8 +11,10 @@ #include extern "C" { +#include #include #include +#include } #include "TaAfsAdmSvrInternal.h" diff --git a/src/WINNT/afsadmsvr/TaAfsAdmSvrGroup.cpp b/src/WINNT/afsadmsvr/TaAfsAdmSvrGroup.cpp index cbc39a660..2a78ab207 100644 --- a/src/WINNT/afsadmsvr/TaAfsAdmSvrGroup.cpp +++ b/src/WINNT/afsadmsvr/TaAfsAdmSvrGroup.cpp @@ -11,8 +11,10 @@ #include extern "C" { +#include #include #include +#include } #include "TaAfsAdmSvrInternal.h" diff --git a/src/WINNT/afsadmsvr/TaAfsAdmSvrMain.cpp b/src/WINNT/afsadmsvr/TaAfsAdmSvrMain.cpp index 31f752e8c..28aad8537 100644 --- a/src/WINNT/afsadmsvr/TaAfsAdmSvrMain.cpp +++ b/src/WINNT/afsadmsvr/TaAfsAdmSvrMain.cpp @@ -11,8 +11,10 @@ #include extern "C" { +#include #include #include +#include } #include "TaAfsAdmSvrInternal.h" diff --git a/src/WINNT/afsadmsvr/TaAfsAdmSvrProperties.cpp b/src/WINNT/afsadmsvr/TaAfsAdmSvrProperties.cpp index ded0a5246..f1344c932 100644 --- a/src/WINNT/afsadmsvr/TaAfsAdmSvrProperties.cpp +++ b/src/WINNT/afsadmsvr/TaAfsAdmSvrProperties.cpp @@ -11,8 +11,10 @@ #include extern "C" { +#include #include #include +#include } #include "TaAfsAdmSvrInternal.h" diff --git a/src/WINNT/afsadmsvr/TaAfsAdmSvrSearch.cpp b/src/WINNT/afsadmsvr/TaAfsAdmSvrSearch.cpp index b7899b546..95e06affa 100644 --- a/src/WINNT/afsadmsvr/TaAfsAdmSvrSearch.cpp +++ b/src/WINNT/afsadmsvr/TaAfsAdmSvrSearch.cpp @@ -11,8 +11,10 @@ #include extern "C" { +#include #include #include +#include } #include "TaAfsAdmSvrInternal.h" diff --git a/src/WINNT/afsadmsvr/TaAfsAdmSvrUser.cpp b/src/WINNT/afsadmsvr/TaAfsAdmSvrUser.cpp index f89320511..f8e191ccb 100644 --- a/src/WINNT/afsadmsvr/TaAfsAdmSvrUser.cpp +++ b/src/WINNT/afsadmsvr/TaAfsAdmSvrUser.cpp @@ -11,8 +11,10 @@ #include extern "C" { +#include #include #include +#include } #include "TaAfsAdmSvrInternal.h" diff --git a/src/WINNT/afsapplib/al_browse.cpp b/src/WINNT/afsapplib/al_browse.cpp index 5e6df91df..058815fd2 100644 --- a/src/WINNT/afsapplib/al_browse.cpp +++ b/src/WINNT/afsapplib/al_browse.cpp @@ -11,8 +11,11 @@ #include extern "C" { +#include #include #include + +#include } #include diff --git a/src/WINNT/afsapplib/al_creds.cpp b/src/WINNT/afsapplib/al_creds.cpp index 94a6cc7f5..577c10edd 100644 --- a/src/WINNT/afsapplib/al_creds.cpp +++ b/src/WINNT/afsapplib/al_creds.cpp @@ -11,8 +11,10 @@ #include extern "C" { +#include #include #include +#include } #include diff --git a/src/WINNT/afsapplib/al_dynlink.cpp b/src/WINNT/afsapplib/al_dynlink.cpp index d22d42dd5..6b9060b35 100644 --- a/src/WINNT/afsapplib/al_dynlink.cpp +++ b/src/WINNT/afsapplib/al_dynlink.cpp @@ -11,8 +11,10 @@ #include extern "C" { +#include #include #include +#include } #include diff --git a/src/WINNT/afsapplib/al_misc.cpp b/src/WINNT/afsapplib/al_misc.cpp index a6485647c..b84fef2f1 100644 --- a/src/WINNT/afsapplib/al_misc.cpp +++ b/src/WINNT/afsapplib/al_misc.cpp @@ -11,8 +11,10 @@ #include extern "C" { +#include #include #include +#include } #include diff --git a/src/WINNT/afsclass/afsclassfn.cpp b/src/WINNT/afsclass/afsclassfn.cpp index 4b90a048c..9b3712736 100644 --- a/src/WINNT/afsclass/afsclassfn.cpp +++ b/src/WINNT/afsclass/afsclassfn.cpp @@ -11,8 +11,10 @@ #include extern "C" { +#include #include #include +#include } #include diff --git a/src/WINNT/afsclass/c_agg.cpp b/src/WINNT/afsclass/c_agg.cpp index 9535a0222..4a3638f65 100644 --- a/src/WINNT/afsclass/c_agg.cpp +++ b/src/WINNT/afsclass/c_agg.cpp @@ -11,8 +11,10 @@ #include extern "C" { +#include #include #include +#include } #include diff --git a/src/WINNT/afsclass/c_cell.cpp b/src/WINNT/afsclass/c_cell.cpp index 187f4cf69..f41e28e2d 100644 --- a/src/WINNT/afsclass/c_cell.cpp +++ b/src/WINNT/afsclass/c_cell.cpp @@ -11,8 +11,10 @@ #include extern "C" { +#include #include #include +#include } #include diff --git a/src/WINNT/afsclass/c_grp.cpp b/src/WINNT/afsclass/c_grp.cpp index 43ff03768..be526133a 100644 --- a/src/WINNT/afsclass/c_grp.cpp +++ b/src/WINNT/afsclass/c_grp.cpp @@ -11,8 +11,10 @@ #include extern "C" { +#include #include #include +#include } #include diff --git a/src/WINNT/afsclass/c_ident.cpp b/src/WINNT/afsclass/c_ident.cpp index 6983545bb..13b07c6bd 100644 --- a/src/WINNT/afsclass/c_ident.cpp +++ b/src/WINNT/afsclass/c_ident.cpp @@ -11,8 +11,10 @@ #include extern "C" { +#include #include #include +#include } #include diff --git a/src/WINNT/afsclass/c_identlist.cpp b/src/WINNT/afsclass/c_identlist.cpp index d0be2fe32..063c19ba8 100644 --- a/src/WINNT/afsclass/c_identlist.cpp +++ b/src/WINNT/afsclass/c_identlist.cpp @@ -11,8 +11,10 @@ #include extern "C" { +#include #include #include +#include } #include diff --git a/src/WINNT/afsclass/c_notify.cpp b/src/WINNT/afsclass/c_notify.cpp index 1826daa5c..93a9e6bdb 100644 --- a/src/WINNT/afsclass/c_notify.cpp +++ b/src/WINNT/afsclass/c_notify.cpp @@ -11,8 +11,10 @@ #include extern "C" { +#include #include #include +#include } #include diff --git a/src/WINNT/afsclass/c_set.cpp b/src/WINNT/afsclass/c_set.cpp index fab75d91a..74ad75e55 100644 --- a/src/WINNT/afsclass/c_set.cpp +++ b/src/WINNT/afsclass/c_set.cpp @@ -11,8 +11,10 @@ #include extern "C" { +#include #include #include +#include } #include diff --git a/src/WINNT/afsclass/c_svc.cpp b/src/WINNT/afsclass/c_svc.cpp index f9924748d..2c8491908 100644 --- a/src/WINNT/afsclass/c_svc.cpp +++ b/src/WINNT/afsclass/c_svc.cpp @@ -11,8 +11,10 @@ #include extern "C" { +#include #include #include +#include } #include diff --git a/src/WINNT/afsclass/c_svr.cpp b/src/WINNT/afsclass/c_svr.cpp index 2cad61976..2ee13737d 100644 --- a/src/WINNT/afsclass/c_svr.cpp +++ b/src/WINNT/afsclass/c_svr.cpp @@ -11,8 +11,10 @@ #include extern "C" { +#include #include #include +#include } #include diff --git a/src/WINNT/afsclass/c_usr.cpp b/src/WINNT/afsclass/c_usr.cpp index 19f472a42..d7f6a5b9d 100644 --- a/src/WINNT/afsclass/c_usr.cpp +++ b/src/WINNT/afsclass/c_usr.cpp @@ -11,8 +11,10 @@ #include extern "C" { +#include #include #include +#include } #include diff --git a/src/WINNT/afsclass/internal.cpp b/src/WINNT/afsclass/internal.cpp index 4df7d4377..4e6c4c6b6 100644 --- a/src/WINNT/afsclass/internal.cpp +++ b/src/WINNT/afsclass/internal.cpp @@ -11,8 +11,10 @@ #include extern "C" { +#include #include #include +#include } #include diff --git a/src/WINNT/afsclass/worker.cpp b/src/WINNT/afsclass/worker.cpp index ae52cf49b..2e15a35f0 100644 --- a/src/WINNT/afsclass/worker.cpp +++ b/src/WINNT/afsclass/worker.cpp @@ -11,8 +11,10 @@ #include extern "C" { +#include #include #include +#include } #include diff --git a/src/WINNT/afsd/NTMakefile b/src/WINNT/afsd/NTMakefile index 6e777f41d..20b4ad5c6 100644 --- a/src/WINNT/afsd/NTMakefile +++ b/src/WINNT/afsd/NTMakefile @@ -230,7 +230,8 @@ CONF_DLLFILE = $(DESTDIR)\lib\libafsconf.dll CONF_DLLLIBS = \ $(DESTDIR)\lib\afs\afsutil.lib \ - $(DESTDIR)\lib\afs\afsreg.lib + $(DESTDIR)\lib\afs\afsreg.lib \ + $(DESTDIR)\lib\afsroken.lib $(CONF_DLLFILE): $(CONFOBJS) $(OUT)\libafsconf.res $(CONF_DLLLIBS) $(DLLGUILINK) -def:libafsconf.def $(AFSD_SDKLIBS) @@ -362,7 +363,8 @@ EXELIBS = \ $(DESTDIR)\lib\afsrx.lib \ $(DESTDIR)\lib\afslwp.lib \ $(DESTDIR)\lib\libosi.lib \ - $(DESTDIR)\lib\libafsconf.lib + $(DESTDIR)\lib\libafsconf.lib \ + $(DESTDIR)\lib\afsroken.lib EXELIBS2 = \ $(DESTDIR)\lib\afsrpc.lib \ @@ -376,7 +378,8 @@ EXELIBS2 = \ $(DESTDIR)\lib\afsdes.lib \ $(DESTDIR)\lib\afslwp.lib \ $(DESTDIR)\lib\libosi.lib \ - $(DESTDIR)\lib\libafsconf.lib + $(DESTDIR)\lib\libafsconf.lib \ + $(DESTDIR)\lib\afsroken.lib EXELIBS3 = \ $(DESTDIR)\lib\afs\afscmd.lib \ @@ -429,6 +432,7 @@ AFSD_EXELIBS =\ $(DESTDIR)\lib\libafsconf.lib \ $(DESTDIR)\lib\afs\afsreg.lib \ $(DESTDIR)\lib\afspthread.lib \ + $(DESTDIR)\lib\afsroken.lib \ $(LANAHELPERLIB) $(AFSD_EXEFILE): $(OUT)\afsd.obj $(AFSDOBJS) $(OUT)\afsd.res $(RXOBJS) $(AFSD_EXELIBS) diff --git a/src/WINNT/afsd/afscpcc.c b/src/WINNT/afsd/afscpcc.c index 34c5e5284..5b3aa5d50 100644 --- a/src/WINNT/afsd/afscpcc.c +++ b/src/WINNT/afsd/afscpcc.c @@ -5,6 +5,10 @@ * This software has been released under the terms of the MIT License. */ +#include +#include +#include + #include #include diff --git a/src/WINNT/afsd/afsd_eventlog.c b/src/WINNT/afsd/afsd_eventlog.c index 3be970210..24ae08966 100644 --- a/src/WINNT/afsd/afsd_eventlog.c +++ b/src/WINNT/afsd/afsd_eventlog.c @@ -7,6 +7,10 @@ //////////////////////////////////////////////////////////////////// +#include +#include +#include + #include #include #include diff --git a/src/WINNT/afsd/afsd_flushvol.c b/src/WINNT/afsd/afsd_flushvol.c index 4798e75e7..99ccd40ed 100644 --- a/src/WINNT/afsd/afsd_flushvol.c +++ b/src/WINNT/afsd/afsd_flushvol.c @@ -6,7 +6,10 @@ // ///////////////////////////////////////////////////////////////////// +#include #include +#include + #include #include diff --git a/src/WINNT/afsd/afsd_init.c b/src/WINNT/afsd/afsd_init.c index d7e7c2172..a7190da28 100644 --- a/src/WINNT/afsd/afsd_init.c +++ b/src/WINNT/afsd/afsd_init.c @@ -7,7 +7,11 @@ * directory or online at http://www.openafs.org/dl/license10.html */ +#include #include + +#include + #include #include diff --git a/src/WINNT/afsd/afsd_service.c b/src/WINNT/afsd/afsd_service.c index b7bb6a4fd..51beebe7b 100644 --- a/src/WINNT/afsd/afsd_service.c +++ b/src/WINNT/afsd/afsd_service.c @@ -1,4 +1,8 @@ +#include +#include +#include + #include #include diff --git a/src/WINNT/afsd/afskfw.c b/src/WINNT/afsd/afskfw.c index 24fdaca92..8f5af0c80 100644 --- a/src/WINNT/afsd/afskfw.c +++ b/src/WINNT/afsd/afskfw.c @@ -66,6 +66,10 @@ /* Prevent inclusion of des.h to avoid conflicts with des types */ #define NO_DES_H_INCLUDE +#include +#include +#include + #include #include #include diff --git a/src/WINNT/afsd/afslogon.c b/src/WINNT/afsd/afslogon.c index be5876e22..565697b1b 100644 --- a/src/WINNT/afsd/afslogon.c +++ b/src/WINNT/afsd/afslogon.c @@ -7,6 +7,10 @@ * directory or online at http://www.openafs.org/dl/license10.html */ +#include +#include +#include + #include "afslogon.h" #include @@ -18,7 +22,6 @@ #include #include -#include #include #include #include diff --git a/src/WINNT/afsd/cklog.c b/src/WINNT/afsd/cklog.c index 40700da66..ad6d921fb 100644 --- a/src/WINNT/afsd/cklog.c +++ b/src/WINNT/afsd/cklog.c @@ -7,7 +7,11 @@ * directory or online at http://www.openafs.org/dl/license10.html */ +#include #include + +#include + #include #include diff --git a/src/WINNT/afsd/cm_access.c b/src/WINNT/afsd/cm_access.c index de36dcadb..4d8ad81eb 100644 --- a/src/WINNT/afsd/cm_access.c +++ b/src/WINNT/afsd/cm_access.c @@ -7,7 +7,10 @@ * directory or online at http://www.openafs.org/dl/license10.html */ +#include #include +#include + #include #include diff --git a/src/WINNT/afsd/cm_aclent.c b/src/WINNT/afsd/cm_aclent.c index 26b537a88..9c304d24a 100644 --- a/src/WINNT/afsd/cm_aclent.c +++ b/src/WINNT/afsd/cm_aclent.c @@ -7,7 +7,10 @@ * directory or online at http://www.openafs.org/dl/license10.html */ +#include #include +#include + #include #include diff --git a/src/WINNT/afsd/cm_btree.c b/src/WINNT/afsd/cm_btree.c index a12c4d66e..af6b89492 100644 --- a/src/WINNT/afsd/cm_btree.c +++ b/src/WINNT/afsd/cm_btree.c @@ -10,6 +10,10 @@ * Thanks to Jan Jannink for B+ tree algorithms. */ +#include +#include +#include + #include #include #include diff --git a/src/WINNT/afsd/cm_buf.c b/src/WINNT/afsd/cm_buf.c index 5a30adc0d..99efd4c2d 100644 --- a/src/WINNT/afsd/cm_buf.c +++ b/src/WINNT/afsd/cm_buf.c @@ -9,7 +9,10 @@ /* Copyright (C) 1994 Cazamar Systems, Inc. */ +#include #include +#include + #include #include diff --git a/src/WINNT/afsd/cm_callback.c b/src/WINNT/afsd/cm_callback.c index b329eee55..9199e34eb 100644 --- a/src/WINNT/afsd/cm_callback.c +++ b/src/WINNT/afsd/cm_callback.c @@ -7,7 +7,10 @@ * directory or online at http://www.openafs.org/dl/license10.html */ +#include #include +#include + #include #include diff --git a/src/WINNT/afsd/cm_cell.c b/src/WINNT/afsd/cm_cell.c index 3e7e51665..83ce9dc2d 100644 --- a/src/WINNT/afsd/cm_cell.c +++ b/src/WINNT/afsd/cm_cell.c @@ -7,7 +7,10 @@ * directory or online at http://www.openafs.org/dl/license10.html */ +#include #include +#include + #include #include diff --git a/src/WINNT/afsd/cm_config.c b/src/WINNT/afsd/cm_config.c index e33518297..b67d82ba1 100644 --- a/src/WINNT/afsd/cm_config.c +++ b/src/WINNT/afsd/cm_config.c @@ -7,6 +7,11 @@ * directory or online at http://www.openafs.org/dl/license10.html */ + +#include +#include +#include + #include #include #include @@ -19,7 +24,6 @@ #include #include -#include #include #include diff --git a/src/WINNT/afsd/cm_conn.c b/src/WINNT/afsd/cm_conn.c index fa7c5e5d7..ec2b1c3f9 100644 --- a/src/WINNT/afsd/cm_conn.c +++ b/src/WINNT/afsd/cm_conn.c @@ -7,7 +7,10 @@ * directory or online at http://www.openafs.org/dl/license10.html */ +#include #include +#include + #include #include diff --git a/src/WINNT/afsd/cm_daemon.c b/src/WINNT/afsd/cm_daemon.c index f8284332d..0d79f2054 100644 --- a/src/WINNT/afsd/cm_daemon.c +++ b/src/WINNT/afsd/cm_daemon.c @@ -7,7 +7,10 @@ * directory or online at http://www.openafs.org/dl/license10.html */ +#include #include +#include + #include #include diff --git a/src/WINNT/afsd/cm_dcache.c b/src/WINNT/afsd/cm_dcache.c index c9b1762a9..4eed7eb15 100644 --- a/src/WINNT/afsd/cm_dcache.c +++ b/src/WINNT/afsd/cm_dcache.c @@ -7,7 +7,11 @@ * directory or online at http://www.openafs.org/dl/license10.html */ + +#include #include +#include + #include #include diff --git a/src/WINNT/afsd/cm_dir.c b/src/WINNT/afsd/cm_dir.c index f8d545f12..5ae47b7d9 100644 --- a/src/WINNT/afsd/cm_dir.c +++ b/src/WINNT/afsd/cm_dir.c @@ -7,7 +7,10 @@ * directory or online at http://www.openafs.org/dl/license10.html */ +#include #include +#include + #include #include diff --git a/src/WINNT/afsd/cm_dnlc.c b/src/WINNT/afsd/cm_dnlc.c index ee9a1b032..708bb42fb 100644 --- a/src/WINNT/afsd/cm_dnlc.c +++ b/src/WINNT/afsd/cm_dnlc.c @@ -15,7 +15,10 @@ ** */ +#include #include +#include + #include #include diff --git a/src/WINNT/afsd/cm_dns.c b/src/WINNT/afsd/cm_dns.c index 6b1e1a92c..7cc67eac1 100644 --- a/src/WINNT/afsd/cm_dns.c +++ b/src/WINNT/afsd/cm_dns.c @@ -6,7 +6,11 @@ * directory or online at http://www.openafs.org/dl/license10.html */ + +#include #include +#include + #include #include #include diff --git a/src/WINNT/afsd/cm_freelance.c b/src/WINNT/afsd/cm_freelance.c index 3deac244b..c8498ed5e 100644 --- a/src/WINNT/afsd/cm_freelance.c +++ b/src/WINNT/afsd/cm_freelance.c @@ -1,4 +1,7 @@ +#include #include +#include + #include #include diff --git a/src/WINNT/afsd/cm_ioctl.c b/src/WINNT/afsd/cm_ioctl.c index a9bcf15bd..6acd625d1 100644 --- a/src/WINNT/afsd/cm_ioctl.c +++ b/src/WINNT/afsd/cm_ioctl.c @@ -7,7 +7,10 @@ * directory or online at http://www.openafs.org/dl/license10.html */ +#include #include +#include + #include #include #include diff --git a/src/WINNT/afsd/cm_memmap.c b/src/WINNT/afsd/cm_memmap.c index 6fb91ed22..961716803 100644 --- a/src/WINNT/afsd/cm_memmap.c +++ b/src/WINNT/afsd/cm_memmap.c @@ -1,3 +1,8 @@ + +#include +#include +#include + #include #include #include "afsd.h" diff --git a/src/WINNT/afsd/cm_performance.c b/src/WINNT/afsd/cm_performance.c index 5ecd84ea7..76b8e5931 100644 --- a/src/WINNT/afsd/cm_performance.c +++ b/src/WINNT/afsd/cm_performance.c @@ -2,7 +2,11 @@ * Copyright (c) 2008 - Secure Endpoints Inc. */ + +#include #include +#include + #include #include diff --git a/src/WINNT/afsd/cm_rpc.c b/src/WINNT/afsd/cm_rpc.c index 9655e490d..e96bb4a2e 100644 --- a/src/WINNT/afsd/cm_rpc.c +++ b/src/WINNT/afsd/cm_rpc.c @@ -7,7 +7,10 @@ * directory or online at http://www.openafs.org/dl/license10.html */ +#include #include +#include + #include #include diff --git a/src/WINNT/afsd/cm_scache.c b/src/WINNT/afsd/cm_scache.c index 755cd9c38..ac2cb7d63 100644 --- a/src/WINNT/afsd/cm_scache.c +++ b/src/WINNT/afsd/cm_scache.c @@ -7,7 +7,10 @@ * directory or online at http://www.openafs.org/dl/license10.html */ +#include #include +#include + #include #include diff --git a/src/WINNT/afsd/cm_server.c b/src/WINNT/afsd/cm_server.c index 0d2ac9e07..e9751e105 100644 --- a/src/WINNT/afsd/cm_server.c +++ b/src/WINNT/afsd/cm_server.c @@ -7,7 +7,10 @@ * directory or online at http://www.openafs.org/dl/license10.html */ +#include #include +#include + #include #include diff --git a/src/WINNT/afsd/cm_user.c b/src/WINNT/afsd/cm_user.c index d3e4c939b..0a053cb3c 100644 --- a/src/WINNT/afsd/cm_user.c +++ b/src/WINNT/afsd/cm_user.c @@ -7,7 +7,11 @@ * directory or online at http://www.openafs.org/dl/license10.html */ + +#include #include +#include + #include #include diff --git a/src/WINNT/afsd/cm_utils.c b/src/WINNT/afsd/cm_utils.c index 231246456..10fa2f003 100644 --- a/src/WINNT/afsd/cm_utils.c +++ b/src/WINNT/afsd/cm_utils.c @@ -7,7 +7,10 @@ * directory or online at http://www.openafs.org/dl/license10.html */ +#include #include +#include + #include #include diff --git a/src/WINNT/afsd/cm_vnodeops.c b/src/WINNT/afsd/cm_vnodeops.c index b1668d1e7..450f753ee 100644 --- a/src/WINNT/afsd/cm_vnodeops.c +++ b/src/WINNT/afsd/cm_vnodeops.c @@ -7,7 +7,10 @@ * directory or online at http://www.openafs.org/dl/license10.html */ +#include #include +#include + #include #include diff --git a/src/WINNT/afsd/cm_volstat.c b/src/WINNT/afsd/cm_volstat.c index a02937f71..1f4aad4ea 100644 --- a/src/WINNT/afsd/cm_volstat.c +++ b/src/WINNT/afsd/cm_volstat.c @@ -31,7 +31,10 @@ * Notification API */ +#include #include +#include + #include #include diff --git a/src/WINNT/afsd/cm_volume.c b/src/WINNT/afsd/cm_volume.c index 23ee84d2e..85c79475e 100644 --- a/src/WINNT/afsd/cm_volume.c +++ b/src/WINNT/afsd/cm_volume.c @@ -7,7 +7,10 @@ * directory or online at http://www.openafs.org/dl/license10.html */ +#include #include +#include + #include #include diff --git a/src/WINNT/afsd/ctokens.c b/src/WINNT/afsd/ctokens.c index 0aa31fcde..81d4d983a 100644 --- a/src/WINNT/afsd/ctokens.c +++ b/src/WINNT/afsd/ctokens.c @@ -7,7 +7,11 @@ * directory or online at http://www.openafs.org/dl/license10.html */ +#include #include + +#include + #include #include diff --git a/src/WINNT/afsd/cunlog.c b/src/WINNT/afsd/cunlog.c index 49a82f861..91bdc5c76 100644 --- a/src/WINNT/afsd/cunlog.c +++ b/src/WINNT/afsd/cunlog.c @@ -7,7 +7,10 @@ * directory or online at http://www.openafs.org/dl/license10.html */ +#include #include + +#include #include #include diff --git a/src/WINNT/afsd/fs.c b/src/WINNT/afsd/fs.c index 892d0348d..d0ce660b6 100644 --- a/src/WINNT/afsd/fs.c +++ b/src/WINNT/afsd/fs.c @@ -7,7 +7,10 @@ * directory or online at http://www.openafs.org/dl/license10.html */ +#include #include +#include + #include #include diff --git a/src/WINNT/afsd/fs_utils.c b/src/WINNT/afsd/fs_utils.c index 68e45b003..e6819ce59 100644 --- a/src/WINNT/afsd/fs_utils.c +++ b/src/WINNT/afsd/fs_utils.c @@ -7,7 +7,10 @@ * directory or online at http://www.openafs.org/dl/license10.html */ +#include #include +#include + #include #include diff --git a/src/WINNT/afsd/msrpc.c b/src/WINNT/afsd/msrpc.c index 035ec2608..b7736a50a 100644 --- a/src/WINNT/afsd/msrpc.c +++ b/src/WINNT/afsd/msrpc.c @@ -22,6 +22,10 @@ * SOFTWARE. */ +#include +#include +#include + #include #include "ms-wkssvc.h" #include "ms-srvsvc.h" diff --git a/src/WINNT/afsd/rawops.c b/src/WINNT/afsd/rawops.c index c06af5eec..255795294 100644 --- a/src/WINNT/afsd/rawops.c +++ b/src/WINNT/afsd/rawops.c @@ -7,6 +7,10 @@ * directory or online at http://www.openafs.org/dl/license10.html */ +#include +#include +#include + #include #include "afsd.h" diff --git a/src/WINNT/afsd/rpc_srvsvc.c b/src/WINNT/afsd/rpc_srvsvc.c index 860ed30ff..267910626 100644 --- a/src/WINNT/afsd/rpc_srvsvc.c +++ b/src/WINNT/afsd/rpc_srvsvc.c @@ -22,6 +22,11 @@ * SOFTWARE. */ + +#include +#include +#include + #include #include #define _CRT_RAND_S diff --git a/src/WINNT/afsd/rpc_wkssvc.c b/src/WINNT/afsd/rpc_wkssvc.c index a8845b861..60433256e 100644 --- a/src/WINNT/afsd/rpc_wkssvc.c +++ b/src/WINNT/afsd/rpc_wkssvc.c @@ -22,6 +22,11 @@ * SOFTWARE. */ + +#include +#include +#include + #include #include #include diff --git a/src/WINNT/afsd/smb.c b/src/WINNT/afsd/smb.c index cb16e156a..e806385a5 100644 --- a/src/WINNT/afsd/smb.c +++ b/src/WINNT/afsd/smb.c @@ -7,7 +7,10 @@ * directory or online at http://www.openafs.org/dl/license10.html */ +#include #include +#include + #include #include diff --git a/src/WINNT/afsd/smb3.c b/src/WINNT/afsd/smb3.c index 9811d3f29..364d9d72e 100644 --- a/src/WINNT/afsd/smb3.c +++ b/src/WINNT/afsd/smb3.c @@ -7,7 +7,10 @@ * directory or online at http://www.openafs.org/dl/license10.html */ +#include #include +#include + #include #include diff --git a/src/WINNT/afsd/smb_ioctl.c b/src/WINNT/afsd/smb_ioctl.c index d441fe907..1e33b95ed 100644 --- a/src/WINNT/afsd/smb_ioctl.c +++ b/src/WINNT/afsd/smb_ioctl.c @@ -7,7 +7,10 @@ * directory or online at http://www.openafs.org/dl/license10.html */ +#include #include +#include + #include #include diff --git a/src/WINNT/afsd/smb_rpc.c b/src/WINNT/afsd/smb_rpc.c index 882085606..55f123f47 100644 --- a/src/WINNT/afsd/smb_rpc.c +++ b/src/WINNT/afsd/smb_rpc.c @@ -24,7 +24,10 @@ #define SMB_RPC_IMPL +#include #include +#include + #include #include diff --git a/src/WINNT/afsd/symlink.c b/src/WINNT/afsd/symlink.c index 50b47e63c..9edaeb5d6 100644 --- a/src/WINNT/afsd/symlink.c +++ b/src/WINNT/afsd/symlink.c @@ -7,7 +7,10 @@ * directory or online at http://www.openafs.org/dl/license10.html */ +#include #include +#include + #include #include #include diff --git a/src/WINNT/afsreg/afssw.c b/src/WINNT/afsreg/afssw.c index 2755349f8..c00ef960d 100644 --- a/src/WINNT/afsreg/afssw.c +++ b/src/WINNT/afsreg/afssw.c @@ -107,7 +107,7 @@ afssw_GetClientCellServDBDir(char **bufPP) /* [out] data buffer */ if (path[tlen-1] != '\\') { char * newPath = malloc(tlen+2); if (newPath) { - snprintf(newPath,tlen+2,"%s\\",path); + _snprintf(newPath,tlen+2,"%s\\",path); free(path); path = newPath; } diff --git a/src/WINNT/afssvrcfg/admin_info_dlg.cpp b/src/WINNT/afssvrcfg/admin_info_dlg.cpp index b5bbd09f4..e1e802e84 100644 --- a/src/WINNT/afssvrcfg/admin_info_dlg.cpp +++ b/src/WINNT/afssvrcfg/admin_info_dlg.cpp @@ -11,8 +11,10 @@ #include extern "C" { +#include #include #include +#include } diff --git a/src/WINNT/afssvrcfg/afscfg.cpp b/src/WINNT/afssvrcfg/afscfg.cpp index 30c62f011..d052337cd 100644 --- a/src/WINNT/afssvrcfg/afscfg.cpp +++ b/src/WINNT/afssvrcfg/afscfg.cpp @@ -16,8 +16,10 @@ #include extern "C" { +#include #include #include +#include } #include "afscfg.h" diff --git a/src/WINNT/afssvrcfg/backup_server_page.cpp b/src/WINNT/afssvrcfg/backup_server_page.cpp index 1d2d65fc1..1b9e74a24 100644 --- a/src/WINNT/afssvrcfg/backup_server_page.cpp +++ b/src/WINNT/afssvrcfg/backup_server_page.cpp @@ -15,8 +15,10 @@ #include extern "C" { +#include #include #include +#include } #include "afscfg.h" diff --git a/src/WINNT/afssvrcfg/cfg_utils.cpp b/src/WINNT/afssvrcfg/cfg_utils.cpp index eb0d2a94f..58580f170 100644 --- a/src/WINNT/afssvrcfg/cfg_utils.cpp +++ b/src/WINNT/afssvrcfg/cfg_utils.cpp @@ -15,8 +15,10 @@ #include extern "C" { +#include #include #include +#include } #include "afscfg.h" diff --git a/src/WINNT/afssvrcfg/config_server_page.cpp b/src/WINNT/afssvrcfg/config_server_page.cpp index 44a418017..47a80e6c1 100644 --- a/src/WINNT/afssvrcfg/config_server_page.cpp +++ b/src/WINNT/afssvrcfg/config_server_page.cpp @@ -15,8 +15,10 @@ #include extern "C" { +#include #include #include +#include } #include "afscfg.h" diff --git a/src/WINNT/afssvrcfg/create_partition_dlg.cpp b/src/WINNT/afssvrcfg/create_partition_dlg.cpp index 42c6e46f2..4aecd544d 100644 --- a/src/WINNT/afssvrcfg/create_partition_dlg.cpp +++ b/src/WINNT/afssvrcfg/create_partition_dlg.cpp @@ -15,8 +15,10 @@ #include extern "C" { +#include #include #include +#include } #include "afscfg.h" // Main header for this application diff --git a/src/WINNT/afssvrcfg/db_server_page.cpp b/src/WINNT/afssvrcfg/db_server_page.cpp index d0c2e1764..cd2c9e307 100644 --- a/src/WINNT/afssvrcfg/db_server_page.cpp +++ b/src/WINNT/afssvrcfg/db_server_page.cpp @@ -15,8 +15,10 @@ #include extern "C" { +#include #include #include +#include } #include "afscfg.h" diff --git a/src/WINNT/afssvrcfg/file_server_page.cpp b/src/WINNT/afssvrcfg/file_server_page.cpp index ba90d0483..5f214fbd0 100644 --- a/src/WINNT/afssvrcfg/file_server_page.cpp +++ b/src/WINNT/afssvrcfg/file_server_page.cpp @@ -15,8 +15,10 @@ #include extern "C" { +#include #include #include +#include } #include "afscfg.h" diff --git a/src/WINNT/afssvrcfg/get_cur_config.cpp b/src/WINNT/afssvrcfg/get_cur_config.cpp index 99f88a66c..6453a28f2 100644 --- a/src/WINNT/afssvrcfg/get_cur_config.cpp +++ b/src/WINNT/afssvrcfg/get_cur_config.cpp @@ -15,8 +15,10 @@ #include extern "C" { +#include #include #include +#include } #include "afscfg.h" diff --git a/src/WINNT/afssvrcfg/get_pw_dlg.cpp b/src/WINNT/afssvrcfg/get_pw_dlg.cpp index 8f1375189..6a94293d4 100644 --- a/src/WINNT/afssvrcfg/get_pw_dlg.cpp +++ b/src/WINNT/afssvrcfg/get_pw_dlg.cpp @@ -15,8 +15,10 @@ #include extern "C" { +#include #include #include +#include } #include "afscfg.h" // Main header for this application diff --git a/src/WINNT/afssvrcfg/graphics.cpp b/src/WINNT/afssvrcfg/graphics.cpp index 9bfc8c54d..0bf87abdf 100644 --- a/src/WINNT/afssvrcfg/graphics.cpp +++ b/src/WINNT/afssvrcfg/graphics.cpp @@ -15,8 +15,10 @@ #include extern "C" { +#include #include #include +#include } #include "afscfg.h" diff --git a/src/WINNT/afssvrcfg/info2_page.cpp b/src/WINNT/afssvrcfg/info2_page.cpp index e60160626..2b95d2c58 100644 --- a/src/WINNT/afssvrcfg/info2_page.cpp +++ b/src/WINNT/afssvrcfg/info2_page.cpp @@ -15,8 +15,10 @@ #include extern "C" { +#include #include #include +#include } #include "afscfg.h" diff --git a/src/WINNT/afssvrcfg/info_page.cpp b/src/WINNT/afssvrcfg/info_page.cpp index 38498aa8c..9396f90a2 100644 --- a/src/WINNT/afssvrcfg/info_page.cpp +++ b/src/WINNT/afssvrcfg/info_page.cpp @@ -15,8 +15,10 @@ #include extern "C" { +#include #include #include +#include } #include "afscfg.h" diff --git a/src/WINNT/afssvrcfg/intro_page.cpp b/src/WINNT/afssvrcfg/intro_page.cpp index 7d66726d3..8a138173a 100644 --- a/src/WINNT/afssvrcfg/intro_page.cpp +++ b/src/WINNT/afssvrcfg/intro_page.cpp @@ -15,8 +15,10 @@ #include extern "C" { +#include #include #include +#include } #include "afscfg.h" diff --git a/src/WINNT/afssvrcfg/logfile.cpp b/src/WINNT/afssvrcfg/logfile.cpp index f85c04fc1..1f95acf6f 100644 --- a/src/WINNT/afssvrcfg/logfile.cpp +++ b/src/WINNT/afssvrcfg/logfile.cpp @@ -15,8 +15,10 @@ #include extern "C" { +#include #include #include +#include } extern "C" { diff --git a/src/WINNT/afssvrcfg/partition_page.cpp b/src/WINNT/afssvrcfg/partition_page.cpp index 1e8f03b5b..cfd628f61 100644 --- a/src/WINNT/afssvrcfg/partition_page.cpp +++ b/src/WINNT/afssvrcfg/partition_page.cpp @@ -15,8 +15,10 @@ #include extern "C" { +#include #include #include +#include } #include "afscfg.h" diff --git a/src/WINNT/afssvrcfg/partition_utils.cpp b/src/WINNT/afssvrcfg/partition_utils.cpp index ecfeef7ad..21ad19429 100644 --- a/src/WINNT/afssvrcfg/partition_utils.cpp +++ b/src/WINNT/afssvrcfg/partition_utils.cpp @@ -15,8 +15,10 @@ #include extern "C" { +#include #include #include +#include } #include "afscfg.h" diff --git a/src/WINNT/afssvrcfg/partitions_page.cpp b/src/WINNT/afssvrcfg/partitions_page.cpp index 5d06499f5..d41788d09 100644 --- a/src/WINNT/afssvrcfg/partitions_page.cpp +++ b/src/WINNT/afssvrcfg/partitions_page.cpp @@ -15,8 +15,10 @@ #include extern "C" { +#include #include #include +#include } #include "afscfg.h" diff --git a/src/WINNT/afssvrcfg/replicatition_page.cpp b/src/WINNT/afssvrcfg/replicatition_page.cpp index 409091985..25e17bc5b 100644 --- a/src/WINNT/afssvrcfg/replicatition_page.cpp +++ b/src/WINNT/afssvrcfg/replicatition_page.cpp @@ -15,8 +15,10 @@ #include extern "C" { +#include #include #include +#include } #include "afscfg.h" diff --git a/src/WINNT/afssvrcfg/root_afs_page.cpp b/src/WINNT/afssvrcfg/root_afs_page.cpp index f5fa3333a..5dff18f57 100644 --- a/src/WINNT/afssvrcfg/root_afs_page.cpp +++ b/src/WINNT/afssvrcfg/root_afs_page.cpp @@ -15,8 +15,10 @@ #include extern "C" { +#include #include #include +#include } #include "afscfg.h" diff --git a/src/WINNT/afssvrcfg/salvage_dlg.cpp b/src/WINNT/afssvrcfg/salvage_dlg.cpp index 147e0e6b1..3fdc4f366 100644 --- a/src/WINNT/afssvrcfg/salvage_dlg.cpp +++ b/src/WINNT/afssvrcfg/salvage_dlg.cpp @@ -15,8 +15,10 @@ #include extern "C" { +#include #include #include +#include } #include "afscfg.h" // Main header for this application diff --git a/src/WINNT/afssvrcfg/salvage_results_dlg.cpp b/src/WINNT/afssvrcfg/salvage_results_dlg.cpp index e42bdc445..2c3b6bb68 100644 --- a/src/WINNT/afssvrcfg/salvage_results_dlg.cpp +++ b/src/WINNT/afssvrcfg/salvage_results_dlg.cpp @@ -14,6 +14,12 @@ #include #include +extern "C" { +#include +#include +#include +} + #include "afscfg.h" // Main header for this application #include "resource.h" #include "salvage_results_dlg.h" diff --git a/src/WINNT/afssvrcfg/services_page.cpp b/src/WINNT/afssvrcfg/services_page.cpp index 123428792..484d76f86 100644 --- a/src/WINNT/afssvrcfg/services_page.cpp +++ b/src/WINNT/afssvrcfg/services_page.cpp @@ -15,8 +15,10 @@ #include extern "C" { +#include #include #include +#include } #include "afscfg.h" diff --git a/src/WINNT/afssvrcfg/sys_control_page.cpp b/src/WINNT/afssvrcfg/sys_control_page.cpp index 69528ae8b..1a54a2916 100644 --- a/src/WINNT/afssvrcfg/sys_control_page.cpp +++ b/src/WINNT/afssvrcfg/sys_control_page.cpp @@ -15,8 +15,10 @@ #include extern "C" { +#include #include #include +#include } #include "afscfg.h" diff --git a/src/WINNT/afssvrcfg/toolbox.cpp b/src/WINNT/afssvrcfg/toolbox.cpp index 015615896..9ea43adca 100644 --- a/src/WINNT/afssvrcfg/toolbox.cpp +++ b/src/WINNT/afssvrcfg/toolbox.cpp @@ -15,8 +15,10 @@ #include extern "C" { +#include #include #include +#include } #include "afscfg.h" diff --git a/src/WINNT/afssvrcfg/validation.cpp b/src/WINNT/afssvrcfg/validation.cpp index 7b2b672c0..552bda4af 100644 --- a/src/WINNT/afssvrcfg/validation.cpp +++ b/src/WINNT/afssvrcfg/validation.cpp @@ -14,6 +14,12 @@ #include #include +extern "C" { +#include +#include +#include +} + #include "afscfg.h" #include "resource.h" #include "validation.h" diff --git a/src/WINNT/afssvrcfg/volume_utils.cpp b/src/WINNT/afssvrcfg/volume_utils.cpp index 41fc5ac6f..741dbece4 100644 --- a/src/WINNT/afssvrcfg/volume_utils.cpp +++ b/src/WINNT/afssvrcfg/volume_utils.cpp @@ -15,8 +15,10 @@ #include extern "C" { +#include #include #include +#include } #include "afscfg.h" diff --git a/src/WINNT/afssvrmgr/creds.cpp b/src/WINNT/afssvrmgr/creds.cpp index 0e43f1e9f..db0533c6e 100644 --- a/src/WINNT/afssvrmgr/creds.cpp +++ b/src/WINNT/afssvrmgr/creds.cpp @@ -11,8 +11,10 @@ #include extern "C" { +#include #include #include +#include } #include "svrmgr.h" diff --git a/src/WINNT/aklog/NTMakefile b/src/WINNT/aklog/NTMakefile index 034eb920d..fedc31819 100644 --- a/src/WINNT/aklog/NTMakefile +++ b/src/WINNT/aklog/NTMakefile @@ -37,7 +37,8 @@ EXELIBS = \ $(DESTDIR)\lib\afsauthent.lib \ $(DESTDIR)\lib\afs\afskauth.lib \ $(DESTDIR)\lib\afs\afscom_err.lib \ - $(DESTDIR)\lib\afs\afsutil.lib + $(DESTDIR)\lib\afs\afsutil.lib \ + $(DESTDIR)\lib\afsroken.lib !IF "$(CPU)" == "IA64" || "$(CPU)" == "AMD64" || "$(CPU)" == "ALPHA64" OTHERLIBS = \ @@ -96,4 +97,3 @@ mkdir: nmake /nologo /f ntmakefile SRC=$(SRC) OBJ=$(OBJ) mkdir cd .. - \ No newline at end of file diff --git a/src/WINNT/aklog/aklog.c b/src/WINNT/aklog/aklog.c index d552e0c1f..aaaee4a76 100644 --- a/src/WINNT/aklog/aklog.c +++ b/src/WINNT/aklog/aklog.c @@ -45,6 +45,10 @@ #define HAVE_KRB4 #endif +#include +#include +#include + #include #include #include diff --git a/src/WINNT/client_config/drivemap.cpp b/src/WINNT/client_config/drivemap.cpp index 4ae9087e3..f0ecd648b 100644 --- a/src/WINNT/client_config/drivemap.cpp +++ b/src/WINNT/client_config/drivemap.cpp @@ -35,7 +35,9 @@ #include extern "C" { +#include #include +#include #include #include #include diff --git a/src/WINNT/client_config/tab_general.cpp b/src/WINNT/client_config/tab_general.cpp index f97caf7a8..f50c12007 100644 --- a/src/WINNT/client_config/tab_general.cpp +++ b/src/WINNT/client_config/tab_general.cpp @@ -11,7 +11,9 @@ #include extern "C" { +#include #include +#include #include #include #include diff --git a/src/WINNT/client_config/tab_hosts.cpp b/src/WINNT/client_config/tab_hosts.cpp index ffc529fc9..c2454295d 100644 --- a/src/WINNT/client_config/tab_hosts.cpp +++ b/src/WINNT/client_config/tab_hosts.cpp @@ -11,8 +11,10 @@ #include extern "C" { +#include #include #include +#include #include #include } diff --git a/src/WINNT/client_creds/advtab.cpp b/src/WINNT/client_creds/advtab.cpp index ee208ab71..06045f7f9 100644 --- a/src/WINNT/client_creds/advtab.cpp +++ b/src/WINNT/client_creds/advtab.cpp @@ -13,7 +13,9 @@ #include extern "C" { +#include #include +#include #include #include } diff --git a/src/WINNT/client_creds/afswiz.cpp b/src/WINNT/client_creds/afswiz.cpp index 719bb7551..e024fb133 100644 --- a/src/WINNT/client_creds/afswiz.cpp +++ b/src/WINNT/client_creds/afswiz.cpp @@ -11,7 +11,9 @@ #include extern "C" { +#include #include +#include #include #include } diff --git a/src/WINNT/client_creds/creds.cpp b/src/WINNT/client_creds/creds.cpp index 4488d83ca..1b0d9c94b 100644 --- a/src/WINNT/client_creds/creds.cpp +++ b/src/WINNT/client_creds/creds.cpp @@ -11,8 +11,10 @@ #include extern "C" { -#include +#include #include +#include +#include #include #include #include diff --git a/src/WINNT/client_creds/credstab.cpp b/src/WINNT/client_creds/credstab.cpp index 0872ff9ac..6926e1460 100644 --- a/src/WINNT/client_creds/credstab.cpp +++ b/src/WINNT/client_creds/credstab.cpp @@ -11,8 +11,10 @@ #include extern "C" { +#include #include #include +#include } #include "afscreds.h" diff --git a/src/WINNT/client_creds/ipaddrchg.c b/src/WINNT/client_creds/ipaddrchg.c index 20e91dc03..f0cae46df 100644 --- a/src/WINNT/client_creds/ipaddrchg.c +++ b/src/WINNT/client_creds/ipaddrchg.c @@ -62,6 +62,11 @@ #include #include + +#include +#include +#include + #define USE_MS2MIT 1 #include diff --git a/src/WINNT/client_creds/main.cpp b/src/WINNT/client_creds/main.cpp index a6499eb90..3193ea29b 100644 --- a/src/WINNT/client_creds/main.cpp +++ b/src/WINNT/client_creds/main.cpp @@ -11,7 +11,9 @@ #include extern "C" { +#include #include +#include #include #include #include diff --git a/src/WINNT/client_creds/misc.cpp b/src/WINNT/client_creds/misc.cpp index 7a449eeaa..cd4bb4c3d 100644 --- a/src/WINNT/client_creds/misc.cpp +++ b/src/WINNT/client_creds/misc.cpp @@ -11,8 +11,10 @@ #include extern "C" { +#include #include #include +#include } #include "afscreds.h" diff --git a/src/WINNT/client_creds/mounttab.cpp b/src/WINNT/client_creds/mounttab.cpp index f4e086056..7d52bd1d0 100644 --- a/src/WINNT/client_creds/mounttab.cpp +++ b/src/WINNT/client_creds/mounttab.cpp @@ -11,7 +11,10 @@ #include extern "C" { +#include #include +#include + #include #include } diff --git a/src/WINNT/client_creds/settings.cpp b/src/WINNT/client_creds/settings.cpp index 95bde308d..66cfb9949 100644 --- a/src/WINNT/client_creds/settings.cpp +++ b/src/WINNT/client_creds/settings.cpp @@ -11,7 +11,9 @@ #include extern "C" { +#include #include +#include #include } diff --git a/src/WINNT/client_creds/shortcut.cpp b/src/WINNT/client_creds/shortcut.cpp index 904d9a12c..f53a8cf2c 100644 --- a/src/WINNT/client_creds/shortcut.cpp +++ b/src/WINNT/client_creds/shortcut.cpp @@ -11,7 +11,9 @@ #include extern "C" { +#include #include +#include #include } diff --git a/src/WINNT/client_creds/trayicon.cpp b/src/WINNT/client_creds/trayicon.cpp index 39c768c89..3832e39d9 100644 --- a/src/WINNT/client_creds/trayicon.cpp +++ b/src/WINNT/client_creds/trayicon.cpp @@ -11,7 +11,9 @@ #include extern "C" { +#include #include +#include #include } diff --git a/src/WINNT/client_creds/window.cpp b/src/WINNT/client_creds/window.cpp index a345c28c2..b4374c822 100644 --- a/src/WINNT/client_creds/window.cpp +++ b/src/WINNT/client_creds/window.cpp @@ -11,7 +11,9 @@ #include extern "C" { +#include #include +#include #include #include #include "ipaddrchg.h" diff --git a/src/WINNT/client_exp/gui2fs.cpp b/src/WINNT/client_exp/gui2fs.cpp index 87a1ef0f8..79fc5c7ca 100644 --- a/src/WINNT/client_exp/gui2fs.cpp +++ b/src/WINNT/client_exp/gui2fs.cpp @@ -12,7 +12,9 @@ #include extern "C" { +#include #include +#include #include } diff --git a/src/WINNT/client_exp/klog_dlg.cpp b/src/WINNT/client_exp/klog_dlg.cpp index c7acc85d2..61f0695db 100644 --- a/src/WINNT/client_exp/klog_dlg.cpp +++ b/src/WINNT/client_exp/klog_dlg.cpp @@ -12,15 +12,16 @@ #include extern "C" { +#include #include #include +#include } #include "klog_dlg.h" #include "hourglass.h" extern "C" { -#include #include #include "cm_config.h" } diff --git a/src/WINNT/client_exp/unlog_dlg.cpp b/src/WINNT/client_exp/unlog_dlg.cpp index b0cf9c6e9..29760d63c 100644 --- a/src/WINNT/client_exp/unlog_dlg.cpp +++ b/src/WINNT/client_exp/unlog_dlg.cpp @@ -12,7 +12,9 @@ #include extern "C" { +#include #include +#include #include } diff --git a/src/WINNT/netidmgr_plugin/afsconfigdlg.c b/src/WINNT/netidmgr_plugin/afsconfigdlg.c index bcc82c108..93f4c2f05 100644 --- a/src/WINNT/netidmgr_plugin/afsconfigdlg.c +++ b/src/WINNT/netidmgr_plugin/afsconfigdlg.c @@ -24,6 +24,10 @@ /* $Id$ */ +#include +#include +#include + #include #include #include diff --git a/src/WINNT/netidmgr_plugin/afsext.c b/src/WINNT/netidmgr_plugin/afsext.c index 2e07c3135..d9a41d329 100644 --- a/src/WINNT/netidmgr_plugin/afsext.c +++ b/src/WINNT/netidmgr_plugin/afsext.c @@ -24,6 +24,10 @@ /* $Id$ */ +#include +#include +#include + #include #include #include diff --git a/src/WINNT/netidmgr_plugin/afsfuncs.c b/src/WINNT/netidmgr_plugin/afsfuncs.c index 93f8df3a4..1b4e6d9cd 100644 --- a/src/WINNT/netidmgr_plugin/afsfuncs.c +++ b/src/WINNT/netidmgr_plugin/afsfuncs.c @@ -29,6 +29,11 @@ #pragma warning (push) #pragma warning (disable: 4005) + +#include +#include +#include + #include #include #include diff --git a/src/WINNT/netidmgr_plugin/afshelp.c b/src/WINNT/netidmgr_plugin/afshelp.c index 30a7cc619..316ea4855 100644 --- a/src/WINNT/netidmgr_plugin/afshelp.c +++ b/src/WINNT/netidmgr_plugin/afshelp.c @@ -26,6 +26,11 @@ #define NOSTRSAFE + +#include +#include +#include + #include #include #include diff --git a/src/WINNT/netidmgr_plugin/afsicon.c b/src/WINNT/netidmgr_plugin/afsicon.c index 54cb6dd85..bb0e18277 100644 --- a/src/WINNT/netidmgr_plugin/afsicon.c +++ b/src/WINNT/netidmgr_plugin/afsicon.c @@ -1,4 +1,8 @@ +#include +#include +#include + #define NOSTRSAFE #include "afscred.h" #include "AFS_component_version_number.h" diff --git a/src/WINNT/netidmgr_plugin/afsnewcreds.c b/src/WINNT/netidmgr_plugin/afsnewcreds.c index e079550bf..01dc909d3 100644 --- a/src/WINNT/netidmgr_plugin/afsnewcreds.c +++ b/src/WINNT/netidmgr_plugin/afsnewcreds.c @@ -24,6 +24,10 @@ /* $Id$ */ +#include +#include +#include + #include #include #include diff --git a/src/WINNT/netidmgr_plugin/afsplugin.c b/src/WINNT/netidmgr_plugin/afsplugin.c index 89cb2b4f5..8a697b3b4 100644 --- a/src/WINNT/netidmgr_plugin/afsplugin.c +++ b/src/WINNT/netidmgr_plugin/afsplugin.c @@ -24,6 +24,10 @@ /* $Id$ */ +#include +#include +#include + #include #include #include diff --git a/src/WINNT/netidmgr_plugin/main.c b/src/WINNT/netidmgr_plugin/main.c index 916459034..2cd96f07a 100644 --- a/src/WINNT/netidmgr_plugin/main.c +++ b/src/WINNT/netidmgr_plugin/main.c @@ -29,6 +29,11 @@ #pragma warning (push) #pragma warning (disable: 4005) + +#include +#include +#include + #include #include #include diff --git a/src/afs/UKERNEL/sysincludes.h b/src/afs/UKERNEL/sysincludes.h index 7ee3db3b8..864c67438 100644 --- a/src/afs/UKERNEL/sysincludes.h +++ b/src/afs/UKERNEL/sysincludes.h @@ -206,9 +206,8 @@ typedef unsigned int fsblkcnt_t; #ifdef UKERNEL -#ifdef AFS_USR_SGI_ENV #undef socket -#endif /* AFS_USR_SGI_ENV */ +#undef flock #if defined(AFS_USR_DARWIN_ENV) || defined(AFS_USR_FBSD_ENV) #undef if_mtu diff --git a/src/afsd/Makefile.in b/src/afsd/Makefile.in index 95f5b9af3..f0b244d2d 100644 --- a/src/afsd/Makefile.in +++ b/src/afsd/Makefile.in @@ -32,15 +32,16 @@ FUSE_LIBS=@FUSE_LIBS@ LDFLAGS_afsd = $(AFSD_LDFLAGS) afsd: afsd.o afsd_kernel.o $(AFSLIBS) $(AFSD_LIBS) ${AFS_LDRULE} afsd.o afsd_kernel.o $(NON_SHARED) \ - $(AFSLIBS) ${XLIBS} ${AFSD_LIBS} + $(AFSLIBS) $(LIB_roken) ${XLIBS} ${AFSD_LIBS} LDFLAGS_afsd.fuse = $(AFSD_LDFLAGS) afsd.fuse: afsd_fuse.o $(UAFSLIBS) $(AFSD_LIBS) ${AFS_LDRULE} afsd_fuse.o $(NON_SHARED) \ - $(UAFSLIBS) ${XLIBS} ${FUSE_LIBS} ${AFSD_LIBS} + $(UAFSLIBS) $(LIB_roken) ${XLIBS} ${FUSE_LIBS} ${AFSD_LIBS} vsys: vsys.o - ${AFS_LDRULE} vsys.o ${TOP_LIBDIR}/libsys.a ${XLIBS} + ${AFS_LDRULE} vsys.o ${TOP_LIBDIR}/libsys.a \ + $(LIB_roken) ${XLIBS} # # Objects diff --git a/src/afsmonitor/Makefile.in b/src/afsmonitor/Makefile.in index f65358350..4a1cf1ab4 100644 --- a/src/afsmonitor/Makefile.in +++ b/src/afsmonitor/Makefile.in @@ -50,10 +50,11 @@ afsmonitor.o: afsmonitor.c ${INCLS} AFS_component_version_number.c afsmonitor: afsmonitor.o afsmon-win.o afsmon-output.o ${LIBS} $(AFS_LDRULE) afsmonitor.o afsmon-win.o afsmon-output.o \ - ${LIBS} ${EXTRA_LIBS} + ${LIBS} $(LIB_roken) ${EXTRA_LIBS} afsmon-parselog: afsmon-parselog.o ${LIBS} - $(AFS_LDRULE) afsmon-parselog.c ${LIBS} ${EXTRA_LIBS} + $(AFS_LDRULE) afsmon-parselog.c \ + ${LIBS} $(LIB_roken) ${EXTRA_LIBS} install: afsmonitor ${INSTALL} -d ${DESTDIR}${bindir} diff --git a/src/aklog/Makefile.in b/src/aklog/Makefile.in index 84367e3bc..2ed130c31 100644 --- a/src/aklog/Makefile.in +++ b/src/aklog/Makefile.in @@ -26,13 +26,14 @@ OBJS= aklog.o krb_util.o linked_list.o all: aklog asetkey klog aklog: ${OBJS} ${AFSLIBS} - $(AFS_LDRULE) ${OBJS} ${AKLIBS} ${AFSLIBS} ${XLIBS} + $(AFS_LDRULE) ${OBJS} ${AKLIBS} ${AFSLIBS} $(LIB_roken) ${XLIBS} asetkey: asetkey.o ${AFSLIBS} - $(AFS_LDRULE) asetkey.o ${AKLIBS} ${AFSLIBS} ${XLIBS} + $(AFS_LDRULE) asetkey.o ${AKLIBS} ${AFSLIBS} $(LIB_roken) ${XLIBS} klog: klog.o skipwrap.o ${AFSLIBS} - $(AFS_LDRULE) klog.o skipwrap.o ${AKLIBS} ${AFSLIBS} ${XLIBS} + $(AFS_LDRULE) klog.o skipwrap.o \ + ${AKLIBS} ${AFSLIBS} $(LIB_roken) ${XLIBS} # # Installation targets diff --git a/src/audit/audit.c b/src/audit/audit.c index dacbef7e8..7e0a2ab7b 100644 --- a/src/audit/audit.c +++ b/src/audit/audit.c @@ -10,6 +10,7 @@ #include #include +#include #include #include diff --git a/src/auth/NTMakefile b/src/auth/NTMakefile index bc38d2d45..df3d8f3ec 100644 --- a/src/auth/NTMakefile +++ b/src/auth/NTMakefile @@ -93,7 +93,8 @@ EXELIBS =\ $(EXELIBDIR)\afs\afsutil.lib \ $(EXELIBDIR)\afs\afseventlog.lib \ $(EXELIBDIR)\afs\afsreg.lib \ - $(EXELIBDIR)\libafsconf.lib + $(EXELIBDIR)\libafsconf.lib \ + $(EXELIBDIR)\afsroken.lib $(SETKEY_EXEFILE): $(SETKEY_EXEOBJS) $(EXELIBS) $(EXECONLINK) dnsapi.lib shell32.lib diff --git a/src/auth/authcon.c b/src/auth/authcon.c index 574c4d0be..60722e6ad 100644 --- a/src/auth/authcon.c +++ b/src/auth/authcon.c @@ -10,6 +10,8 @@ #include #include +#include + #include #include #include diff --git a/src/auth/cellconfig.c b/src/auth/cellconfig.c index bc1b3efc8..25c0a8404 100644 --- a/src/auth/cellconfig.c +++ b/src/auth/cellconfig.c @@ -10,6 +10,7 @@ #include #include +#include #include #include diff --git a/src/auth/ktc_nt.c b/src/auth/ktc_nt.c index bf7170a9b..49a1985b8 100644 --- a/src/auth/ktc_nt.c +++ b/src/auth/ktc_nt.c @@ -12,6 +12,7 @@ #include #include +#include #include #include @@ -445,7 +446,7 @@ ktc_GetToken(struct ktc_principal *server, struct ktc_token *token, { struct ViceIoctl iob; char tbuffer[TBUFFERSIZE]; - int len; + size_t len; char *tp, *cp; char *ticketP; int ticketLen, temp; diff --git a/src/auth/setkey.c b/src/auth/setkey.c index 0adc7949d..a53f4cbba 100644 --- a/src/auth/setkey.c +++ b/src/auth/setkey.c @@ -10,6 +10,7 @@ #include #include +#include #include #include diff --git a/src/auth/token.c b/src/auth/token.c index 0745f9969..585d6ebdf 100644 --- a/src/auth/token.c +++ b/src/auth/token.c @@ -24,6 +24,9 @@ #include #include + +#include + #include #include #include diff --git a/src/auth/userok.c b/src/auth/userok.c index 28e715a2b..36260e55f 100644 --- a/src/auth/userok.c +++ b/src/auth/userok.c @@ -10,6 +10,7 @@ #include #include +#include #include #include diff --git a/src/auth/writeconfig.c b/src/auth/writeconfig.c index 4e43f7fb7..46c965453 100644 --- a/src/auth/writeconfig.c +++ b/src/auth/writeconfig.c @@ -10,6 +10,7 @@ #include #include +#include #include #include diff --git a/src/bozo/Makefile.in b/src/bozo/Makefile.in index 9abeaf241..942d10ea0 100644 --- a/src/bozo/Makefile.in +++ b/src/bozo/Makefile.in @@ -97,12 +97,12 @@ bosoprocs.o: bosoprocs.c ${INCLS} bos.o: bos.c ${INCLS} AFS_component_version_number.o bos: bos.o $(LIBS) libbos.a - $(AFS_LDRULE) bos.o libbos.a $(LIBS) ${XLIBS} + $(AFS_LDRULE) bos.o libbos.a $(LIBS) $(LIB_roken) ${XLIBS} bos_util.o: bos_util.c ${INCLS} AFS_component_version_number.o ${TOP_INCDIR}/afs/bnode.h -bos_util: bos_util.o $(LIBS) - $(AFS_LDRULE) bos_util.o $(LIBS) ${XLIBS} +bos_util: bos_util.o $(LIBS) + $(AFS_LDRULE) bos_util.o $(LIBS) $(LIB_roken) ${XLIBS} ezbnodeops.o: ezbnodeops.c ${INCLS} @@ -114,7 +114,8 @@ libbos.a: bosint.xdr.o bosint.cs.o boserr.o AFS_component_version_number.o $(RANLIB) $@ bosserver: $(OBJS) $(LIBS) - $(AFS_LDRULE) $(OBJS) ${TOP_LIBDIR}/libaudit.a $(LIBS) ${XLIBS} + $(AFS_LDRULE) $(OBJS) ${TOP_LIBDIR}/libaudit.a \ + $(LIBS) $(LIB_roken) ${XLIBS} # # Install targets diff --git a/src/bozo/NTMakefile b/src/bozo/NTMakefile index 27d9c2b38..61b67640b 100644 --- a/src/bozo/NTMakefile +++ b/src/bozo/NTMakefile @@ -68,7 +68,8 @@ BOSSERVER_EXELIBS =\ $(DESTDIR)\lib\afs\afseventlog.lib \ $(DESTDIR)\lib\afs\afsprocmgmt.lib \ $(DESTDIR)\lib\libafsconf.lib \ - $(DESTDIR)\lib\afs\afspioctl.lib + $(DESTDIR)\lib\afs\afspioctl.lib \ + $(DESTDIR)\lib\afsroken.lib $(BOSSERVER_EXEFILE): $(BOSSERVER_EXEOBJS) $(BOSSERVER_EXELIBS) $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib shell32.lib @@ -105,7 +106,8 @@ BOS_EXELIBS =\ $(DESTDIR)\lib\afs\afsreg.lib \ $(DESTDIR)\lib\afs\afsprocmgmt.lib \ $(DESTDIR)\lib\afs\afspioctl.lib \ - $(DESTDIR)\lib\libafsconf.lib + $(DESTDIR)\lib\libafsconf.lib \ + $(DESTDIR)\lib\afsroken.lib $(RS_BOS_EXEFILE): $(BOS_EXEOBJS) $(BOS_EXELIBS) diff --git a/src/bozo/bnode.c b/src/bozo/bnode.c index c2d1fdd4f..6dcd82341 100644 --- a/src/bozo/bnode.c +++ b/src/bozo/bnode.c @@ -10,6 +10,8 @@ #include #include +#include +#include #include #include diff --git a/src/bozo/bos.c b/src/bozo/bos.c index 57e1a66b0..527ac75c6 100644 --- a/src/bozo/bos.c +++ b/src/bozo/bos.c @@ -10,6 +10,8 @@ #include #include +#include +#include #include #include diff --git a/src/bozo/bosoprocs.c b/src/bozo/bosoprocs.c index d381d16be..f8763187e 100644 --- a/src/bozo/bosoprocs.c +++ b/src/bozo/bosoprocs.c @@ -10,6 +10,7 @@ #include #include +#include #include #include diff --git a/src/bozo/bosserver.c b/src/bozo/bosserver.c index e9fd51316..65185d919 100644 --- a/src/bozo/bosserver.c +++ b/src/bozo/bosserver.c @@ -10,6 +10,9 @@ #include #include +#include +#include + #ifdef IGNORE_SOME_GCC_WARNINGS # pragma GCC diagnostic warning "-Wdeprecated-declarations" #endif diff --git a/src/bozo/cronbnodeops.c b/src/bozo/cronbnodeops.c index 01026e345..4f0205bfe 100644 --- a/src/bozo/cronbnodeops.c +++ b/src/bozo/cronbnodeops.c @@ -10,6 +10,8 @@ #include #include +#include +#include #include #include diff --git a/src/bozo/ezbnodeops.c b/src/bozo/ezbnodeops.c index b7916465e..0cfd3e74f 100644 --- a/src/bozo/ezbnodeops.c +++ b/src/bozo/ezbnodeops.c @@ -10,6 +10,8 @@ #include #include +#include +#include #include #include diff --git a/src/bozo/fsbnodeops.c b/src/bozo/fsbnodeops.c index a81374d7f..e5684a11e 100644 --- a/src/bozo/fsbnodeops.c +++ b/src/bozo/fsbnodeops.c @@ -10,6 +10,8 @@ #include #include +#include +#include #include #include diff --git a/src/bubasics/NTMakefile b/src/bubasics/NTMakefile index de5f59f6f..4569b5000 100644 --- a/src/bubasics/NTMakefile +++ b/src/bubasics/NTMakefile @@ -47,28 +47,28 @@ $(LIBFILE): $(LIBOBJS) # rxgen on butc.xg and bumon.xg butc.xdr.c: butc.xg butc.h - $(RXGEN) -c -o $@ butc.xg + $(RXGEN) -A -c -x -o $@ butc.xg butc.ss.c: butc.xg butc.h - $(RXGEN) -S -o $@ butc.xg + $(RXGEN) -A -S -o $@ butc.xg butc.cs.c: butc.xg butc.h - $(RXGEN) -C -o $@ butc.xg + $(RXGEN) -A -C -o $@ butc.xg butc.h: butc.xg - $(RXGEN) -h -o $@ butc.xg + $(RXGEN) -A -h -o $@ butc.xg bumon.xdr.c: bumon.xg bumon.h - $(RXGEN) -c -o $@ bumon.xg + $(RXGEN) -A -c -x -o $@ bumon.xg bumon.ss.c: bumon.xg bumon.h - $(RXGEN) -S -o $@ bumon.xg + $(RXGEN) -A -S -o $@ bumon.xg bumon.cs.c: bumon.xg bumon.h - $(RXGEN) -C -o $@ bumon.xg + $(RXGEN) -A -C -o $@ bumon.xg bumon.h: bumon.xg - $(RXGEN) -h -o $@ bumon.xg + $(RXGEN) -A -h -o $@ bumon.xg ############################################################################ # compile_et on butm_errs.et and butc_errs.et diff --git a/src/bucoord/Makefile.in b/src/bucoord/Makefile.in index ce9f57e6c..192b0b18b 100644 --- a/src/bucoord/Makefile.in +++ b/src/bucoord/Makefile.in @@ -68,7 +68,7 @@ main.o: AFS_component_version_number.c $(BACKOBJS): bc.h ${TOP_INCDIR}/afs/butc.h backup: $(BACKOBJS) ${LIBS} - $(AFS_LDRULE) $(BACKOBJS) ${LIBS} ${XLIBS} + $(AFS_LDRULE) $(BACKOBJS) ${LIBS} $(LIB_roken) ${XLIBS} bc.h: bucoord_errs.c diff --git a/src/bucoord/NTMakefile b/src/bucoord/NTMakefile index 0151a882b..c9919cb90 100644 --- a/src/bucoord/NTMakefile +++ b/src/bucoord/NTMakefile @@ -91,7 +91,8 @@ EXELIBS =\ $(DESTDIR)\lib\afs\afsprocmgmt.lib \ $(DESTDIR)\lib\afs\afspioctl.lib \ $(DESTDIR)\lib\afs\afsreg.lib \ - $(DESTDIR)\lib\libafsconf.lib + $(DESTDIR)\lib\libafsconf.lib \ + $(DESTDIR)\lib\afsroken.lib $(EXEFILE): $(EXEOBJS) $(EXERES) $(EXELIBS) diff --git a/src/bucoord/bc_status.c b/src/bucoord/bc_status.c index 64ae7be3e..265562cd8 100644 --- a/src/bucoord/bc_status.c +++ b/src/bucoord/bc_status.c @@ -10,6 +10,7 @@ #include #include +#include #include #ifdef AFS_NT40_ENV diff --git a/src/bucoord/commands.c b/src/bucoord/commands.c index 8fd4a0e52..8c61871dc 100644 --- a/src/bucoord/commands.c +++ b/src/bucoord/commands.c @@ -10,6 +10,7 @@ #include #include +#include #include #if defined(AFS_LINUX24_ENV) diff --git a/src/bucoord/config.c b/src/bucoord/config.c index 444d726f0..86624fd50 100644 --- a/src/bucoord/config.c +++ b/src/bucoord/config.c @@ -10,6 +10,7 @@ #include #include +#include #include #ifdef AFS_NT40_ENV diff --git a/src/bucoord/dlq.c b/src/bucoord/dlq.c index 05078b75b..a8b315875 100644 --- a/src/bucoord/dlq.c +++ b/src/bucoord/dlq.c @@ -9,6 +9,9 @@ #include #include + +#include + #ifdef HAVE_STDLIB_H #include #endif diff --git a/src/bucoord/dsstub.c b/src/bucoord/dsstub.c index 23eb0c9d7..0d356dea3 100644 --- a/src/bucoord/dsstub.c +++ b/src/bucoord/dsstub.c @@ -14,6 +14,7 @@ #include #include +#include #include #include diff --git a/src/bucoord/dsvs.c b/src/bucoord/dsvs.c index 5cceda6e4..c48a58539 100644 --- a/src/bucoord/dsvs.c +++ b/src/bucoord/dsvs.c @@ -18,6 +18,7 @@ #include #include +#include #include #include diff --git a/src/bucoord/dump.c b/src/bucoord/dump.c index 09c364d4b..062c7c0b0 100644 --- a/src/bucoord/dump.c +++ b/src/bucoord/dump.c @@ -14,6 +14,7 @@ #include #include +#include #include #include diff --git a/src/bucoord/dump_sched.c b/src/bucoord/dump_sched.c index 05e8983dd..95146f357 100644 --- a/src/bucoord/dump_sched.c +++ b/src/bucoord/dump_sched.c @@ -17,6 +17,7 @@ #include #include +#include #ifdef AFS_NT40_ENV #include diff --git a/src/bucoord/main.c b/src/bucoord/main.c index 3f38d07dc..ce3d7a253 100644 --- a/src/bucoord/main.c +++ b/src/bucoord/main.c @@ -10,6 +10,7 @@ #include #include +#include #include #include diff --git a/src/bucoord/restore.c b/src/bucoord/restore.c index 69bfba294..8c61bc965 100644 --- a/src/bucoord/restore.c +++ b/src/bucoord/restore.c @@ -14,6 +14,7 @@ #include #include +#include #include #include diff --git a/src/bucoord/server.c b/src/bucoord/server.c index 1f61dbe0f..02dda6d0d 100644 --- a/src/bucoord/server.c +++ b/src/bucoord/server.c @@ -11,6 +11,7 @@ #include #include +#include #ifdef AFS_NT40_ENV #include diff --git a/src/bucoord/status.c b/src/bucoord/status.c index 0940d88f5..ed5a5d66f 100644 --- a/src/bucoord/status.c +++ b/src/bucoord/status.c @@ -10,6 +10,7 @@ #include #include +#include #include #include diff --git a/src/bucoord/tape_hosts.c b/src/bucoord/tape_hosts.c index b09811c1d..47bc05e4e 100644 --- a/src/bucoord/tape_hosts.c +++ b/src/bucoord/tape_hosts.c @@ -10,6 +10,7 @@ #include #include +#include #include #include diff --git a/src/bucoord/ubik_db_if.c b/src/bucoord/ubik_db_if.c index 92ac59ecc..45aa8ef94 100644 --- a/src/bucoord/ubik_db_if.c +++ b/src/bucoord/ubik_db_if.c @@ -12,6 +12,8 @@ #include #include +#include + #ifdef IGNORE_SOME_GCC_WARNINGS # pragma GCC diagnostic warning "-Wstrict-prototypes" #endif diff --git a/src/bucoord/vol_sets.c b/src/bucoord/vol_sets.c index a184511ed..581cada4d 100644 --- a/src/bucoord/vol_sets.c +++ b/src/bucoord/vol_sets.c @@ -10,6 +10,7 @@ #include #include +#include #include #include diff --git a/src/bucoord/volstub.c b/src/bucoord/volstub.c index 46d312c95..b2e302026 100644 --- a/src/bucoord/volstub.c +++ b/src/bucoord/volstub.c @@ -10,6 +10,7 @@ #include #include +#include #include #ifdef AFS_NT40_ENV diff --git a/src/budb/Makefile.in b/src/budb/Makefile.in index b8aefbdcb..d09490512 100644 --- a/src/budb/Makefile.in +++ b/src/budb/Makefile.in @@ -98,7 +98,7 @@ struct_ops.o: budb_errs.h ${TOP_INCDIR}/afs/budb_client.h server.o: server.c budb_errs.h ${INCLS} AFS_component_version_number.c budb_server: $(SERVER_OBJS) ${LIBS} ${TOP_INCDIR}/afs/budb_client.h - $(AFS_LDRULE) $(SERVER_OBJS) ${LIBS} ${XLIBS} + $(AFS_LDRULE) $(SERVER_OBJS) ${LIBS} $(LIB_roken) ${XLIBS} budb.cs.c: budb.rg ${RXGEN} -A -u -C -o $@ ${srcdir}/budb.rg diff --git a/src/budb/NTMakefile b/src/budb/NTMakefile index ad994bba1..7b103b621 100644 --- a/src/budb/NTMakefile +++ b/src/budb/NTMakefile @@ -79,7 +79,8 @@ EXELIBS =\ $(DESTDIR)\lib\afs\afsreg.lib \ $(DESTDIR)\lib\afs\afsprocmgmt.lib \ $(DESTDIR)\lib\libafsconf.lib \ - $(DESTDIR)\lib\afs\afspioctl.lib + $(DESTDIR)\lib\afs\afspioctl.lib \ + $(DESTDIR)\lib\afsroken.lib $(EXEFILE): $(EXEOBJS) $(EXELIBS) $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib shell32.lib @@ -97,16 +98,16 @@ $(OUT)\buserver.res: AFS_component_version_number.h # rxgen budb.rg budb.cs.c: budb.rg budb.h - $(RXGEN) -u -C -o $@ budb.rg + $(RXGEN) -A -u -C -o $@ budb.rg budb.ss.c: budb.rg budb.h - $(RXGEN) -S -o $@ budb.rg + $(RXGEN) -A -S -o $@ budb.rg budb.xdr.c: budb.rg budb.h - $(RXGEN) -c -o $@ budb.rg + $(RXGEN) -A -x -c -o $@ budb.rg budb.h: budb.rg - $(RXGEN) -u -h -o budb.h budb.rg + $(RXGEN) -A -u -h -o budb.h budb.rg $(INCFILEDIR)\budb.h: budb.h $(COPY) budb.h $(INCFILEDIR)\budb.h diff --git a/src/budb/database.c b/src/budb/database.c index 8341161b6..94045e2d2 100644 --- a/src/budb/database.c +++ b/src/budb/database.c @@ -10,6 +10,7 @@ #include #include +#include #ifdef AFS_NT40_ENV #include diff --git a/src/budb/db_alloc.c b/src/budb/db_alloc.c index 3545fd3d1..54e1f00c3 100644 --- a/src/budb/db_alloc.c +++ b/src/budb/db_alloc.c @@ -10,6 +10,7 @@ #include #include +#include #ifdef AFS_NT40_ENV #include diff --git a/src/budb/db_dump.c b/src/budb/db_dump.c index dbecce45a..beb900932 100644 --- a/src/budb/db_dump.c +++ b/src/budb/db_dump.c @@ -15,6 +15,7 @@ #include #include +#include #ifdef AFS_NT40_ENV #include diff --git a/src/budb/db_hash.c b/src/budb/db_hash.c index fa2de597c..bfe12ed51 100644 --- a/src/budb/db_hash.c +++ b/src/budb/db_hash.c @@ -10,6 +10,7 @@ #include #include +#include #ifdef AFS_NT40_ENV #include diff --git a/src/budb/db_lock.c b/src/budb/db_lock.c index 59334b390..5f499a36d 100644 --- a/src/budb/db_lock.c +++ b/src/budb/db_lock.c @@ -10,6 +10,7 @@ #include #include +#include #include #ifdef AFS_NT40_ENV diff --git a/src/budb/db_text.c b/src/budb/db_text.c index 083c3cf58..72060d610 100644 --- a/src/budb/db_text.c +++ b/src/budb/db_text.c @@ -10,6 +10,7 @@ #include #include +#include #ifdef AFS_NT40_ENV #include diff --git a/src/budb/dbs_dump.c b/src/budb/dbs_dump.c index d980f26d3..cf828ae26 100644 --- a/src/budb/dbs_dump.c +++ b/src/budb/dbs_dump.c @@ -10,6 +10,7 @@ #include #include +#include #ifdef AFS_NT40_ENV #include diff --git a/src/budb/ol_verify.c b/src/budb/ol_verify.c index a53f921fe..e52a4215a 100644 --- a/src/budb/ol_verify.c +++ b/src/budb/ol_verify.c @@ -12,6 +12,7 @@ #include #include +#include #include #ifdef AFS_NT40_ENV diff --git a/src/budb/procs.c b/src/budb/procs.c index 8cf051e42..1d654356d 100644 --- a/src/budb/procs.c +++ b/src/budb/procs.c @@ -16,6 +16,7 @@ #include #include +#include #ifdef AFS_NT40_ENV #include diff --git a/src/budb/server.c b/src/budb/server.c index e5cb4600d..9f1f214e4 100644 --- a/src/budb/server.c +++ b/src/budb/server.c @@ -10,6 +10,7 @@ #include #include +#include #include #include diff --git a/src/budb/struct_ops.c b/src/budb/struct_ops.c index f7399d3ec..3ec27ce37 100644 --- a/src/budb/struct_ops.c +++ b/src/budb/struct_ops.c @@ -10,6 +10,7 @@ #include #include +#include #include #ifdef AFS_NT40_ENV diff --git a/src/butc/Makefile.in b/src/butc/Makefile.in index 8de87612f..627af8650 100644 --- a/src/butc/Makefile.in +++ b/src/butc/Makefile.in @@ -58,7 +58,7 @@ SOBJS=dbentries.o tcprocs.o lwps.o tcmain.o list.o recoverDb.o tcudbprocs.o \ all: butc read_tape butc_test: ${TESTOBJS} ${LIBS} ${INCLS} ${HACKS} - $(AFS_LDRULE) ${TESTOBJS} ${LIBS} ${XLIBS} + $(AFS_LDRULE) ${TESTOBJS} ${LIBS} $(LIB_roken) ${XLIBS} tdump: tdump.c AFS_component_version_number.c $(CC) $(AFS_CPPFLAGS) $(AFS_CFLAGS) $(AFS_LDFLAGS) \ @@ -66,9 +66,9 @@ tdump: tdump.c AFS_component_version_number.c butc: ${SOBJS} ${LIBS} ${INCLS} ${HACKS} @case ${SYS_NAME} in \ - rs_aix*) $(AFS_LDRULE) ${SOBJS} ${LIBS} ${XLIBS} \ + rs_aix*) $(AFS_LDRULE) ${SOBJS} ${LIBS} $(LIB_roken) ${XLIBS} \ /usr/lib/libc_r.a ;; \ - *) $(AFS_LDRULE) ${SOBJS} ${LIBS} ${XLIBS} ;; \ + *) $(AFS_LDRULE) ${SOBJS} ${LIBS} $(LIB_roken) ${XLIBS} ;; \ esac tcmain.o: tcmain.c ${INCLS} AFS_component_version_number.c diff --git a/src/butc/NTMakefile b/src/butc/NTMakefile index 4e602dd04..6f65a8139 100644 --- a/src/butc/NTMakefile +++ b/src/butc/NTMakefile @@ -53,7 +53,8 @@ EXELIBS =\ $(DESTDIR)\lib\afs\afspioctl.lib \ $(DESTDIR)\lib\afs\afseventlog.lib \ $(DESTDIR)\lib\afs\afsreg.lib \ - $(DESTDIR)\lib\libafsconf.lib + $(DESTDIR)\lib\libafsconf.lib \ + $(DESTDIR)\lib\afsroken.lib $(EXERES): butc.rc AFS_component_version_number.h diff --git a/src/butc/dbentries.c b/src/butc/dbentries.c index 0270cbdba..728c68d85 100644 --- a/src/butc/dbentries.c +++ b/src/butc/dbentries.c @@ -10,6 +10,7 @@ #include #include +#include #include #ifdef AFS_NT40_ENV diff --git a/src/butc/dump.c b/src/butc/dump.c index 229d312af..2a41c396f 100644 --- a/src/butc/dump.c +++ b/src/butc/dump.c @@ -10,6 +10,8 @@ #include #include +#include + #include #ifdef AFS_NT40_ENV #include @@ -100,15 +102,6 @@ afs_int32 tapeblocks; /* Number of 16K tape datablocks in buffer (!CONF_XBSA) * else \ sprintf(dumpname, "%s (DumpId %u)", name, dbDumpId); -#if defined(AFS_NT40_ENV) || defined(AFS_SUN4_ENV) -int -localtime_r(time_t * t, struct tm *tm) -{ - memcpy(tm, localtime(t), sizeof(struct tm)); - return 0; -} -#endif - struct dumpRock { /* status only */ int tapeSeq; diff --git a/src/butc/list.c b/src/butc/list.c index a08eca9c5..9c09f520f 100644 --- a/src/butc/list.c +++ b/src/butc/list.c @@ -10,6 +10,7 @@ #include #include +#include #ifndef AFS_NT40_ENV #include diff --git a/src/butc/lwps.c b/src/butc/lwps.c index 525aa3d72..d05c92274 100644 --- a/src/butc/lwps.c +++ b/src/butc/lwps.c @@ -11,6 +11,9 @@ #include +#include +#include + #include #include #ifdef AFS_NT40_ENV diff --git a/src/butc/recoverDb.c b/src/butc/recoverDb.c index 1446f7984..f7699f4a3 100644 --- a/src/butc/recoverDb.c +++ b/src/butc/recoverDb.c @@ -10,6 +10,7 @@ #include #include +#include #include #ifdef HAVE_STDINT_H diff --git a/src/butc/tcmain.c b/src/butc/tcmain.c index bdfb98039..ca2c4364c 100644 --- a/src/butc/tcmain.c +++ b/src/butc/tcmain.c @@ -10,6 +10,10 @@ #include #include + +#include +#include + #ifdef IGNORE_SOME_GCC_WARNINGS # pragma GCC diagnostic warning "-Wimplicit-function-declaration" #endif diff --git a/src/butc/tcprocs.c b/src/butc/tcprocs.c index 9efcbe89a..24492c65c 100644 --- a/src/butc/tcprocs.c +++ b/src/butc/tcprocs.c @@ -12,6 +12,8 @@ #include #include +#include +#include #include #include diff --git a/src/butc/tcstatus.c b/src/butc/tcstatus.c index 1bd280f2d..923832bc1 100644 --- a/src/butc/tcstatus.c +++ b/src/butc/tcstatus.c @@ -10,6 +10,7 @@ #include #include +#include #include #ifdef AFS_NT40_ENV diff --git a/src/butc/tcudbprocs.c b/src/butc/tcudbprocs.c index 82b3d0474..e51625cc9 100644 --- a/src/butc/tcudbprocs.c +++ b/src/butc/tcudbprocs.c @@ -10,6 +10,9 @@ #include #include +#include +#include + #ifdef IGNORE_SOME_GCC_WARNINGS # pragma GCC diagnostic warning "-Wimplicit-function-declaration" #endif diff --git a/src/butm/NTMakefile b/src/butm/NTMakefile index 63e785720..f18e07a07 100644 --- a/src/butm/NTMakefile +++ b/src/butm/NTMakefile @@ -45,7 +45,8 @@ TESTLIBS = $(DESTDIR)\lib\afslwp.lib \ $(DESTDIR)\lib\afs\afscom_err.lib \ $(DESTDIR)\lib\afs\afsusd.lib \ $(DESTDIR)\lib\afs\afsutil.lib \ - $(DESTDIR)\lib\afs\afsbubasics.lib + $(DESTDIR)\lib\afs\afsbubasics.lib \ + $(DESTDIR)\lib\afsroken.lib $(OUT)\test_ftm.exe: $(OUT)\test_ftm.obj $(LIBFILE) $(TESTLIBS) $(EXECONLINK) diff --git a/src/butm/file_tm.c b/src/butm/file_tm.c index dfed4b5f2..44c47ab99 100644 --- a/src/butm/file_tm.c +++ b/src/butm/file_tm.c @@ -10,6 +10,8 @@ #include #include +#include + #include #ifdef AFS_NT40_ENV #include diff --git a/src/butm/test_ftm.c b/src/butm/test_ftm.c index 9c6c49b45..218af80fe 100644 --- a/src/butm/test_ftm.c +++ b/src/butm/test_ftm.c @@ -10,6 +10,7 @@ #include #include +#include #include #include diff --git a/src/comerr/error_msg.c b/src/comerr/error_msg.c index eae3204f5..fe4874877 100644 --- a/src/comerr/error_msg.c +++ b/src/comerr/error_msg.c @@ -10,6 +10,7 @@ #include #include +#include #include "internal.h" #include diff --git a/src/config/NTMakefile b/src/config/NTMakefile index e0408dca7..0cd76ba49 100644 --- a/src/config/NTMakefile +++ b/src/config/NTMakefile @@ -115,6 +115,9 @@ idirs: doclink ! IF (!EXIST($(OJT)\libacl)) $(MKDIR) $(OJT)\libacl ! ENDIF +! IF (!EXIST($(OJT)\roken)) + $(MKDIR) $(OJT)\roken +! ENDIF ! IF (!EXIST($(OJT)\tests)) $(MKDIR) $(OJT)\tests ! ENDIF diff --git a/src/config/afsconfig-windows.h b/src/config/afsconfig-windows.h index b7ba7a53c..18dc1b3c3 100644 --- a/src/config/afsconfig-windows.h +++ b/src/config/afsconfig-windows.h @@ -58,9 +58,6 @@ /* Define if you have the res_search function. */ #undef HAVE_RES_SEARCH -/* Define if you have the snprintf function. */ -#undef HAVE_SNPRINTF - /* Define if you have the socket function. */ #define HAVE_SOCKET @@ -145,11 +142,7 @@ /* Define if you have the header file. */ #define HAVE_WINSOCK2_H -/* Define if you have vsnprintf */ -#define HAVE_VSNPRINTF 1 - -/* Define if you have snprintf */ -#define HAVE_SNPRINTF 1 +#define HAVE_WINSOCK /* Name of package */ #undef PACKAGE @@ -214,4 +207,26 @@ typedef int errno_t; #define S_IRUSR _S_IREAD #define S_IWUSR _S_IWRITE + #define HAVE_CONIO_H 1 + +#define HAVE_FSYNC 1 + +/* param.h overrides lstat, so stop roken getting involved */ +#define HAVE_LSTAT 1 + +#define HAVE_STRCASECMP 1 + +#define HAVE_STRUCT_SOCKADDR_STORAGE 1 + +#define HAVE_DECL_H_ERRNO 1 + +#define HAVE_STRUCT_ADDRINFO 1 +#define HAVE_GAI_STRERROR 1 +#define HAVE_STRERROR 1 +#define HAVE_STRLWR 1 +#define HAVE_STRDUP 1 +#define HAVE_GETHOSTNAME 1 +#define HAVE_STRFTIME 1 +#define HAVE_GETCWD 1 +#define HAVE_STRUPR 1 diff --git a/src/config/param.amd64_w2k.h b/src/config/param.amd64_w2k.h index 8c27b05d0..af0a7025d 100644 --- a/src/config/param.amd64_w2k.h +++ b/src/config/param.amd64_w2k.h @@ -63,8 +63,6 @@ typedef __int64 ssize_t; #define strcasecmp(s1,s2) _stricmp(s1,s2) #define strncasecmp(s1,s2,n) _strnicmp(s1,s2,n) #define sleep(seconds) Sleep((seconds) * 1000) -#define fsync(fileno) _commit(fileno) -#define ftruncate(fd, size) _chsize((fd), (long)(size)) #define strtoll(str, cp, base) strtoi64((str), (cp), (base)) #define strtoull(str, cp, base) strtoui64((str), (cp), (base)) @@ -75,9 +73,6 @@ typedef __int64 ssize_t; #define pclose(stream) _pclose(stream) typedef char *caddr_t; -#define pipe(fdp) _pipe(fdp, 4096, _O_BINARY) - -#define snprintf _snprintf #endif /* AFS_PARAM_H */ #else /* !defined(UKERNEL) */ diff --git a/src/crypto/hcrypto/NTMakefile b/src/crypto/hcrypto/NTMakefile index fbd0e5144..c3ba794a4 100644 --- a/src/crypto/hcrypto/NTMakefile +++ b/src/crypto/hcrypto/NTMakefile @@ -72,6 +72,7 @@ ROKEN_OBJS = \ $(OUT)\errx.obj \ $(OUT)\getprogname.obj \ $(OUT)\issuid.obj \ + $(OUT)\snprintf.obj \ $(OUT)\verr.obj \ $(OUT)\verrx.obj \ $(OUT)\vwarn.obj \ diff --git a/src/crypto/hcrypto/roken.h b/src/crypto/hcrypto/roken.h index a84a24ee9..e8455a3b5 100644 --- a/src/crypto/hcrypto/roken.h +++ b/src/crypto/hcrypto/roken.h @@ -36,6 +36,14 @@ typedef int ssize_t; #endif #endif +/* The MSVC implementation of snprintf is not C99 compliant. */ +#define snprintf rk_snprintf +#define vsnprintf rk_vsnprintf +#define vasnprintf rk_vasnprintf +#define vasprintf rk_vasprintf +#define asnprintf rk_asnprintf +#define asprintf rk_asprintf + #endif /* _MSC_VER */ #endif /* AFS_NT40_ENV */ diff --git a/src/dir/buffer.c b/src/dir/buffer.c index 337915940..5058b3e31 100644 --- a/src/dir/buffer.c +++ b/src/dir/buffer.c @@ -10,6 +10,7 @@ #include #include +#include #include #include diff --git a/src/dviced/Makefile.in b/src/dviced/Makefile.in index cfd251961..a013ddc97 100644 --- a/src/dviced/Makefile.in +++ b/src/dviced/Makefile.in @@ -213,10 +213,12 @@ state_analyzer.o: ${TVICED}/state_analyzer.c $(AFS_CCRULE) $(TVICED)/state_analyzer.c dafileserver: ${objects} ${LIBS} - $(AFS_LDRULE) ${objects} ${LIBS} ${MT_LIBS} ${XLIBS} + $(AFS_LDRULE) ${objects} \ + ${LIBS} $(LIB_roken) ${MT_LIBS} ${XLIBS} state_analyzer: ${SDBGOBJS} - $(AFS_LDRULE) ${SDBGOBJS} ${MT_LIBS} ${XLIBS} + $(AFS_LDRULE) ${SDBGOBJS} \ + $(LIB_roken) ${MT_LIBS} ${XLIBS} install: dafileserver state_analyzer ${INSTALL} -d ${DESTDIR}${afssrvlibexecdir} diff --git a/src/dviced/NTMakefile b/src/dviced/NTMakefile index 3a96b61f4..62c3609a6 100644 --- a/src/dviced/NTMakefile +++ b/src/dviced/NTMakefile @@ -78,7 +78,8 @@ EXELIBS = \ $(DESTDIR)\lib\afs\mtafsutil.lib \ $(DESTDIR)\lib\afs\daafsvol.lib \ $(DESTDIR)\lib\afs\mtafsvldb.lib \ - $(DESTDIR)\lib\afspthread.lib + $(DESTDIR)\lib\afspthread.lib \ + $(DESTDIR)\lib\afsroken.lib $(EXEFILE): $(EXEOBJS) $(EXELIBS) $(EXECONLINK) @@ -95,4 +96,3 @@ clean:: -$(DEL) $(EXEFILE) -$(DEL) $(DAFS_VICEDRES) - \ No newline at end of file diff --git a/src/dvolser/Makefile.in b/src/dvolser/Makefile.in index 98303d35f..7d63001df 100644 --- a/src/dvolser/Makefile.in +++ b/src/dvolser/Makefile.in @@ -205,7 +205,7 @@ namei_ops.o: ${VOL}/namei_ops.c $(AFS_CCRULE) $(VOL)/namei_ops.c davolserver: ${objects} ${LIBS} - $(AFS_LDRULE) ${objects} ${LIBS} ${MT_LIBS} ${XLIBS} + $(AFS_LDRULE) ${objects} ${LIBS} $(LIB_roken) ${MT_LIBS} ${XLIBS} install: davolserver ${INSTALL} -d ${DESTDIR}${afssrvlibexecdir} diff --git a/src/dvolser/NTMakefile b/src/dvolser/NTMakefile index ee4dda731..477cad286 100644 --- a/src/dvolser/NTMakefile +++ b/src/dvolser/NTMakefile @@ -91,7 +91,8 @@ VOLSERVER_EXELIBS = \ $(DESTDIR)\lib\afs\afsprocmgmt.lib \ $(DESTDIR)\lib\afs\afseventlog.lib \ $(DESTDIR)\lib\afs\mtafsutil.lib \ - $(DESTDIR)\lib\afspthread.lib + $(DESTDIR)\lib\afspthread.lib \ + $(DESTDIR)\lib\afsroken.lib $(VOLSERVER_EXEFILE): $(VOLSERVER_EXEOBJS) $(VOLSERVER_EXELIBS) $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib shell32.lib diff --git a/src/external/heimdal/roken/getopt.c b/src/external/heimdal/roken/getopt.c index 653853543..942e5b4b5 100644 --- a/src/external/heimdal/roken/getopt.c +++ b/src/external/heimdal/roken/getopt.c @@ -34,6 +34,9 @@ static char sccsid[] = "@(#)getopt.c 8.1 (Berkeley) 6/4/93"; #ifndef __STDC__ #define const #endif +#include +#include "roken.h" + #include #include #include diff --git a/src/finale/Makefile.in b/src/finale/Makefile.in index 474789a52..c90bd6136 100644 --- a/src/finale/Makefile.in +++ b/src/finale/Makefile.in @@ -49,7 +49,7 @@ LIBS=${TOP_LIBDIR}/libubik.a \ all: translate_et translate_et: translate_et.o ${INCLS} - $(AFS_LDRULE) translate_et.o ${LIBS} + $(AFS_LDRULE) translate_et.o ${LIBS} $(LIB_roken) translate_et.o: AFS_component_version_number.c diff --git a/src/finale/translate_et_nt.c b/src/finale/translate_et_nt.c index a4341c19b..a6ec90a15 100644 --- a/src/finale/translate_et_nt.c +++ b/src/finale/translate_et_nt.c @@ -10,6 +10,7 @@ #include #include +#include #include #include diff --git a/src/fsint/afsaux.c b/src/fsint/afsaux.c index 82f60ee8a..cdceb9553 100644 --- a/src/fsint/afsaux.c +++ b/src/fsint/afsaux.c @@ -39,6 +39,7 @@ #endif /* defined(UKERNEL) */ #include "afsint.h" #else /* KERNEL */ +# include # include # include "afsint.h" #endif /* KERNEL */ diff --git a/src/fsprobe/Makefile.in b/src/fsprobe/Makefile.in index d36ef53e8..e99d64fa5 100644 --- a/src/fsprobe/Makefile.in +++ b/src/fsprobe/Makefile.in @@ -52,7 +52,8 @@ fsprobe.o: fsprobe.c ${INCLS} AFS_component_version_number.c fsprobe_callback.o: fsprobe_callback.c ${INCLS} fsprobe_test: fsprobe_test.o libfsprobe.a ${LIBS} - $(AFS_LDRULE) fsprobe_test.o libfsprobe.a ${LIBS} ${XLIBS} + $(AFS_LDRULE) fsprobe_test.o libfsprobe.a \ + ${LIBS} $(LIB_roken) ${XLIBS} # # Install targets diff --git a/src/kauth/Makefile.in b/src/kauth/Makefile.in index ea4dadc38..21d11f513 100644 --- a/src/kauth/Makefile.in +++ b/src/kauth/Makefile.in @@ -94,7 +94,7 @@ kaserver: kautils.o kalocalcell.o kadatabase.o kaprocs.o kalog.o kauth.ss.o kaut $(AFS_LDRULE) kaserver.o kautils.o kalocalcell.o kadatabase.o \ krb_udp.o kaprocs.o kalog.o kauth.ss.o kauth.xdr.o kaaux.o \ kaauxdb.o \ - $(LIBS) ${XLIBS} ${TOP_LIBDIR}/libaudit.a + $(LIBS) $(LIB_roken) ${XLIBS} ${TOP_LIBDIR}/libaudit.a kaserver.o: kaserver.c ${INCLS} AFS_component_version_number.o @@ -175,19 +175,23 @@ kkids.o: kkids.c ${INCLS} krb_tf.o: krb_tf.c ${INCLS} kas: kauth.h kautils.h admin_tools.o libkauth.a $(LIBS) kas.o kkids.o - $(AFS_LDRULE) kas.o admin_tools.o kkids.o libkauth.a ${LIBS} ${XLIBS} + $(AFS_LDRULE) kas.o admin_tools.o kkids.o libkauth.a \ + ${LIBS} $(LIB_roken) ${XLIBS} klog: AFS_component_version_number.o kauth.h kautils.h libkauth.a $(LIBS) \ klog.o - $(AFS_LDRULE) klog.o libkauth.a ${LIBS} ${XLIBS} + $(AFS_LDRULE) klog.o libkauth.a \ + ${LIBS} $(LIB_roken) ${XLIBS} klog.o: klog.c kauth.h kautils.h AFS_component_version_number.o klog.krb: kauth.h kautils.h libkauth.krb.a $(KLIBS) klog.o - $(AFS_LDRULE) klog.o libkauth.krb.a ${KLIBS} ${XLIBS} + $(AFS_LDRULE) klog.o libkauth.krb.a \ + ${KLIBS} $(LIB_roken) ${XLIBS} knfs: kauth.h kautils.h libkauth.a $(LIBS) knfs.o - $(AFS_LDRULE) knfs.o libkauth.a ${LIBS} ${XLIBS} + $(AFS_LDRULE) knfs.o libkauth.a \ + ${LIBS} $(LIB_roken) ${XLIBS} knfs.o: knfs.c AFS_component_version_number.o @@ -195,20 +199,24 @@ CFLAGS_klogin.o = -DKAUTH klogin.o: klogin.c ${INCLS} AFS_component_version_number.o klogin: libkauth.a $(LIBS) klogin.o - $(AFS_LDRULE) klogin.o libkauth.a ${LIBS} ${XLIBS} + $(AFS_LDRULE) klogin.o libkauth.a \ + ${LIBS} $(LIB_roken) ${XLIBS} klogin.krb: libkauth.a $(KLIBS) klogin.o - $(AFS_LDRULE) klogin.o libkauth.krb.a ${KLIBS} ${XLIBS} + $(AFS_LDRULE) klogin.o libkauth.krb.a \ + ${KLIBS} $(LIB_roken) ${XLIBS} kpasswd.o: kauth.h kautils.h ${INCLS} kpasswd.c AFS_component_version_number.o kpasswd: kauth.h kautils.h libkauth.a $(LIBS) kpasswd.o kkids.o - $(AFS_LDRULE) kpasswd.o kkids.o libkauth.a ${LIBS} ${XLIBS} + $(AFS_LDRULE) kpasswd.o kkids.o libkauth.a \ + ${LIBS} $(LIB_roken) ${XLIBS} kpwvalid.o: kpwvalid.c AFS_component_version_number.o kpwvalid: kpwvalid.o $(LIBS) - $(AFS_LDRULE) kpwvalid.o ${LIBS} ${XLIBS} + $(AFS_LDRULE) kpwvalid.o \ + ${LIBS} $(LIB_roken) ${XLIBS} CFLAGS_user.krb.o = -DAFS_KERBEROS_ENV user.krb.o: user.c ${INCLS} ${TOP_INCDIR}/afs/vice.h @@ -217,24 +225,28 @@ user.krb.o: user.c ${INCLS} ${TOP_INCDIR}/afs/vice.h user.o: user.c ${INCLS} ${TOP_INCDIR}/afs/vice.h kdb: kdb.o ${INCLS} ${LIBS} libkauth.a - $(AFS_LDRULE) kdb.o libkauth.a ${LIBS} ${XLIBS} + $(AFS_LDRULE) kdb.o libkauth.a \ + ${LIBS} $(LIB_roken) ${XLIBS} kdb.o: kdb.c AFS_component_version_number.o krb_udp.o: krb_udp.c kaserver.h kautils.h kauth.h prot.h ${TOP_INCDIR}/lwp.h AFS_component_version_number.o krb_udp: krb_udp.o libkauth.a $(KLIBS) - $(AFS_LDRULE) krb_udp.o libkauth.a $(KLIBS) + $(AFS_LDRULE) krb_udp.o libkauth.a \ + $(KLIBS) $(LIB_roken) ka-forwarder.o: ka-forwarder.c ka-forwarder: ka-forwarder.o - $(AFS_LDRULE) ka-forwarder.o ${LIBS} ${XLIBS} + $(AFS_LDRULE) ka-forwarder.o \ + ${LIBS} $(LIB_roken) ${XLIBS} rebuild.o: rebuild.c $(INCLS) AFS_component_version_number.o rebuild: rebuild.o kautils.o $(LIBS) - $(AFS_LDRULE) rebuild.o kautils.o $(LIBS) ${XLIBS} + $(AFS_LDRULE) rebuild.o kautils.o \ + $(LIBS) $(LIB_roken) ${XLIBS} # # Install targets diff --git a/src/kauth/NTMakefile b/src/kauth/NTMakefile index 18cbbcdf4..f70998da1 100644 --- a/src/kauth/NTMakefile +++ b/src/kauth/NTMakefile @@ -92,7 +92,8 @@ AFSLIBS = \ $(DESTDIR)\lib\afsubik.lib \ $(DESTDIR)\lib\afs\afseventlog.lib \ $(DESTDIR)\lib\afsrxkad.lib \ - $(DESTDIR)\lib\libafsconf.lib + $(DESTDIR)\lib\libafsconf.lib \ + $(DESTDIR)\lib\afsroken.lib TOKENLIB = $(DESTDIR)\lib\afs\afspioctl.lib diff --git a/src/kauth/admin_tools.c b/src/kauth/admin_tools.c index 9f676fa81..29b0ac27a 100644 --- a/src/kauth/admin_tools.c +++ b/src/kauth/admin_tools.c @@ -15,6 +15,7 @@ #include #include +#include #include #include diff --git a/src/kauth/authclient.c b/src/kauth/authclient.c index 0d577714e..e4c067759 100644 --- a/src/kauth/authclient.c +++ b/src/kauth/authclient.c @@ -12,6 +12,8 @@ #include #include +#include + #ifdef IGNORE_SOME_GCC_WARNINGS # pragma GCC diagnostic warning "-Wstrict-prototypes" # pragma GCC diagnostic warning "-Wimplicit-function-declaration" diff --git a/src/kauth/client.c b/src/kauth/client.c index 3021c6d2b..c0dd382e7 100644 --- a/src/kauth/client.c +++ b/src/kauth/client.c @@ -10,6 +10,8 @@ #include #include +#include + #include #include #include diff --git a/src/kauth/kaaux.c b/src/kauth/kaaux.c index e6f013d7b..7f809ac4d 100644 --- a/src/kauth/kaaux.c +++ b/src/kauth/kaaux.c @@ -10,6 +10,7 @@ #include #include +#include #include #include diff --git a/src/kauth/kaauxdb.c b/src/kauth/kaauxdb.c index 77ae9bfa4..887f82348 100644 --- a/src/kauth/kaauxdb.c +++ b/src/kauth/kaauxdb.c @@ -14,6 +14,7 @@ #include #include +#include #ifdef AFS_NT40_ENV #include diff --git a/src/kauth/kadatabase.c b/src/kauth/kadatabase.c index 21b40fe50..e691350dc 100644 --- a/src/kauth/kadatabase.c +++ b/src/kauth/kadatabase.c @@ -10,6 +10,7 @@ #include #include +#include #include #ifdef AFS_NT40_ENV diff --git a/src/kauth/kalocalcell.c b/src/kauth/kalocalcell.c index 29cf7bd8c..0eaaf44e4 100644 --- a/src/kauth/kalocalcell.c +++ b/src/kauth/kalocalcell.c @@ -10,6 +10,8 @@ #include #include +#include + #include #include #ifdef AFS_NT40_ENV diff --git a/src/kauth/kalog.c b/src/kauth/kalog.c index 6929b6f74..0bc16d7cc 100644 --- a/src/kauth/kalog.c +++ b/src/kauth/kalog.c @@ -19,6 +19,7 @@ #include #include +#include #include #include diff --git a/src/kauth/kaprocs.c b/src/kauth/kaprocs.c index 7298b862c..2e3709543 100644 --- a/src/kauth/kaprocs.c +++ b/src/kauth/kaprocs.c @@ -10,6 +10,7 @@ #include #include +#include #include #include diff --git a/src/kauth/kas.c b/src/kauth/kas.c index 4e91b59ee..736b229f9 100644 --- a/src/kauth/kas.c +++ b/src/kauth/kas.c @@ -11,6 +11,7 @@ #include #include +#include #include #ifdef AFS_AIX32_ENV diff --git a/src/kauth/kaserver.c b/src/kauth/kaserver.c index cc642a55e..09cd83e4a 100644 --- a/src/kauth/kaserver.c +++ b/src/kauth/kaserver.c @@ -10,6 +10,7 @@ #include #include +#include #include #include diff --git a/src/kauth/katoken.c b/src/kauth/katoken.c index 0680b6c6e..90107cc18 100644 --- a/src/kauth/katoken.c +++ b/src/kauth/katoken.c @@ -14,6 +14,8 @@ #include #include +#include + #ifdef UKERNEL # include "afsincludes.h" #endif diff --git a/src/kauth/kautils.c b/src/kauth/kautils.c index c8c48efe8..5eaedbc00 100644 --- a/src/kauth/kautils.c +++ b/src/kauth/kautils.c @@ -10,6 +10,7 @@ #include #include +#include #include #include diff --git a/src/kauth/kpasswd.c b/src/kauth/kpasswd.c index d81cbefe9..aa52aec63 100644 --- a/src/kauth/kpasswd.c +++ b/src/kauth/kpasswd.c @@ -11,6 +11,7 @@ #include #include +#include #include #include diff --git a/src/kauth/krb_tf.c b/src/kauth/krb_tf.c index 53653ef96..536a16b90 100644 --- a/src/kauth/krb_tf.c +++ b/src/kauth/krb_tf.c @@ -47,6 +47,7 @@ #include #include +#include #ifdef HAVE_FCNTL_H #include diff --git a/src/kauth/krb_udp.c b/src/kauth/krb_udp.c index b1f8ffad7..e66af2120 100644 --- a/src/kauth/krb_udp.c +++ b/src/kauth/krb_udp.c @@ -15,6 +15,7 @@ #include #include +#include #include #include diff --git a/src/kauth/rebuild.c b/src/kauth/rebuild.c index 9c1d0db76..28af5ff30 100644 --- a/src/kauth/rebuild.c +++ b/src/kauth/rebuild.c @@ -10,6 +10,7 @@ #include #include +#include #include #include diff --git a/src/kauth/user_nt.c b/src/kauth/user_nt.c index 8ad01f248..6f5a3fcf1 100644 --- a/src/kauth/user_nt.c +++ b/src/kauth/user_nt.c @@ -10,6 +10,7 @@ #include #include +#include #include diff --git a/src/libacl/aclprocs.c b/src/libacl/aclprocs.c index 106dfe356..ebfdfc3b4 100644 --- a/src/libacl/aclprocs.c +++ b/src/libacl/aclprocs.c @@ -16,6 +16,7 @@ #include #include +#include #include #ifdef AFS_NT40_ENV diff --git a/src/libacl/netprocs.c b/src/libacl/netprocs.c index f9aec80af..518305382 100644 --- a/src/libacl/netprocs.c +++ b/src/libacl/netprocs.c @@ -16,6 +16,7 @@ #include #include +#include #include #ifdef AFS_NT40_ENV diff --git a/src/libadmin/adminutil/afs_utilAdmin.c b/src/libadmin/adminutil/afs_utilAdmin.c index c4f2f5412..feb3dc0c8 100644 --- a/src/libadmin/adminutil/afs_utilAdmin.c +++ b/src/libadmin/adminutil/afs_utilAdmin.c @@ -10,6 +10,7 @@ #include #include +#include #include #include diff --git a/src/libadmin/bos/afs_bosAdmin.c b/src/libadmin/bos/afs_bosAdmin.c index 016145a2d..85a59b2ab 100644 --- a/src/libadmin/bos/afs_bosAdmin.c +++ b/src/libadmin/bos/afs_bosAdmin.c @@ -10,6 +10,7 @@ #include #include +#include #include #include diff --git a/src/libadmin/cfg/cfgclient.c b/src/libadmin/cfg/cfgclient.c index 5d3cb3e7b..6ec525fb4 100644 --- a/src/libadmin/cfg/cfgclient.c +++ b/src/libadmin/cfg/cfgclient.c @@ -14,6 +14,7 @@ #include #include +#include #include diff --git a/src/libadmin/cfg/cfgdb.c b/src/libadmin/cfg/cfgdb.c index 61e6ebde5..945393ba7 100644 --- a/src/libadmin/cfg/cfgdb.c +++ b/src/libadmin/cfg/cfgdb.c @@ -14,6 +14,7 @@ #include #include +#include #include diff --git a/src/libadmin/cfg/cfghost.c b/src/libadmin/cfg/cfghost.c index 4cd6043cc..12e96e046 100644 --- a/src/libadmin/cfg/cfghost.c +++ b/src/libadmin/cfg/cfghost.c @@ -14,6 +14,7 @@ #include #include +#include #include diff --git a/src/libadmin/cfg/cfginternal.c b/src/libadmin/cfg/cfginternal.c index a285a011c..15587cde1 100644 --- a/src/libadmin/cfg/cfginternal.c +++ b/src/libadmin/cfg/cfginternal.c @@ -10,6 +10,7 @@ #include #include +#include #include diff --git a/src/libadmin/cfg/cfgservers.c b/src/libadmin/cfg/cfgservers.c index a26e1b71b..dfb40039e 100644 --- a/src/libadmin/cfg/cfgservers.c +++ b/src/libadmin/cfg/cfgservers.c @@ -18,6 +18,7 @@ #include #include +#include #include diff --git a/src/libadmin/client/afs_clientAdmin.c b/src/libadmin/client/afs_clientAdmin.c index 3f50786a7..81ff7020c 100644 --- a/src/libadmin/client/afs_clientAdmin.c +++ b/src/libadmin/client/afs_clientAdmin.c @@ -10,6 +10,7 @@ #include #include +#include #include #include "afs_clientAdmin.h" diff --git a/src/libadmin/kas/afs_kasAdmin.c b/src/libadmin/kas/afs_kasAdmin.c index 7c87bebd7..df083cbde 100644 --- a/src/libadmin/kas/afs_kasAdmin.c +++ b/src/libadmin/kas/afs_kasAdmin.c @@ -10,6 +10,7 @@ #include #include +#include #include #include diff --git a/src/libadmin/pts/afs_ptsAdmin.c b/src/libadmin/pts/afs_ptsAdmin.c index c74e89713..8e6aacc71 100644 --- a/src/libadmin/pts/afs_ptsAdmin.c +++ b/src/libadmin/pts/afs_ptsAdmin.c @@ -10,6 +10,7 @@ #include #include +#include #include #include diff --git a/src/libadmin/samples/Makefile.in b/src/libadmin/samples/Makefile.in index 66f83e262..f1fd8697b 100644 --- a/src/libadmin/samples/Makefile.in +++ b/src/libadmin/samples/Makefile.in @@ -49,67 +49,67 @@ SAMPLELIBS =\ all test tests: $(SAMPLEPROGS) cm_client_config: cm_client_config.o $(SAMPLELIBS) - $(AFS_LDRULE) $@.o $(SAMPLELIBS) $(MT_LIBS) $(XLIBS) + $(AFS_LDRULE) $@.o $(SAMPLELIBS) $(LIB_roken) $(MT_LIBS) $(XLIBS) cm_list_cells: cm_list_cells.o $(SAMPLELIBS) - $(AFS_LDRULE) $@.o $(SAMPLELIBS) $(MT_LIBS) $(XLIBS) + $(AFS_LDRULE) $@.o $(SAMPLELIBS) $(LIB_roken) $(MT_LIBS) $(XLIBS) cm_local_cell: cm_local_cell.o $(SAMPLELIBS) - $(AFS_LDRULE) $@.o $(SAMPLELIBS) $(MT_LIBS) $(XLIBS) + $(AFS_LDRULE) $@.o $(SAMPLELIBS) $(LIB_roken) $(MT_LIBS) $(XLIBS) cm_server_prefs: cm_server_prefs.o $(SAMPLELIBS) - $(AFS_LDRULE) $@.o $(SAMPLELIBS) $(MT_LIBS) $(XLIBS) + $(AFS_LDRULE) $@.o $(SAMPLELIBS) $(LIB_roken) $(MT_LIBS) $(XLIBS) rxdebug_basic_stats: rxdebug_basic_stats.o $(SAMPLELIBS) - $(AFS_LDRULE) $@.o $(SAMPLELIBS) $(MT_LIBS) $(XLIBS) + $(AFS_LDRULE) $@.o $(SAMPLELIBS) $(LIB_roken) $(MT_LIBS) $(XLIBS) rxdebug_conns: rxdebug_conns.o $(SAMPLELIBS) - $(AFS_LDRULE) $@.o $(SAMPLELIBS) $(MT_LIBS) $(XLIBS) + $(AFS_LDRULE) $@.o $(SAMPLELIBS) $(LIB_roken) $(MT_LIBS) $(XLIBS) rxdebug_peers: rxdebug_peers.o $(SAMPLELIBS) - $(AFS_LDRULE) $@.o $(SAMPLELIBS) $(MT_LIBS) $(XLIBS) + $(AFS_LDRULE) $@.o $(SAMPLELIBS) $(LIB_roken) $(MT_LIBS) $(XLIBS) rxdebug_rx_stats: rxdebug_rx_stats.o $(SAMPLELIBS) - $(AFS_LDRULE) $@.o $(SAMPLELIBS) $(MT_LIBS) $(XLIBS) + $(AFS_LDRULE) $@.o $(SAMPLELIBS) $(LIB_roken) $(MT_LIBS) $(XLIBS) rxdebug_supported_stats: rxdebug_supported_stats.o $(SAMPLELIBS) - $(AFS_LDRULE) $@.o $(SAMPLELIBS) $(MT_LIBS) $(XLIBS) + $(AFS_LDRULE) $@.o $(SAMPLELIBS) $(LIB_roken) $(MT_LIBS) $(XLIBS) rxdebug_version: rxdebug_version.o $(SAMPLELIBS) - $(AFS_LDRULE) $@.o $(SAMPLELIBS) $(MT_LIBS) $(XLIBS) + $(AFS_LDRULE) $@.o $(SAMPLELIBS) $(LIB_roken) $(MT_LIBS) $(XLIBS) rxstat_clear_peer: rxstat_clear_peer.o $(SAMPLELIBS) - $(AFS_LDRULE) $@.o $(SAMPLELIBS) $(MT_LIBS) $(XLIBS) + $(AFS_LDRULE) $@.o $(SAMPLELIBS) $(LIB_roken) $(MT_LIBS) $(XLIBS) rxstat_clear_process: rxstat_clear_process.o $(SAMPLELIBS) - $(AFS_LDRULE) $@.o $(SAMPLELIBS) $(MT_LIBS) $(XLIBS) + $(AFS_LDRULE) $@.o $(SAMPLELIBS) $(LIB_roken) $(MT_LIBS) $(XLIBS) rxstat_disable_peer: rxstat_disable_peer.o $(SAMPLELIBS) - $(AFS_LDRULE) $@.o $(SAMPLELIBS) $(MT_LIBS) $(XLIBS) + $(AFS_LDRULE) $@.o $(SAMPLELIBS) $(LIB_roken) $(MT_LIBS) $(XLIBS) rxstat_disable_process: rxstat_disable_process.o $(SAMPLELIBS) - $(AFS_LDRULE) $@.o $(SAMPLELIBS) $(MT_LIBS) $(XLIBS) + $(AFS_LDRULE) $@.o $(SAMPLELIBS) $(LIB_roken) $(MT_LIBS) $(XLIBS) rxstat_enable_peer: rxstat_enable_peer.o $(SAMPLELIBS) - $(AFS_LDRULE) $@.o $(SAMPLELIBS) $(MT_LIBS) $(XLIBS) + $(AFS_LDRULE) $@.o $(SAMPLELIBS) $(LIB_roken) $(MT_LIBS) $(XLIBS) rxstat_enable_process: rxstat_enable_process.o $(SAMPLELIBS) - $(AFS_LDRULE) $@.o $(SAMPLELIBS) $(MT_LIBS) $(XLIBS) + $(AFS_LDRULE) $@.o $(SAMPLELIBS) $(LIB_roken) $(MT_LIBS) $(XLIBS) rxstat_get_peer: rxstat_get_peer.o $(SAMPLELIBS) - $(AFS_LDRULE) $@.o $(SAMPLELIBS) $(MT_LIBS) $(XLIBS) + $(AFS_LDRULE) $@.o $(SAMPLELIBS) $(LIB_roken) $(MT_LIBS) $(XLIBS) rxstat_get_process: rxstat_get_process.o $(SAMPLELIBS) - $(AFS_LDRULE) $@.o $(SAMPLELIBS) $(MT_LIBS) $(XLIBS) + $(AFS_LDRULE) $@.o $(SAMPLELIBS) $(LIB_roken) $(MT_LIBS) $(XLIBS) rxstat_get_version: rxstat_get_version.o $(SAMPLELIBS) - $(AFS_LDRULE) $@.o $(SAMPLELIBS) $(MT_LIBS) $(XLIBS) + $(AFS_LDRULE) $@.o $(SAMPLELIBS) $(LIB_roken) $(MT_LIBS) $(XLIBS) rxstat_query_peer: rxstat_query_peer.o $(SAMPLELIBS) - $(AFS_LDRULE) $@.o $(SAMPLELIBS) $(MT_LIBS) $(XLIBS) + $(AFS_LDRULE) $@.o $(SAMPLELIBS) $(LIB_roken) $(MT_LIBS) $(XLIBS) rxstat_query_process: rxstat_query_process.o $(SAMPLELIBS) - $(AFS_LDRULE) $@.o $(SAMPLELIBS) $(MT_LIBS) $(XLIBS) + $(AFS_LDRULE) $@.o $(SAMPLELIBS) $(LIB_roken) $(MT_LIBS) $(XLIBS) # # Errors diff --git a/src/libadmin/test/Makefile.in b/src/libadmin/test/Makefile.in index 40a0bb265..e5d193ed1 100644 --- a/src/libadmin/test/Makefile.in +++ b/src/libadmin/test/Makefile.in @@ -42,7 +42,8 @@ all test tests: afscp CFLAGS_client.o = @CFLAGS_NOERROR@ afscp: afscp.o $(AFSCPOBJS) $(AFSCPLIBS) - $(AFS_LDRULE) afscp.o $(AFSCPOBJS) $(AFSCPLIBS) ${MT_LIBS} $(XLIBS) + $(AFS_LDRULE) afscp.o $(AFSCPOBJS) $(AFSCPLIBS) \ + $(LIB_roken) ${MT_LIBS} $(XLIBS) ####################################################################### install: diff --git a/src/libadmin/test/afscp.c b/src/libadmin/test/afscp.c index 0376f9fb0..8560eb8e4 100644 --- a/src/libadmin/test/afscp.c +++ b/src/libadmin/test/afscp.c @@ -14,6 +14,7 @@ #include #include +#include #include diff --git a/src/libadmin/test/bos.c b/src/libadmin/test/bos.c index 97bacbac7..22cf92654 100644 --- a/src/libadmin/test/bos.c +++ b/src/libadmin/test/bos.c @@ -14,6 +14,8 @@ #include #include +#include + #include #include "bos.h" diff --git a/src/libadmin/test/client.c b/src/libadmin/test/client.c index 2180d410f..0ca179caa 100644 --- a/src/libadmin/test/client.c +++ b/src/libadmin/test/client.c @@ -14,6 +14,7 @@ #include #include +#include #include "client.h" #include diff --git a/src/libadmin/test/kas.c b/src/libadmin/test/kas.c index f5dcd2c94..f33f47489 100644 --- a/src/libadmin/test/kas.c +++ b/src/libadmin/test/kas.c @@ -14,6 +14,7 @@ #include #include +#include #include "kas.h" #include diff --git a/src/libadmin/test/pts.c b/src/libadmin/test/pts.c index d4381b471..7e86888c6 100644 --- a/src/libadmin/test/pts.c +++ b/src/libadmin/test/pts.c @@ -14,6 +14,7 @@ #include #include +#include #include "pts.h" diff --git a/src/libadmin/test/util.c b/src/libadmin/test/util.c index e9c5cd214..3fd7b9f23 100644 --- a/src/libadmin/test/util.c +++ b/src/libadmin/test/util.c @@ -14,6 +14,7 @@ #include #include +#include #include "util.h" diff --git a/src/libadmin/test/vos.c b/src/libadmin/test/vos.c index 6aa8338ce..455a68d45 100644 --- a/src/libadmin/test/vos.c +++ b/src/libadmin/test/vos.c @@ -13,6 +13,9 @@ #include #include + +#include + #ifndef AFS_NT40_ENV #include #include diff --git a/src/libadmin/vos/afs_vosAdmin.c b/src/libadmin/vos/afs_vosAdmin.c index 880eef63f..32e6512ba 100644 --- a/src/libadmin/vos/afs_vosAdmin.c +++ b/src/libadmin/vos/afs_vosAdmin.c @@ -10,6 +10,7 @@ #include #include +#include #include #include diff --git a/src/libadmin/vos/lockprocs.c b/src/libadmin/vos/lockprocs.c index 26f124bd4..4f71d8804 100644 --- a/src/libadmin/vos/lockprocs.c +++ b/src/libadmin/vos/lockprocs.c @@ -10,6 +10,7 @@ #include #include +#include #include "lockprocs.h" #include diff --git a/src/libadmin/vos/vosutils.c b/src/libadmin/vos/vosutils.c index aeb493fc4..c2325bc81 100644 --- a/src/libadmin/vos/vosutils.c +++ b/src/libadmin/vos/vosutils.c @@ -10,6 +10,7 @@ #include #include +#include #include "vosutils.h" #include "vsprocs.h" diff --git a/src/libadmin/vos/vsprocs.c b/src/libadmin/vos/vsprocs.c index f313f4119..b2d40bb05 100644 --- a/src/libadmin/vos/vsprocs.c +++ b/src/libadmin/vos/vsprocs.c @@ -21,6 +21,7 @@ #include #include +#include #include "vsprocs.h" #include "vosutils.h" diff --git a/src/libafsauthent/NTMakefile b/src/libafsauthent/NTMakefile index 101455092..36359c248 100644 --- a/src/libafsauthent/NTMakefile +++ b/src/libafsauthent/NTMakefile @@ -145,7 +145,8 @@ DLLLIBS =\ $(DESTDIR)\lib\afs\afsprocmgmt.lib \ $(DESTDIR)\lib\afslwp.lib \ $(DESTDIR)\lib\lanahelper.lib \ - $(DESTDIR)\lib\libafsconf.lib + $(DESTDIR)\lib\libafsconf.lib \ + $(DESTDIR)\lib\afsroken.lib $(LIBFILE): $(DLLOBJS) $(DLLLIBS) $(RXOBJS) $(DLLCONLINK) /DEF:afsauthent.def rpcrt4.lib dnsapi.lib mpr.lib secur32.lib shell32.lib diff --git a/src/libafsrpc/NTMakefile b/src/libafsrpc/NTMakefile index 2dd2ac08a..4fbf95813 100644 --- a/src/libafsrpc/NTMakefile +++ b/src/libafsrpc/NTMakefile @@ -103,7 +103,8 @@ DLLLIBS =\ $(DESTDIR)\lib\afspthread.lib \ !ENDIF $(DESTDIR)\lib\afs\afsutil.lib \ - $(DESTDIR)\lib\afs\afsreg.lib + $(DESTDIR)\lib\afs\afsreg.lib \ + $(DESTDIR)\lib\afsroken.lib $(LIBFILE): $(DLLOBJS) $(DLLLIBS) $(DLLCONLINK) /DEF:afsrpc.def iphlpapi.lib diff --git a/src/libuafs/Makefile.common.in b/src/libuafs/Makefile.common.in index e8adae8f8..10132458b 100644 --- a/src/libuafs/Makefile.common.in +++ b/src/libuafs/Makefile.common.in @@ -76,7 +76,11 @@ webinstall: all \ ${TOP_LIBDIR}/$(LIBAFSWEBKRB) linktest: UAFS/$(LIBUAFS) ${TOP_OBJDIR}/lib/libdes.a - $(CC) $(TEST_CFLAGS) $(TEST_LDFLAGS) -o linktest ${srcdir}/linktest.c $(COMMON_INCLUDE) -DUKERNEL UAFS/$(LIBUAFS) ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/libdes.a ${TOP_LIBDIR}/libafsutil.a $(TEST_LIBS) $(XLIBS) + $(CC) $(TEST_CFLAGS) $(TEST_LDFLAGS) $(LDFLAGS_roken) -o linktest \ + ${srcdir}/linktest.c $(COMMON_INCLUDE) -DUKERNEL \ + UAFS/$(LIBUAFS) ${TOP_LIBDIR}/libcmd.a \ + ${TOP_LIBDIR}/libdes.a ${TOP_LIBDIR}/libafsutil.a \ + $(LIB_roken) $(TEST_LIBS) $(XLIBS) CRULE1= $(CC) $(COMMON_INCLUDE) $(OPTF) -DKERNEL $(LIBJUAFS_FLAGS) $(CFLAGS) -c $? diff --git a/src/log/Makefile.in b/src/log/Makefile.in index aed9ac6dc..30c93fd1b 100644 --- a/src/log/Makefile.in +++ b/src/log/Makefile.in @@ -44,16 +44,16 @@ all: unlog tokens tokens.krb # Build targets # kseal: kseal.o ${LIBRARIES} - $(AFS_LDRULE) kseal.o ${LIBRARIES} ${XLIBS} + $(AFS_LDRULE) kseal.o ${LIBRARIES} $(LIB_roken) ${XLIBS} unlog: unlog.o ${LIBRARIES} - $(AFS_LDRULE) unlog.o ${LIBRARIES} ${XLIBS} + $(AFS_LDRULE) unlog.o ${LIBRARIES} $(LIB_roken) ${XLIBS} tokens: tokens.o ${LIBRARIES} - $(AFS_LDRULE) tokens.o ${LIBRARIES} ${XLIBS} + $(AFS_LDRULE) tokens.o ${LIBRARIES} $(LIB_roken) ${XLIBS} tokens.krb: tokens.o ${KLIBRARIES} - $(AFS_LDRULE) tokens.o ${KLIBRARIES} ${XLIBS} + $(AFS_LDRULE) tokens.o ${KLIBRARIES} $(LIB_roken) ${XLIBS} kseal.o: kseal.c ${INCLS} AFS_component_version_number.c unlog.o: unlog.c AFS_component_version_number.c diff --git a/src/lwp/lock.c b/src/lwp/lock.c index ca8fc55a8..57c0617c7 100644 --- a/src/lwp/lock.c +++ b/src/lwp/lock.c @@ -28,6 +28,8 @@ #ifdef AFS_PTHREAD_ENV #include /* can't include this in lwp, rx hasn't built yet */ + +#include #include #else #include diff --git a/src/ptserver/Makefile.in b/src/ptserver/Makefile.in index 30918e5d4..d5ecfc69c 100644 --- a/src/ptserver/Makefile.in +++ b/src/ptserver/Makefile.in @@ -99,7 +99,7 @@ ${TOP_INCDIR}/afs/ptserver.h: ptserver.h # ptserver: ptserver.o ptutils.o ptprocs.o ptint.ss.o ptint.xdr.o utils.o $(LIBS) ${TOP_LIBDIR}/libaudit.a map.o $(AFS_LDRULE) ptserver.o ptutils.o ptprocs.o ptint.ss.o ptint.xdr.o \ - utils.o map.o $(LIBS) ${XLIBS} ${TOP_LIBDIR}/libaudit.a + utils.o map.o $(LIBS) $(LIB_roken) ${XLIBS} ${TOP_LIBDIR}/libaudit.a ptserver.o: ptserver.c ${INCLS} AFS_component_version_number.c @@ -146,10 +146,12 @@ display.o: display.c ${INCLS} db_verify.o: db_verify.c ${INCLS} AFS_component_version_number.c db_verify: db_verify.o pterror.o display.o $(LIBS) - $(AFS_LDRULE) db_verify.o display.o pterror.o $(LIBS) ${XLIBS} + $(AFS_LDRULE) db_verify.o display.o pterror.o \ + $(LIBS) $(LIB_roken) ${XLIBS} ptclient: ptclient.o display.o libprot.a $(LIBS) - $(AFS_LDRULE) ptclient.o display.o libprot.a $(LIBS) ${XLIBS} + $(AFS_LDRULE) ptclient.o display.o libprot.a \ + $(LIBS) $(LIB_roken) ${XLIBS} ptclient.o: ptclient.c ${INCLS} AFS_component_version_number.c @@ -165,17 +167,20 @@ libprot.a: ptuser.o pterror.o ptint.cs.o ptint.xdr.o AFS_component_version_numbe $(RANLIB) $@ pts: pts.o libprot.a ${TOP_LIBDIR}/libcmd.a $(LIBS) - $(AFS_LDRULE) pts.o ${TOP_LIBDIR}/libcmd.a libprot.a ${LIBS} ${XLIBS} + $(AFS_LDRULE) pts.o ${TOP_LIBDIR}/libcmd.a libprot.a \ + ${LIBS} $(LIB_roken) ${XLIBS} pts.o: pts.c ${LINCLS} ${TOP_INCDIR}/afs/cmd.h AFS_component_version_number.c readgroup: readgroup.o libprot.a $(LIBS) - $(AFS_LDRULE) readgroup.o libprot.a ${LIBS} ${XLIBS} + $(AFS_LDRULE) readgroup.o libprot.a \ + ${LIBS} $(LIB_roken) ${XLIBS} readgroup.o: readgroup.c ${LINCLS} AFS_component_version_number.c readpwd: readpwd.o libprot.a $(LIBS) - $(AFS_LDRULE) readpwd.o libprot.a ${LIBS} ${XLIBS} + $(AFS_LDRULE) readpwd.o libprot.a \ + ${LIBS} $(LIB_roken) ${XLIBS} readpwd.o: readpwd.c ${LINCLS} AFS_component_version_number.c @@ -183,17 +188,17 @@ testpt: testpt.o libprot.a ${TOP_LIBDIR}/libcmd.a $(LIBS) case "$(SYS_NAME)" in \ *_darwin_12 ) \ $(AFS_LDRULE) testpt.o ${TOP_LIBDIR}/libcmd.a \ - libprot.a $(LIBS) ;; \ + libprot.a $(LIBS) $(LIB_roken) ;; \ * ) \ $(AFS_LDRULE) testpt.o -lm ${TOP_LIBDIR}/libcmd.a \ - libprot.a $(LIBS) ${XLIBS} ;; \ + libprot.a $(LIBS) $(LIB_roken) ${XLIBS} ;; \ esac testpt.o: testpt.c ${INCLS} ${TOP_INCDIR}/afs/cmd.h AFS_component_version_number.c pt_util: pt_util.o ptutils.o ubik.o utils.o map.o libprot.a $(LIBS) $(AFS_LDRULE) pt_util.o ptutils.o ubik.o utils.o map.o libprot.a \ - ${TOP_LIBDIR}/libcmd.a $(LIBS) ${XLIBS} + ${TOP_LIBDIR}/libcmd.a $(LIBS) $(LIB_roken) ${XLIBS} ubik.o: ubik.c ${INCLS} diff --git a/src/ptserver/NTMakefile b/src/ptserver/NTMakefile index a5749f6cb..b4f1c29f3 100644 --- a/src/ptserver/NTMakefile +++ b/src/ptserver/NTMakefile @@ -70,7 +70,8 @@ PTSERVER_EXELIBS =\ $(DESTDIR)\lib\afs\afseventlog.lib \ $(DESTDIR)\lib\afs\afsreg.lib \ $(DESTDIR)\lib\libafsconf.lib \ - $(DESTDIR)\lib\afs\afspioctl.lib + $(DESTDIR)\lib\afs\afspioctl.lib \ + $(DESTDIR)\lib\afsroken.lib !IF (("$(SYS_NAME)"!="i386_win95" ) && ("$(SYS_NAME)"!="I386_WIN95" )) PTSERVER_EXELIBS =$(PTSERVER_EXELIBS) $(DESTDIR)\lib\afs\afsprocmgmt.lib @@ -121,7 +122,8 @@ PTS_EXELIBS =\ $(DESTDIR)\lib\afs\afsreg.lib \ $(DESTDIR)\lib\afs\afseventlog.lib \ $(DESTDIR)\lib\afs\afspioctl.lib \ - $(DESTDIR)\lib\libafsconf.lib + $(DESTDIR)\lib\libafsconf.lib \ + $(DESTDIR)\lib\afsroken.lib $(PTS): $(PTS_EXEOBJS) $(PTS_EXELIBS) $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib shell32.lib diff --git a/src/ptserver/db_verify.c b/src/ptserver/db_verify.c index 5966549d2..230eb38e3 100644 --- a/src/ptserver/db_verify.c +++ b/src/ptserver/db_verify.c @@ -11,6 +11,7 @@ #include #include +#include /* * (3) Define a structure, idused, instead of an diff --git a/src/ptserver/display.c b/src/ptserver/display.c index 07f15d651..281860e95 100644 --- a/src/ptserver/display.c +++ b/src/ptserver/display.c @@ -10,6 +10,7 @@ #include #include +#include #include #include diff --git a/src/ptserver/pt_util.c b/src/ptserver/pt_util.c index c0a89aef9..cd08f64bb 100644 --- a/src/ptserver/pt_util.c +++ b/src/ptserver/pt_util.c @@ -11,6 +11,10 @@ * output of this program to be valid. */ +#include +#include +#include + #include #ifndef _WIN32 #include diff --git a/src/ptserver/ptclient.c b/src/ptserver/ptclient.c index bb47339d1..bbcdbaf4a 100644 --- a/src/ptserver/ptclient.c +++ b/src/ptserver/ptclient.c @@ -10,6 +10,7 @@ #include #include +#include #ifdef AFS_AIX32_ENV #include diff --git a/src/ptserver/ptprocs.c b/src/ptserver/ptprocs.c index 99ae041d1..749515b7b 100644 --- a/src/ptserver/ptprocs.c +++ b/src/ptserver/ptprocs.c @@ -50,6 +50,7 @@ #include #include +#include #include #include diff --git a/src/ptserver/pts.c b/src/ptserver/pts.c index a0ce821e5..20c992066 100644 --- a/src/ptserver/pts.c +++ b/src/ptserver/pts.c @@ -10,6 +10,7 @@ #include #include +#include #include #include diff --git a/src/ptserver/ptserver.c b/src/ptserver/ptserver.c index 53925ae06..c596d4950 100644 --- a/src/ptserver/ptserver.c +++ b/src/ptserver/ptserver.c @@ -111,6 +111,7 @@ #include #include +#include #include #ifdef AFS_AIX32_ENV diff --git a/src/ptserver/ptuser.c b/src/ptserver/ptuser.c index 538b6dcd5..5364407ec 100644 --- a/src/ptserver/ptuser.c +++ b/src/ptserver/ptuser.c @@ -10,6 +10,8 @@ #include #include +#include + #include #include #include diff --git a/src/ptserver/ptutils.c b/src/ptserver/ptutils.c index 5b0895bb3..8313bc330 100644 --- a/src/ptserver/ptutils.c +++ b/src/ptserver/ptutils.c @@ -23,6 +23,7 @@ #include #include +#include #include #include diff --git a/src/ptserver/readgroup.c b/src/ptserver/readgroup.c index 958378d00..a56667fbb 100644 --- a/src/ptserver/readgroup.c +++ b/src/ptserver/readgroup.c @@ -10,6 +10,7 @@ #include #include +#include #include #ifdef AFS_NT40_ENV diff --git a/src/ptserver/readpwd.c b/src/ptserver/readpwd.c index 46e3a9e15..97e63166b 100644 --- a/src/ptserver/readpwd.c +++ b/src/ptserver/readpwd.c @@ -10,6 +10,7 @@ #include #include +#include #include #ifdef AFS_NT40_ENV diff --git a/src/ptserver/testpt.c b/src/ptserver/testpt.c index d0a1c9392..553730096 100644 --- a/src/ptserver/testpt.c +++ b/src/ptserver/testpt.c @@ -10,6 +10,7 @@ #include #include +#include #include #include diff --git a/src/ptserver/ubik.c b/src/ptserver/ubik.c index b8c772c09..3b6ddf848 100644 --- a/src/ptserver/ubik.c +++ b/src/ptserver/ubik.c @@ -3,6 +3,7 @@ #include #include +#include #include #ifdef AFS_NT40_ENV diff --git a/src/ptserver/utils.c b/src/ptserver/utils.c index 230e76041..75013a18b 100644 --- a/src/ptserver/utils.c +++ b/src/ptserver/utils.c @@ -10,6 +10,8 @@ #include #include +#include + #include #include #include diff --git a/src/roken/NTMakefile b/src/roken/NTMakefile new file mode 100644 index 000000000..5337e9f91 --- /dev/null +++ b/src/roken/NTMakefile @@ -0,0 +1,94 @@ +# Copyright 2010, 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=roken +!include ..\config\NTMakefile.$(SYS_NAME) +!include ..\config\NTMakefile.version +AFSDEV_AUXCDEFINES = $(AFSDEV_AUXCDEFINES) -DHAVE_CONFIG_H=1 + +ROKEN = $(SRC)\external\heimdal\roken + +INCFILEDIR = $(DESTDIR)\include + +INCFILES = \ + $(INCFILEDIR)\err.h \ + $(INCFILEDIR)\roken.h + +ROKEN_INCFILES = \ + $(INCFILEDIR)\roken-common.h + +LIBFILE = $(DESTDIR)\lib\afsroken.dll + +ROKEN_OBJS = \ + $(OUT)\cloexec.obj \ + $(OUT)\ct.obj \ + $(OUT)\ecalloc.obj \ + $(OUT)\emalloc.obj \ + $(OUT)\erealloc.obj \ + $(OUT)\err.obj \ + $(OUT)\errx.obj \ + $(OUT)\getopt.obj \ + $(OUT)\getprogname.obj \ + $(OUT)\hex.obj \ + $(OUT)\issuid.obj \ + $(OUT)\localtime_r.obj \ + $(OUT)\net_read.obj \ + $(OUT)\net_write.obj \ + $(OUT)\snprintf.obj \ + $(OUT)\socket.obj \ + $(OUT)\strerror_r.obj \ + $(OUT)\strlcat.obj \ + $(OUT)\strlcpy.obj \ + $(OUT)\strnlen.obj \ + $(OUT)\verr.obj \ + $(OUT)\verrx.obj \ + $(OUT)\vwarn.obj \ + $(OUT)\vwarnx.obj \ + $(OUT)\warn.obj \ + $(OUT)\warnerr.obj \ + $(OUT)\warnx.obj + +$(ROKEN_OBJS):$(ROKEN)\$$(@B).c + $(C2OBJ) $** -I$(ROKEN) + +$(ROKEN_INCFILES):$(ROKEN)\$$(@B).h + $(COPY) $** $(INCFILEDIR) + +$(INCFILES):$$(@B).h + $(COPY) $** $(INCFILEDIR) + +roken.h: $(ROKEN)\roken.h.in + $(COPY) $** $@ + +err.h: $(ROKEN)\err.hin + $(COPY) $** $@ + +!if !defined(NMAKE) +NTMAKE = nmake /nologo /f ntmakefile +!endif + +DLLLIBS = \ +# $(DESTDIR)\lib\afs\afsreg.lib + +$(LIBFILE): $(ROKEN_OBJS) $(DLLLIBS) + $(DLLCONLINK) /DEF:afsroken.def shell32.lib + $(_VC_MANIFEST_EMBED_DLL) + $(DLLPREP) + $(CODESIGN_USERLAND) + $(SYMSTORE_IMPORT) + $(MAKECYGLIB) --input-def afsroken.def + +# Definitions for generating versioninfo resources +$(OUT)\afsroken.res: AFS_component_version_number.h + +install_headers: $(INCFILES) $(ROKEN_INCFILES) + +install: install_headers $(LIBFILE) + +clean:: + $(DEL) $(INCFILES) + $(DEL) err.h + $(DEL) $(LIBFILE) $(DESTDIR)\lib\afsroken.lib $(DESTDIR)\lib\afsroken.exp diff --git a/src/roken/afsroken.def b/src/roken/afsroken.def new file mode 100644 index 000000000..689556cae --- /dev/null +++ b/src/roken/afsroken.def @@ -0,0 +1,26 @@ +EXPORTS + ct_memcmp @1 + err @3 + errx @4 + getopt @5 + issuid @9 + net_read @10 + net_write @11 + rk_cloexec @12 + rk_cloexec_file @13 + rk_ecalloc @14 + rk_emalloc @15 + rk_erealloc @16 + rk_hex_encode @17 + rk_localtime_r @18 + rk_snprintf @19 + rk_socket @20 + rk_strlcat @21 + rk_strnlen @22 + rk_strlcpy @23 + verr @25 + verrx @26 + vwarn @27 + vwarnx @28 + warn @29 + warnx @30 diff --git a/src/roken/afsroken.rc b/src/roken/afsroken.rc new file mode 100644 index 000000000..a90dc9123 --- /dev/null +++ b/src/roken/afsroken.rc @@ -0,0 +1,15 @@ +/* + * Copyright 2010, 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 + */ + +#define AFS_VERINFO_FILE_DESCRIPTION "AFS Roken Compatibility DLL" +#define AFS_VERINFO_DLL +#define AFS_VERINFO_NAME "afsroken" +#define AFS_VERINFO_FILENAME "afsroken.dll" + +#include "AFS_component_version_number.h" +#include "..\config\NTVersioninfo.rc" diff --git a/src/roken/config.h b/src/roken/config.h index 80b06404a..753446e8e 100644 --- a/src/roken/config.h +++ b/src/roken/config.h @@ -21,7 +21,6 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - #include #include diff --git a/src/rx/rx.c b/src/rx/rx.c index f8a5496d2..858e69186 100644 --- a/src/rx/rx.c +++ b/src/rx/rx.c @@ -59,6 +59,7 @@ extern afs_int32 afs_termState; # endif /* AFS_AIX41_ENV */ # include "afs/rxgen_consts.h" #else /* KERNEL */ +# include # include # include # include diff --git a/src/rx/rx_conncache.c b/src/rx/rx_conncache.c index 506935a7e..670cda127 100644 --- a/src/rx/rx_conncache.c +++ b/src/rx/rx_conncache.c @@ -14,6 +14,10 @@ #include #include +#ifndef KERNEL +# include +#endif /* KERNEL */ + #include #include #include "rx.h" diff --git a/src/rx/rx_event.c b/src/rx/rx_event.c index 0d92584e0..c6df30d21 100644 --- a/src/rx/rx_event.c +++ b/src/rx/rx_event.c @@ -36,6 +36,7 @@ extern void *osi_Alloc(); # include "h/proc.h" # endif #else /* KERNEL */ +# include # include # include "rx_user.h" # ifdef AFS_PTHREAD_ENV diff --git a/src/rx/rx_globals.c b/src/rx/rx_globals.c index 763baa367..bc029a8df 100644 --- a/src/rx/rx_globals.c +++ b/src/rx/rx_globals.c @@ -21,7 +21,6 @@ #include #include "afs/param.h" - /* Enable data initialization when the header file is included */ #define GLOBALSINIT(stuff) = stuff #if defined(AFS_NT40_ENV) && defined(AFS_PTHREAD_ENV) @@ -33,11 +32,13 @@ #endif #ifdef KERNEL -#ifndef UKERNEL -#include "h/types.h" -#else /* !UKERNEL */ -#include "afs/sysincludes.h" -#endif /* UKERNEL */ +# ifndef UKERNEL +# include "h/types.h" +# else /* !UKERNEL */ +# include "afs/sysincludes.h" +# endif /* UKERNEL */ +#else /* KERNEL */ +# include #endif /* KERNEL */ #include "rx_globals.h" diff --git a/src/rx/rx_identity.c b/src/rx/rx_identity.c index 3c5da9d26..6391988f6 100644 --- a/src/rx/rx_identity.c +++ b/src/rx/rx_identity.c @@ -26,6 +26,7 @@ #include #ifndef KERNEL +# include # include # include #else diff --git a/src/rx/rx_lwp.c b/src/rx/rx_lwp.c index acca31be0..acf267770 100644 --- a/src/rx/rx_lwp.c +++ b/src/rx/rx_lwp.c @@ -21,6 +21,9 @@ #include #include +#ifndef KERNEL +# include +#endif /* KERNEL */ #include /* fd_set on older platforms */ #include diff --git a/src/rx/rx_misc.c b/src/rx/rx_misc.c index d22e3d7be..1d39f4ebb 100644 --- a/src/rx/rx_misc.c +++ b/src/rx/rx_misc.c @@ -10,11 +10,11 @@ #include #include - #ifdef KERNEL # include # include #else +# include # ifdef AFS_NT40_ENV # include # include diff --git a/src/rx/rx_multi.c b/src/rx/rx_multi.c index 704024a79..a2e3bdf89 100644 --- a/src/rx/rx_multi.c +++ b/src/rx/rx_multi.c @@ -10,10 +10,11 @@ #include #include - #ifdef KERNEL #include "afs/sysincludes.h" -#endif +#else /* KERNEL */ +# include +#endif /* KERNEL */ #include "rx.h" diff --git a/src/rx/rx_null.c b/src/rx/rx_null.c index cc98bf4f2..231e7ae48 100644 --- a/src/rx/rx_null.c +++ b/src/rx/rx_null.c @@ -16,6 +16,8 @@ # else /* !UKERNEL */ # include "afs/sysincludes.h" # endif /* !UKERNEL */ +#else /* KERNEL */ +# include #endif /* KERNEL */ #include "rx.h" diff --git a/src/rx/rx_opaque.c b/src/rx/rx_opaque.c index 54c3da80a..a1b61d580 100644 --- a/src/rx/rx_opaque.c +++ b/src/rx/rx_opaque.c @@ -26,6 +26,7 @@ #include #ifndef KERNEL +# include # include # include # include diff --git a/src/rx/rx_packet.c b/src/rx/rx_packet.c index 69ccd6642..a518bb152 100644 --- a/src/rx/rx_packet.c +++ b/src/rx/rx_packet.c @@ -41,6 +41,7 @@ # include "rx_kmutex.h" # endif /* defined(UKERNEL) */ #else /* KERNEL */ +# include # include # include # include diff --git a/src/rx/rx_packet.h b/src/rx/rx_packet.h index ce42472c3..bb49884e1 100644 --- a/src/rx/rx_packet.h +++ b/src/rx/rx_packet.h @@ -209,8 +209,8 @@ struct rx_jumboHeader { }; /* For most Unixes, maximum elements in an iovec is 16 */ -#define RX_MAXIOVECS 16 /* limit for ReadvProc/WritevProc */ -#define RX_MAXWVECS RX_MAXIOVECS-1 /* need one iovec for packet header */ +#define RX_MAXIOVECS 16 /* limit for ReadvProc/WritevProc */ +#define RX_MAXWVECS (RX_MAXIOVECS-1) /* need one iovec for packet header */ /* * The values for the RX buffer sizes are calculated to ensure efficient @@ -249,6 +249,10 @@ struct rx_jumboHeader { */ #define RX_EXTRABUFFERSIZE 4 +#ifndef RX_MAXWVECS +#error RX_MAXWVECS not defined +#endif + struct rx_packet { struct rx_queue queueItemHeader; /* Packets are chained using the queue.h package */ struct clock retryTime; /* When this packet should NEXT be re-transmitted */ diff --git a/src/rx/rx_pthread.c b/src/rx/rx_pthread.c index ef63d896c..9c3edac3c 100644 --- a/src/rx/rx_pthread.c +++ b/src/rx/rx_pthread.c @@ -18,6 +18,9 @@ #include #include +#ifndef KERNEL +# include +#endif /* KERNEL */ #include #include diff --git a/src/rx/rx_rdwr.c b/src/rx/rx_rdwr.c index 3e05e145f..53121e8af 100644 --- a/src/rx/rx_rdwr.c +++ b/src/rx/rx_rdwr.c @@ -52,6 +52,7 @@ # include "rx/rx_kernel.h" # include "afs/lock.h" #else /* KERNEL */ +# include # include # include # ifdef AFS_NT40_ENV diff --git a/src/rx/rx_stats.c b/src/rx/rx_stats.c index c4c0d1283..13935f368 100644 --- a/src/rx/rx_stats.c +++ b/src/rx/rx_stats.c @@ -32,6 +32,7 @@ #include #if !defined(KERNEL) +#include #include #endif diff --git a/src/rx/rx_trace.c b/src/rx/rx_trace.c index 85cff8150..eee07a47a 100644 --- a/src/rx/rx_trace.c +++ b/src/rx/rx_trace.c @@ -10,6 +10,9 @@ #include #include +#ifndef KERNEL +# include +#endif /* KERNEL */ #ifndef RXDEBUG char rxi_tracename[80] = "\0Tracing not compiled in"; diff --git a/src/rx/rx_user.c b/src/rx/rx_user.c index 3dfe8f09c..e9a836336 100644 --- a/src/rx/rx_user.c +++ b/src/rx/rx_user.c @@ -14,6 +14,9 @@ #include #include +#ifndef KERNEL +# include +#endif /* KERNEL */ #include #include diff --git a/src/rx/rx_xmit_nt.c b/src/rx/rx_xmit_nt.c index 4c8f72d62..8e529574c 100644 --- a/src/rx/rx_xmit_nt.c +++ b/src/rx/rx_xmit_nt.c @@ -18,15 +18,15 @@ #include #if defined(AFS_NT40_ENV) - -#include -#if (_WIN32_WINNT < 0x0501) -#undef _WIN32_WINNT -#define _WIN32_WINNT 0x0501 -#endif -#include - -#if (_WIN32_WINNT < 0x0600) +# include +# include +# if (_WIN32_WINNT < 0x0501) +# undef _WIN32_WINNT +# define _WIN32_WINNT 0x0501 +# endif +# include + +# if (_WIN32_WINNT < 0x0600) /* * WSASendMsg -- send data to a specific destination, with options, using * overlapped I/O where applicable. @@ -50,9 +50,9 @@ INT IN LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine OPTIONAL ); -#define WSAID_WSASENDMSG /* a441e712-754f-43ca-84a7-0dee44cf606d */ \ +# define WSAID_WSASENDMSG /* a441e712-754f-43ca-84a7-0dee44cf606d */ \ {0xa441e712,0x754f,0x43ca,{0x84,0xa7,0x0d,0xee,0x44,0xcf,0x60,0x6d}} -#endif /* _WINNT_WIN32 */ +#endif /* AFS_NT40_ENV */ #include "rx.h" #include "rx_packet.h" diff --git a/src/rx/rx_xmit_nt.h b/src/rx/rx_xmit_nt.h index 94074fe97..1e4fda665 100644 --- a/src/rx/rx_xmit_nt.h +++ b/src/rx/rx_xmit_nt.h @@ -10,23 +10,8 @@ #ifndef _RX_XMIT_NT_H_ #define _RX_XMIT_NT_H_ -typedef struct iovec -{ - unsigned long iov_len; - char *iov_base; -} -iovec_t; - -struct msghdr { - char *msg_name; - int msg_namelen; - iovec_t *msg_iov; - int msg_iovlen; - caddr_t msg_accrights; - int msg_accrightslen; -}; - extern int rxi_sendmsg(osi_socket socket, struct msghdr *msgP, int flags); +#undef sendmsg #define sendmsg rxi_sendmsg extern int rxi_recvmsg(osi_socket socket, struct msghdr *msgP, int flags); #define recvmsg rxi_recvmsg diff --git a/src/rx/xdr.c b/src/rx/xdr.c index 830c1780c..bb088e641 100644 --- a/src/rx/xdr.c +++ b/src/rx/xdr.c @@ -31,7 +31,8 @@ #include #ifndef KERNEL -#include +# include +# include #endif diff --git a/src/rx/xdr_array.c b/src/rx/xdr_array.c index b295958ad..a73b799cd 100644 --- a/src/rx/xdr_array.c +++ b/src/rx/xdr_array.c @@ -28,11 +28,15 @@ */ #include #include -#include "rx.h" - #ifndef NeXT +#ifndef KERNEL +# include +#endif + +#include "rx.h" + /* * xdr_array.c, Generic XDR routines impelmentation. * diff --git a/src/rx/xdr_refernce.c b/src/rx/xdr_refernce.c index 9b8a38604..09c5522e4 100644 --- a/src/rx/xdr_refernce.c +++ b/src/rx/xdr_refernce.c @@ -28,6 +28,11 @@ */ #include #include + +#ifndef KERNEL +# include +#endif + #include "rx.h" diff --git a/src/rx/xdr_rx.c b/src/rx/xdr_rx.c index 54dbf0069..68da60a58 100644 --- a/src/rx/xdr_rx.c +++ b/src/rx/xdr_rx.c @@ -14,7 +14,6 @@ #include #include - #ifdef KERNEL # include "afs/sysincludes.h" # ifndef UKERNEL @@ -34,6 +33,7 @@ # include "netinet/in.h" # endif /* !UKERNEL */ #else /* KERNEL */ +# include # include # include # ifndef AFS_NT40_ENV diff --git a/src/rxdebug/Makefile.in b/src/rxdebug/Makefile.in index 0995b5e54..7e084401e 100644 --- a/src/rxdebug/Makefile.in +++ b/src/rxdebug/Makefile.in @@ -26,10 +26,10 @@ rxdumptrace.o: ../rx/rx_trace.c $(AFS_CCRULE) $(srcdir)/../rx/rx_trace.c rxdumptrace: rxdumptrace.o ${LIBS} - $(AFS_LDRULE) rxdumptrace.o ${LIBS} ${XLIBS} + $(AFS_LDRULE) rxdumptrace.o ${LIBS} $(LIB_roken) ${XLIBS} rxdebug: rxdebug.o ${LIBS} - $(AFS_LDRULE) rxdebug.o ${LIBS} ${XLIBS} + $(AFS_LDRULE) rxdebug.o ${LIBS} $(LIB_roken) ${XLIBS} # # Install targets diff --git a/src/rxdebug/rxdebug.c b/src/rxdebug/rxdebug.c index 944a2b8c6..b6e1bcf86 100644 --- a/src/rxdebug/rxdebug.c +++ b/src/rxdebug/rxdebug.c @@ -10,6 +10,7 @@ #include #include +#include #include #include diff --git a/src/rxgen/rpc_main.c b/src/rxgen/rpc_main.c index 903015c29..afc812b4f 100644 --- a/src/rxgen/rpc_main.c +++ b/src/rxgen/rpc_main.c @@ -368,9 +368,11 @@ c_output(char *infile, char *define, int extend, char *outfile, int append) } else { f_print(fout, "#include \n"); f_print(fout, "#include \n"); + f_print(fout, "#include \n"); } f_print(fout, "#ifdef AFS_NT40_ENV\n"); f_print(fout, "#define AFS_RXGEN_EXPORT __declspec(dllexport)\n"); + f_print(fout, "#include \n"); f_print(fout, "#endif /* AFS_NT40_ENV */\n"); } if (currfile && (include = extendfile(currfile, ".h"))) { @@ -656,6 +658,9 @@ C_output(char *infile, char *define, int extend, char *outfile, int append) if (kflag) { f_print(fout, "#include \"%s\"\n\n", include); } else { + f_print(fout, "#include \n"); + f_print(fout, "#include \n"); + f_print(fout, "#include \n"); f_print(fout, "#include \"%s\"\n\n", include); } free(include); @@ -721,6 +726,9 @@ S_output(char *infile, char *define, int extend, char *outfile, int append) if (kflag) { f_print(fout, "#include \"%s\"\n", include); } else { + f_print(fout, "#include \n"); + f_print(fout, "#include \n"); + f_print(fout, "#include \n"); f_print(fout, "#include \"%s\"\n\n", include); } free(include); diff --git a/src/rxkad/bg-fcrypt.c b/src/rxkad/bg-fcrypt.c index 4979f36f0..756b76eef 100644 --- a/src/rxkad/bg-fcrypt.c +++ b/src/rxkad/bg-fcrypt.c @@ -35,6 +35,7 @@ #include "afs/param.h" #else #include +#include #endif diff --git a/src/rxkad/crc.c b/src/rxkad/crc.c index 6d005e0d8..2387a1812 100644 --- a/src/rxkad/crc.c +++ b/src/rxkad/crc.c @@ -36,6 +36,7 @@ #include #include +#include #include #include diff --git a/src/rxkad/crypt_conn.c b/src/rxkad/crypt_conn.c index e5356553c..ff7a4612c 100644 --- a/src/rxkad/crypt_conn.c +++ b/src/rxkad/crypt_conn.c @@ -16,6 +16,7 @@ #include "afs/param.h" #else #include +#include #endif diff --git a/src/rxkad/md4.c b/src/rxkad/md4.c index 4a0e6e273..f7546fc1d 100644 --- a/src/rxkad/md4.c +++ b/src/rxkad/md4.c @@ -34,6 +34,8 @@ #include #include +#include + #include #include #ifdef AFS_NT40_ENV diff --git a/src/rxkad/md5.c b/src/rxkad/md5.c index 50ae7477e..dea93d6d2 100644 --- a/src/rxkad/md5.c +++ b/src/rxkad/md5.c @@ -34,6 +34,8 @@ #include #include +#include + #include #include #ifdef AFS_NT40_ENV diff --git a/src/rxkad/rxkad_client.c b/src/rxkad/rxkad_client.c index 4d564cc87..24c06d785 100644 --- a/src/rxkad/rxkad_client.c +++ b/src/rxkad/rxkad_client.c @@ -16,6 +16,7 @@ #include "afs/param.h" #else #include +#include #endif diff --git a/src/rxkad/rxkad_common.c b/src/rxkad/rxkad_common.c index 1db736190..ef1e52822 100644 --- a/src/rxkad/rxkad_common.c +++ b/src/rxkad/rxkad_common.c @@ -14,6 +14,7 @@ #include "afs/param.h" #else #include +#include #endif #ifdef AFS_SUN59_ENV diff --git a/src/rxkad/rxkad_server.c b/src/rxkad/rxkad_server.c index 4bb600922..6d3463656 100644 --- a/src/rxkad/rxkad_server.c +++ b/src/rxkad/rxkad_server.c @@ -14,6 +14,7 @@ #include #include +#include #include #include diff --git a/src/rxkad/ticket.c b/src/rxkad/ticket.c index 0218cf83e..1c5d9e573 100644 --- a/src/rxkad/ticket.c +++ b/src/rxkad/ticket.c @@ -10,6 +10,8 @@ #include #include +#include + #include #include diff --git a/src/rxkad/ticket5.c b/src/rxkad/ticket5.c index 36a17379b..aee11f1de 100644 --- a/src/rxkad/ticket5.c +++ b/src/rxkad/ticket5.c @@ -57,6 +57,8 @@ #include #include +#include + #ifdef IGNORE_SOME_GCC_WARNINGS # pragma GCC diagnostic warning "-Wimplicit-function-declaration" #endif diff --git a/src/rxstat/rxstat.c b/src/rxstat/rxstat.c index 7f96f423f..1234578c8 100644 --- a/src/rxstat/rxstat.c +++ b/src/rxstat/rxstat.c @@ -10,6 +10,9 @@ #include #include +#ifndef KERNEL +#include +#endif #include #include diff --git a/src/scout/Makefile.in b/src/scout/Makefile.in index 75290b12e..6a3d7a108 100644 --- a/src/scout/Makefile.in +++ b/src/scout/Makefile.in @@ -55,7 +55,7 @@ all: scout scout.o: scout.c ${INCLS} AFS_component_version_number.c scout: scout.o $(LIBS) - $(AFS_LDRULE) scout.o $(LIBS) ${TXLIBS} ${XLIBS} + $(AFS_LDRULE) scout.o $(LIBS) $(LIB_roken) ${TXLIBS} ${XLIBS} # # Installation targets diff --git a/src/sys/Makefile.in b/src/sys/Makefile.in index 3239b769d..958d5f7a1 100644 --- a/src/sys/Makefile.in +++ b/src/sys/Makefile.in @@ -149,10 +149,10 @@ Krmtsys.h: rmtsys.xg ${RXGEN} -A -k -h -o Krmtsys.h ${srcdir}/rmtsys.xg rmtsysd: rmtsysd.o libsys.a - $(AFS_LDRULE) rmtsysd.o ${LIBS} + $(AFS_LDRULE) rmtsysd.o ${LIBS} $(LIB_roken) pagsh: pagsh.o libsys.a AFS_component_version_number.o - $(AFS_LDRULE) pagsh.o ${LIBS} + $(AFS_LDRULE) pagsh.o ${LIBS} $(LIB_roken) CFLAGS_pagsh.krb.o = -DAFS_KERBEROS_ENV pagsh.krb.o: pagsh.c @@ -160,7 +160,7 @@ pagsh.krb.o: pagsh.c pagsh.krb: libsys.a pagsh.krb.o ${TOP_LIBDIR}/libauth.krb.a ${TOP_LIBDIR}/librxkad.a ${TOP_LIBDIR}/libdes.a $(AFS_LDRULE) pagsh.krb.o ${TOP_LIBDIR}/libauth.krb.a \ - ${TOP_LIBDIR}/librxkad.a ${TOP_LIBDIR}/libdes.a ${LIBS} + ${TOP_LIBDIR}/librxkad.a ${TOP_LIBDIR}/libdes.a ${LIBS} $(LIB_roken) # # Test programs. diff --git a/src/sys/pioctl_nt.c b/src/sys/pioctl_nt.c index 5b064d2fe..fee3dedee 100644 --- a/src/sys/pioctl_nt.c +++ b/src/sys/pioctl_nt.c @@ -10,6 +10,7 @@ #include #include +#include #include #include diff --git a/src/tbutc/Makefile.in b/src/tbutc/Makefile.in index 49c6329d8..5c5db2bb2 100644 --- a/src/tbutc/Makefile.in +++ b/src/tbutc/Makefile.in @@ -71,7 +71,8 @@ BUTCLIBS=${TOP_LIBDIR}/libbudb.a \ all: butc butc: ${BUTCOBJS} ${BUTCLIBS} - $(AFS_LDRULE) ${BUTCOBJS} ${BUTCLIBS} ${MT_LIBS} ${XLIBS} + $(AFS_LDRULE) ${BUTCOBJS} ${BUTCLIBS} \ + $(LIB_roken) ${MT_LIBS} ${XLIBS} libbutm.a: ${BUTMOBJS} AFS_component_version_number.o -$(RM) -f libbutm.a diff --git a/src/tbutc/NTMakefile b/src/tbutc/NTMakefile index 320186fb8..560eff22e 100644 --- a/src/tbutc/NTMakefile +++ b/src/tbutc/NTMakefile @@ -84,7 +84,8 @@ BUTCLIBS=$(DESTDIR)\lib\afs\afsbudb.lib \ $(DESTDIR)\lib\afspthread.lib \ !ENDIF $(DESTDIR)\lib\afsdes.lib \ - $(DESTDIR)\lib\libafsconf.lib + $(DESTDIR)\lib\libafsconf.lib \ + $(DESTDIR)\lib\afsroken.lib # rm $(OUT)\tcstatus.obj diff --git a/src/tsalvaged/Makefile.in b/src/tsalvaged/Makefile.in index 01477fbb3..d145231c1 100644 --- a/src/tsalvaged/Makefile.in +++ b/src/tsalvaged/Makefile.in @@ -50,7 +50,10 @@ FSSDEBUG_OBJS = fssync-debug.o physio.o common.o ${UTILOBJS} ${VLIBOBJS} ${DIROB SSSDEBUG_OBJS = salvsync-debug.o physio.o common.o ${UTILOBJS} ${VLIBOBJS} ${DIROBJS} ${LWPOBJS} -LIBS=${TOP_LIBDIR}/libafsauthent.a ${TOP_LIBDIR}/libafsrpc.a ${TOP_LIBDIR}/util.a ${TOP_LIBDIR}/libcmd.a +LIBS=${TOP_LIBDIR}/libafsauthent.a \ + ${TOP_LIBDIR}/libafsrpc.a \ + ${TOP_LIBDIR}/util.a \ + ${TOP_LIBDIR}/libcmd.a SLIBS=${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/libdir.a \ ${TOP_LIBDIR}/libvlib.a ${TOP_LIBDIR}/librx.a \ @@ -173,16 +176,20 @@ namei_ops.o: ${VOL}/namei_ops.c $(AFS_CCRULE) $(VOL)/namei_ops.c salvageserver: ${OBJECTS} ${LIBS} - $(AFS_LDRULE) ${OBJECTS} ${LIBS} ${MT_LIBS} ${XLIBS} + $(AFS_LDRULE) ${OBJECTS} ${LIBS} \ + $(LIB_roken) ${MT_LIBS} ${XLIBS} dasalvager: ${SOBJECTS} ${SLIBS} - $(AFS_LDRULE) ${SOBJECTS} ${SLIBS} ${XLIBS} + $(AFS_LDRULE) ${SOBJECTS} ${SLIBS} \ + $(LIB_roken) ${XLIBS} dafssync-debug: ${FSSDEBUG_OBJS} ${LIBS} - $(AFS_LDRULE) ${FSSDEBUG_OBJS} ${LIBS} ${MT_LIBS} ${XLIBS} + $(AFS_LDRULE) ${FSSDEBUG_OBJS} ${LIBS} \ + $(LIB_roken) ${MT_LIBS} ${XLIBS} salvsync-debug: ${SSSDEBUG_OBJS} ${LIBS} - $(AFS_LDRULE) ${SSSDEBUG_OBJS} ${LIBS} ${MT_LIBS} ${XLIBS} + $(AFS_LDRULE) ${SSSDEBUG_OBJS} ${LIBS} \ + $(LIB_roken) ${MT_LIBS} ${XLIBS} install: salvageserver dafssync-debug salvsync-debug dasalvager ${INSTALL} -d ${DESTDIR}${afssrvlibexecdir} diff --git a/src/tsm41/Makefile.in b/src/tsm41/Makefile.in index c79f551dc..7b157c6f7 100644 --- a/src/tsm41/Makefile.in +++ b/src/tsm41/Makefile.in @@ -75,13 +75,16 @@ clean: $(RM) -f *.o $(AUTHLIBS) $(AUTHFILES) so_locations aklog_dynamic_auth: ${AUTH_KRB5_OBJS} ${AFSLIBS} ${AUTHFILES} - $(LD) -o $@ ${AUTH_KRB5_OBJS} $(AFSLIBS) ${AUTHFILES} @KRB5_LIBS@ ${XLIBS} ${AKLDFLAGS} + $(LD) -o $@ ${AUTH_KRB5_OBJS} $(AFSLIBS) ${AUTHFILES} \ + @KRB5_LIBS@ $(LDFLAGS_roken) $(LIB_roken) ${XLIBS} ${AKLDFLAGS} afs_dynamic_auth: ${AUTH_OBJS} ${AFSLIBS} ${AUTHFILES} - $(LD) -o $@ ${AUTH_OBJS} $(AFSLIBS) ${AUTHFILES} ${XLIBS} ${LDFLAGS} + $(LD) -o $@ ${AUTH_OBJS} $(AFSLIBS) ${AUTHFILES} \ + $(LDFLAGS_roken) $(LIB_roken) ${XLIBS} ${LDFLAGS} afs_dynamic_kerbauth: ${AUTH_KRB_OBJS} ${KAFSLIBS} ${AUTHFILES} - $(LD) -o $@ ${AUTH_KRB_OBJS} $(KAFSLIBS) ${AUTHFILES} ${XLIBS} ${LDFLAGS} + $(LD) -o $@ ${AUTH_KRB_OBJS} $(KAFSLIBS) ${AUTHFILES} \ + $(LDFLAGS_roken) $(LIB_roken) ${XLIBS} ${LDFLAGS} aix_auth_common.o: ${srcdir}/aix_auth_common.c diff --git a/src/tviced/Makefile.in b/src/tviced/Makefile.in index 09a4497bd..1067f31df 100644 --- a/src/tviced/Makefile.in +++ b/src/tviced/Makefile.in @@ -206,7 +206,7 @@ afsint.xdr.o: ../fsint/afsint.xdr.c $(AFS_CCRULE) ../fsint/afsint.xdr.c fileserver: ${objects} ${LIBS} - $(AFS_LDRULE) ${objects} ${LIBS} ${MT_LIBS} ${XLIBS} + $(AFS_LDRULE) ${objects} ${LIBS} $(LIB_roken) ${MT_LIBS} ${XLIBS} install: fileserver ${INSTALL} -d ${DESTDIR}${afssrvlibexecdir} diff --git a/src/tviced/NTMakefile b/src/tviced/NTMakefile index 182a36e24..e25538011 100644 --- a/src/tviced/NTMakefile +++ b/src/tviced/NTMakefile @@ -86,7 +86,8 @@ EXELIBS = \ $(DESTDIR)\lib\afs\mtafsutil.lib \ $(DESTDIR)\lib\afs\mtafsvol.lib \ $(DESTDIR)\lib\afs\mtafsvldb.lib \ - $(DESTDIR)\lib\afspthread.lib + $(DESTDIR)\lib\afspthread.lib \ + $(DESTDIR)\lib\afsroken.lib $(EXEFILE): $(EXEOBJS) $(EXELIBS) $(EXECONLINK) @@ -102,4 +103,3 @@ mkdir: clean:: $(DEL) $(TVICEDRES) - \ No newline at end of file diff --git a/src/tviced/serialize_state.c b/src/tviced/serialize_state.c index 7dc526c3e..bc10746e5 100644 --- a/src/tviced/serialize_state.c +++ b/src/tviced/serialize_state.c @@ -15,6 +15,7 @@ #include #include +#include #include #include /* for malloc() */ diff --git a/src/tvolser/Makefile.in b/src/tvolser/Makefile.in index 59bb2a653..bf5fecfb4 100644 --- a/src/tvolser/Makefile.in +++ b/src/tvolser/Makefile.in @@ -216,10 +216,11 @@ vos.o: ${VOLSER}/vos.c vos: vos.o ${VOSOBJS} ${VLSERVEROBJS} ${LIBS} ${TOP_LIBDIR}/libubik_pthread.a $(AFS_LDRULE) vos.o ${VOSOBJS} ${VLSERVEROBJS} ${LIBS} \ - ${TOP_LIBDIR}/libubik_pthread.a ${MT_LIBS} ${XLIBS} + ${TOP_LIBDIR}/libubik_pthread.a \ + $(LIB_roken) ${MT_LIBS} ${XLIBS} volserver: ${objects} ${LIBS} - $(AFS_LDRULE) ${objects} ${LIBS} ${MT_LIBS} ${XLIBS} + $(AFS_LDRULE) ${objects} ${LIBS} $(LIB_roken) ${MT_LIBS} ${XLIBS} install: volserver ${INSTALL} -d ${DESTDIR}${afssrvlibexecdir} diff --git a/src/tvolser/NTMakefile b/src/tvolser/NTMakefile index 75e58238d..28f0b5363 100644 --- a/src/tvolser/NTMakefile +++ b/src/tvolser/NTMakefile @@ -93,7 +93,8 @@ VOLSERVER_EXELIBS = \ $(DESTDIR)\lib\afs\afsprocmgmt.lib \ $(DESTDIR)\lib\afs\afseventlog.lib \ $(DESTDIR)\lib\afs\mtafsutil.lib \ - $(DESTDIR)\lib\afspthread.lib + $(DESTDIR)\lib\afspthread.lib \ + $(DESTDIR)\lib\afsroken.lib $(VOLSERVER_EXEFILE): $(VOLSERVER_EXEOBJS) $(VOLSERVER_EXELIBS) $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib shell32.lib diff --git a/src/ubik/Makefile.in b/src/ubik/Makefile.in index 649270f01..6b8fe7494 100644 --- a/src/ubik/Makefile.in +++ b/src/ubik/Makefile.in @@ -50,14 +50,14 @@ ${TOP_INCDIR}/ubik_int.h: ubik_int.h utst_server: utst_server.o utst_int.ss.o utst_int.xdr.o libubik.a $(AFS_LDRULE) utst_server.o utst_int.ss.o utst_int.xdr.o \ - libubik.a $(LIBS) + libubik.a $(LIBS) $(LIB_roken) utst_client: utst_client.o utst_int.cs.o utst_int.xdr.o libubik.a $(AFS_LDRULE) utst_client.o utst_int.cs.o utst_int.xdr.o \ - libubik.a $(LIBS) + libubik.a $(LIBS) $(LIB_roken) udebug: udebug.o libubik.a - $(AFS_LDRULE) udebug.o libubik.a $(LIBS) + $(AFS_LDRULE) udebug.o libubik.a $(LIBS) $(LIB_roken) ubik_int.cs.c: ubik_int.xg ${RXGEN} -A -x -C -o $@ ${srcdir}/ubik_int.xg diff --git a/src/ubik/beacon.c b/src/ubik/beacon.c index 1d3ee6dfb..e803d1f40 100644 --- a/src/ubik/beacon.c +++ b/src/ubik/beacon.c @@ -10,6 +10,7 @@ #include #include +#include #include #include diff --git a/src/ubik/disk.c b/src/ubik/disk.c index 8b37195b9..58fa8270c 100644 --- a/src/ubik/disk.c +++ b/src/ubik/disk.c @@ -10,6 +10,7 @@ #include #include +#include #include #include diff --git a/src/ubik/lock.c b/src/ubik/lock.c index b8a7a27fc..2567e4ecd 100644 --- a/src/ubik/lock.c +++ b/src/ubik/lock.c @@ -10,6 +10,7 @@ #include #include +#include #include #include diff --git a/src/ubik/phys.c b/src/ubik/phys.c index d0f65c7aa..3e21b0fdf 100644 --- a/src/ubik/phys.c +++ b/src/ubik/phys.c @@ -10,6 +10,7 @@ #include #include +#include #include #include diff --git a/src/ubik/recovery.c b/src/ubik/recovery.c index 6d4144a96..8e84ca5b1 100644 --- a/src/ubik/recovery.c +++ b/src/ubik/recovery.c @@ -10,6 +10,7 @@ #include #include +#include #include #include diff --git a/src/ubik/remote.c b/src/ubik/remote.c index 9e1caea11..a6ca567a3 100644 --- a/src/ubik/remote.c +++ b/src/ubik/remote.c @@ -10,6 +10,7 @@ #include #include +#include #include #include diff --git a/src/ubik/ubik.c b/src/ubik/ubik.c index 4fadb95ce..082b437e0 100644 --- a/src/ubik/ubik.c +++ b/src/ubik/ubik.c @@ -10,6 +10,7 @@ #include #include +#include #include #include diff --git a/src/ubik/ubikclient.c b/src/ubik/ubikclient.c index e6c9de665..b6a86ca73 100644 --- a/src/ubik/ubikclient.c +++ b/src/ubik/ubikclient.c @@ -10,6 +10,8 @@ #include #include +#include + #ifdef IGNORE_SOME_GCC_WARNINGS # pragma GCC diagnostic warning "-Wstrict-prototypes" #endif diff --git a/src/ubik/ubikcmd.c b/src/ubik/ubikcmd.c index 250199bdc..d387cb6e8 100644 --- a/src/ubik/ubikcmd.c +++ b/src/ubik/ubikcmd.c @@ -10,6 +10,7 @@ #include #include +#include #include #include diff --git a/src/ubik/udebug.c b/src/ubik/udebug.c index 83a395f27..79ced899c 100644 --- a/src/ubik/udebug.c +++ b/src/ubik/udebug.c @@ -10,6 +10,7 @@ #include #include +#include #include #include diff --git a/src/ubik/uinit.c b/src/ubik/uinit.c index 5b167ae00..f823e0b62 100644 --- a/src/ubik/uinit.c +++ b/src/ubik/uinit.c @@ -10,6 +10,7 @@ #include #include +#include #include #ifdef AFS_NT40_ENV diff --git a/src/ubik/vote.c b/src/ubik/vote.c index 71aed1be0..0e16cb0dd 100644 --- a/src/ubik/vote.c +++ b/src/ubik/vote.c @@ -10,6 +10,7 @@ #include #include +#include #include #ifdef AFS_NT40_ENV diff --git a/src/update/Makefile.in b/src/update/Makefile.in index 07fd974a7..75d746d2e 100644 --- a/src/update/Makefile.in +++ b/src/update/Makefile.in @@ -32,10 +32,12 @@ generated: update.cs.c update.ss.c update.xdr.c update.h # Build targets # upclient: client.o update.cs.o utils.o ${LIBS} - $(AFS_LDRULE) client.o update.cs.o utils.o ${LIBS} ${XLIBS} + $(AFS_LDRULE) client.o update.cs.o utils.o \ + ${LIBS} $(LIB_roken) ${XLIBS} upserver: server.o utils.o update.ss.o ${LIBS} - $(AFS_LDRULE) server.o utils.o update.ss.o ${LIBS} ${XLIBS} + $(AFS_LDRULE) server.o utils.o update.ss.o \ + ${LIBS} $(LIB_roken) ${XLIBS} utils.o: utils.c update.h global.h diff --git a/src/update/NTMakefile b/src/update/NTMakefile index 5372656f6..9cd5b625a 100644 --- a/src/update/NTMakefile +++ b/src/update/NTMakefile @@ -23,7 +23,8 @@ LIBS = \ $(DESTDIR)\lib\afsrxkad.lib \ $(DESTDIR)\lib\afs\afsprocmgmt.lib \ $(DESTDIR)\lib\libafsconf.lib \ - $(DESTDIR)\lib\afs\afspioctl.lib + $(DESTDIR)\lib\afs\afspioctl.lib \ + $(DESTDIR)\lib\afsroken.lib ############################################################################ # Definitions for generating files via RXGEN diff --git a/src/update/client.c b/src/update/client.c index 2e35d3b49..803cd7743 100644 --- a/src/update/client.c +++ b/src/update/client.c @@ -11,6 +11,9 @@ #include +#include +#include + #include #ifdef AFS_AIX32_ENV #include diff --git a/src/update/server.c b/src/update/server.c index a7fc60ff5..11bddb7b0 100644 --- a/src/update/server.c +++ b/src/update/server.c @@ -10,6 +10,8 @@ #include #include +#include +#include #include #ifdef AFS_AIX32_ENV diff --git a/src/update/utils.c b/src/update/utils.c index 315e04e64..37cda6716 100644 --- a/src/update/utils.c +++ b/src/update/utils.c @@ -10,6 +10,7 @@ #include #include +#include #include #include diff --git a/src/uss/Makefile.in b/src/uss/Makefile.in index 774c5fd53..caf563084 100644 --- a/src/uss/Makefile.in +++ b/src/uss/Makefile.in @@ -47,7 +47,7 @@ OBJS = uss_procs.o \ y.tab.o uss: uss.o ${OBJS} - $(AFS_LDRULE) uss.o ${OBJS} ${LIBS} + $(AFS_LDRULE) uss.o ${OBJS} ${LIBS} $(LIB_roken) uss.o: uss.c AFS_component_version_number.c diff --git a/src/util/get_krbrlm.c b/src/util/get_krbrlm.c index d77a1e17a..1866a5129 100644 --- a/src/util/get_krbrlm.c +++ b/src/util/get_krbrlm.c @@ -6,6 +6,7 @@ #include #include +#include #include #include diff --git a/src/util/netutils.c b/src/util/netutils.c index d987ed108..e92251362 100644 --- a/src/util/netutils.c +++ b/src/util/netutils.c @@ -14,6 +14,7 @@ #include #include +#include #include #include diff --git a/src/util/serverLog.c b/src/util/serverLog.c index 773080785..1cba0949c 100644 --- a/src/util/serverLog.c +++ b/src/util/serverLog.c @@ -33,6 +33,9 @@ #include #endif #include /* signal(), kill(), wait(), etc. */ + +#include /* Must come after procmgmt.h */ + #include #include #include diff --git a/src/util/uuid.c b/src/util/uuid.c index f56834234..ddfb6a2c8 100644 --- a/src/util/uuid.c +++ b/src/util/uuid.c @@ -47,6 +47,7 @@ #include "afs/param.h" #else #include +#include #endif diff --git a/src/venus/Makefile.in b/src/venus/Makefile.in index 8f01c2ebd..f85121b8c 100644 --- a/src/venus/Makefile.in +++ b/src/venus/Makefile.in @@ -53,7 +53,7 @@ all: fs up fstrace cmdebug livesys kdump-build cacheout # Build targets # cacheout: cacheout.o - $(AFS_LDRULE) cacheout.o ${LIBS} ${XLIBS} ${CMLIBS} + $(AFS_LDRULE) cacheout.o ${LIBS} $(LIB_roken) ${XLIBS} ${CMLIBS} cacheout.o: cacheout.c @@ -61,34 +61,36 @@ cacheout.o: cacheout.c up.o: up.c AFS_component_version_number.c up: up.o - $(AFS_LDRULE) up.o ${LIBS} ${XLIBS} + $(AFS_LDRULE) up.o ${LIBS} $(LIB_roken) ${XLIBS} fs.o: fs.c ${INCLS} AFS_component_version_number.c fs: fs.o $(LIBS) - $(AFS_LDRULE) fs.o ${TOP_LIBDIR}/libprot.a $(LIBS) ${XLIBS} + $(AFS_LDRULE) fs.o ${TOP_LIBDIR}/libprot.a $(LIBS) \ + $(LIB_roken) ${XLIBS} afsio.o: afsio.c ${INCLS} AFS_component_version_number.c afsio: afsio.o $(LIBS) $(AFS_LDRULE) afsio.o ${TOP_LIBDIR}/libprot.a \ - ${TOP_LIBDIR}/libafsint.a $(LIBS) ${XLIBS} + ${TOP_LIBDIR}/libafsint.a $(LIBS) \ + $(LIB_roken) ${XLIBS} livesys.o: livesys.c ${INCLS} AFS_component_version_number.c livesys: livesys.o $(LIBS) - $(AFS_LDRULE) livesys.o $(LIBS) ${XLIBS} + $(AFS_LDRULE) livesys.o $(LIBS) $(LIB_roken) ${XLIBS} twiddle: twiddle.o $(LIBS) - $(AFS_LDRULE) twiddle.o $(LIBS) ${XLIBS} + $(AFS_LDRULE) twiddle.o $(LIBS) $(LIB_roken) ${XLIBS} gcpags: gcpags.o $(LIBS) - $(AFS_LDRULE) gcpags.o $(LIBS) ${XLIBS} + $(AFS_LDRULE) gcpags.o $(LIBS) $(LIB_roken) ${XLIBS} whatfid.o: whatfid.c ${INCLS} AFS_component_version_number.c whatfid: whatfid.o ${LIBS} - $(AFS_LDRULE) whatfid.o ${LIBS} ${XLIBS} + $(AFS_LDRULE) whatfid.o ${LIBS} $(LIB_roken) ${XLIBS} fstrace.o: fstrace.c AFS_component_version_number.c case ${SYS_NAME} in \ @@ -117,12 +119,12 @@ fstrace: fstrace.o cmdebug.o: cmdebug.c ${INCLS} AFS_component_version_number.c cmdebug: cmdebug.o ${CMLIBS} - $(AFS_LDRULE) cmdebug.o ${CMLIBS} ${XLIBS} + $(AFS_LDRULE) cmdebug.o ${CMLIBS} $(LIB_roken) ${XLIBS} dedebug.o: dedebug.c ${INCLS} AFS_component_version_number.c dedebug: dedebug.o ${CMLIBS} - $(AFS_LDRULE) dedebug.o ${CMLIBS} ${XLIBS} + $(AFS_LDRULE) dedebug.o ${CMLIBS} $(LIB_roken) ${XLIBS} diff --git a/src/venus/afsio.c b/src/venus/afsio.c index 35abfc567..22ff32df6 100644 --- a/src/venus/afsio.c +++ b/src/venus/afsio.c @@ -27,6 +27,9 @@ #include #include + +#include + #include #include diff --git a/src/venus/cmdebug.c b/src/venus/cmdebug.c index 97114b9db..85c0beabb 100644 --- a/src/venus/cmdebug.c +++ b/src/venus/cmdebug.c @@ -10,7 +10,7 @@ #include #include - +#include #include #ifdef AFS_NT40_ENV diff --git a/src/viced/Makefile.in b/src/viced/Makefile.in index 4b6592a0d..1020ede78 100644 --- a/src/viced/Makefile.in +++ b/src/viced/Makefile.in @@ -77,24 +77,24 @@ fileserver: ${objects} ${headers} ${LIBS} case ${SYS_NAME} in \ rs_aix*) \ ${CC} -K ${AFS_LDFLAGS} -o fileserver ${objects} \ - ${TOP_LIBDIR}/libaudit.a ${LIBS} ${XLIBS} ;; \ + ${TOP_LIBDIR}/libaudit.a ${LIBS} $(LIB_roken) ${XLIBS} ;; \ *) \ $(AFS_LDRULE) ${objects} ${TOP_LIBDIR}/libaudit.a \ - ${LIBS} ${XLIBS} ;; \ + ${LIBS} $(LIB_roken) ${XLIBS} ;; \ esac CFLAGS_fsprobe.o = @CFLAGS_NOERROR@ -DINTERPRET_DUMP fsprobe.o: fsprobe.c AFS_component_version_number.c fsprobe: fsprobe.o - $(AFS_LDRULE) fsprobe.o ${LIBS} ${XLIBS} + $(AFS_LDRULE) fsprobe.o ${LIBS} $(LIB_roken) ${XLIBS} CFLAGS_cbd.o = -DINTERPRET_DUMP cbd.o: callback.c AFS_component_version_number.c $(AFS_CCRULE) $(srcdir)/callback.c cbd: cbd.o - $(AFS_LDRULE) cbd.o ${LIBS} ${XLIBS} + $(AFS_LDRULE) cbd.o ${LIBS} $(LIB_roken) ${XLIBS} install: fileserver fs_stats.h ${INSTALL} -d ${DESTDIR}${afssrvlibexecdir} diff --git a/src/viced/NTMakefile b/src/viced/NTMakefile index bbd1da0fe..7664159f8 100644 --- a/src/viced/NTMakefile +++ b/src/viced/NTMakefile @@ -59,7 +59,8 @@ EXELIBS = \ $(DESTDIR)\lib\afs\afsreg.lib \ $(DESTDIR)\lib\afs\afsprocmgmt.lib \ $(DESTDIR)\lib\afs\afseventlog.lib \ - $(DESTDIR)\lib\afs\afspioctl.lib + $(DESTDIR)\lib\afs\afspioctl.lib \ + $(DESTDIR)\lib\afsroken.lib $(EXEFILE): $(EXEOBJS) $(EXERES) $(EXELIBS) $(EXECONLINK) diff --git a/src/viced/afsfileprocs.c b/src/viced/afsfileprocs.c index 91f7f7b00..ce9fd32b3 100644 --- a/src/viced/afsfileprocs.c +++ b/src/viced/afsfileprocs.c @@ -28,6 +28,7 @@ #include #include +#include #include #include diff --git a/src/viced/callback.c b/src/viced/callback.c index 1d52fc7a8..8375c0b2c 100644 --- a/src/viced/callback.c +++ b/src/viced/callback.c @@ -84,6 +84,7 @@ #include #include +#include #include #include /* for malloc() */ diff --git a/src/viced/host.c b/src/viced/host.c index 0d62f8402..8dd9865c0 100644 --- a/src/viced/host.c +++ b/src/viced/host.c @@ -12,6 +12,7 @@ #include #include +#include #include #include diff --git a/src/viced/physio.c b/src/viced/physio.c index b56465d51..290926209 100644 --- a/src/viced/physio.c +++ b/src/viced/physio.c @@ -16,6 +16,7 @@ #include #include +#include #include #include diff --git a/src/viced/viced.c b/src/viced/viced.c index 4d86fe876..5f57f0d78 100644 --- a/src/viced/viced.c +++ b/src/viced/viced.c @@ -21,6 +21,8 @@ #include #include +#include +#include #include #include diff --git a/src/vlserver/Makefile.in b/src/vlserver/Makefile.in index 36b4890fb..5628243a7 100644 --- a/src/vlserver/Makefile.in +++ b/src/vlserver/Makefile.in @@ -73,23 +73,24 @@ ${TOP_INCDIR}/afs/cnvldb.h: cnvldb.h ${INSTALL_DATA} $? $@ vldb_check: vldb_check.o ${LIBS} - $(AFS_LDRULE) vldb_check.o ${LIBS} ${XLIBS} + $(AFS_LDRULE) vldb_check.o ${LIBS} $(LIB_roken) ${XLIBS} vldb_check.o: vldb_check.c AFS_component_version_number.o cnvldb: cnvldb.o ${LIBS} - $(AFS_LDRULE) cnvldb.o ${LIBS} ${XLIBS} + $(AFS_LDRULE) cnvldb.o ${LIBS} $(LIB_roken) ${XLIBS} cnvldb.o: cnvldb.c cnvldb.h AFS_component_version_number.o sascnvldb: sascnvldb.o ${LIBS} - $(AFS_LDRULE) sascnvldb.o ${LIBS} ${XLIBS} + $(AFS_LDRULE) sascnvldb.o ${LIBS} $(LIB_roken) ${XLIBS} sascnvldb.o: sascnvldb.c cnvldb.h AFS_component_version_number.o vlserver: vlserver.o vlutils.o vlprocs.o vldbint.ss.o vldbint.xdr.o $(LIBS) $(AFS_LDRULE) vlserver.o vlutils.o vlprocs.o vldbint.ss.o \ - vldbint.xdr.o $(LIBS) ${XLIBS} ${TOP_LIBDIR}/libaudit.a + vldbint.xdr.o \ + $(LIBS) $(LIB_roken) ${XLIBS} ${TOP_LIBDIR}/libaudit.a vlserver.o: vlserver.c ${INCLS} AFS_component_version_number.o vlutils.o: vlutils.c ${INCLS} @@ -126,8 +127,8 @@ libvldb.a: $(OBJS) AFS_component_version_number.o $(RANLIB) $@ vlclient: vlclient.o libvldb.a $(LIBS) - $(AFS_LDRULE) vlclient.o libvldb.a $(LIBS) ${XLIBS} \ - ${TOP_LIBDIR}/libcmd.a + $(AFS_LDRULE) vlclient.o libvldb.a \ + $(LIBS) ${TOP_LIBDIR}/libcmd.a $(LIB_roken) ${XLIBS} vlclient.o: vlclient.c ${INCLS} AFS_component_version_number.o diff --git a/src/vlserver/NTMakefile b/src/vlserver/NTMakefile index 5d746fcd6..f3d92fba7 100644 --- a/src/vlserver/NTMakefile +++ b/src/vlserver/NTMakefile @@ -89,7 +89,8 @@ VLSERVER_EXECLIBS = \ $(DESTDIR)\lib\afs\afsreg.lib \ $(DESTDIR)\lib\afs\afsprocmgmt.lib \ $(DESTDIR)\lib\libafsconf.lib \ - $(DESTDIR)\lib\afs\afspioctl.lib + $(DESTDIR)\lib\afs\afspioctl.lib \ + $(DESTDIR)\lib\afsroken.lib $(VLSERVER): $(VLSERVER_EXEOBJS) $(LIBFILE) $(VLSERVER_EXECLIBS) $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib shell32.lib diff --git a/src/vlserver/vlclient.c b/src/vlserver/vlclient.c index f2155ea1a..36a8ea434 100644 --- a/src/vlserver/vlclient.c +++ b/src/vlserver/vlclient.c @@ -10,6 +10,7 @@ #include #include +#include #include #include diff --git a/src/vlserver/vldb_check.c b/src/vlserver/vldb_check.c index 01645ae85..99a44405d 100644 --- a/src/vlserver/vldb_check.c +++ b/src/vlserver/vldb_check.c @@ -46,6 +46,7 @@ #include #include +#include #include #include diff --git a/src/vlserver/vlprocs.c b/src/vlserver/vlprocs.c index d020c792e..cb61fef5e 100644 --- a/src/vlserver/vlprocs.c +++ b/src/vlserver/vlprocs.c @@ -10,6 +10,7 @@ #include #include +#include #include #include diff --git a/src/vlserver/vlserver.c b/src/vlserver/vlserver.c index dfcd98175..6b2df2f19 100644 --- a/src/vlserver/vlserver.c +++ b/src/vlserver/vlserver.c @@ -10,6 +10,7 @@ #include #include +#include #include #include diff --git a/src/vlserver/vlutils.c b/src/vlserver/vlutils.c index 65ca56d6c..2ae3f2845 100644 --- a/src/vlserver/vlutils.c +++ b/src/vlserver/vlutils.c @@ -10,6 +10,7 @@ #include #include +#include #include #include diff --git a/src/vol/Makefile.in b/src/vol/Makefile.in index 3a4a99386..47ef0702a 100644 --- a/src/vol/Makefile.in +++ b/src/vol/Makefile.in @@ -184,7 +184,8 @@ vlib.a: ${VLIBOBJS} AFS_component_version_number.o # new salvager: remove references to /vice by linking with novice.o salvager: vol-salvage.o physio.o vlib.a salvager.o ${LIBS} - $(AFS_LDRULE) vol-salvage.o physio.o salvager.o ${LIBS} ${XLIBS} + $(AFS_LDRULE) vol-salvage.o physio.o salvager.o \ + ${LIBS} $(LIB_roken) ${XLIBS} salvager.o: salvager.c AFS_component_version_number.c @@ -214,16 +215,20 @@ gi: ${TOP_LIBDIR}/libsys.a esac namei_map: ${TOP_LIBDIR}/libsys.a namei_map.o - $(AFS_LDRULE) namei_map.o ${TOP_LIBDIR}/libafsutil.a ${LIBS} ${XLIBS} + $(AFS_LDRULE) namei_map.o ${TOP_LIBDIR}/libafsutil.a \ + ${LIBS} $(LIB_roken) ${XLIBS} volinfo: vol-info.o physio.o ihandle.o ${LIBS} - $(AFS_LDRULE) vol-info.o physio.o ihandle.o ${LIBS} ${XLIBS} + $(AFS_LDRULE) vol-info.o physio.o ihandle.o \ + ${LIBS} $(LIB_roken) ${XLIBS} fssync-debug: fssync-debug.o physio.o AFS_component_version_number.c ${LIBS} - $(AFS_LDRULE) fssync-debug.o physio.o ${LIBS} ${XLIBS} + $(AFS_LDRULE) fssync-debug.o physio.o \ + ${LIBS} $(LIB_roken) ${XLIBS} vol-bless: vol-bless.o physio.o ihandle.o ${LIBS} - $(AFS_LDRULE) vol-bless.o physio.o ${LIBS} ${XLIBS} + $(AFS_LDRULE) vol-bless.o physio.o \ + ${LIBS} $(LIB_roken) ${XLIBS} xfs_size_check: xfs_size_check.o $(AFS_LDRULE) xfs_size_check.o diff --git a/src/vol/NTMakefile b/src/vol/NTMakefile index e4682bf8a..65682b75e 100644 --- a/src/vol/NTMakefile +++ b/src/vol/NTMakefile @@ -182,7 +182,8 @@ EXEC_LIBS = \ $(DESTDIR)\lib\afs\afsreg.lib \ $(DESTDIR)\lib\afs\afsprocmgmt.lib \ $(DESTDIR)\lib\afs\afseventlog.lib \ - $(DESTDIR)\lib\afspthread.lib + $(DESTDIR)\lib\afspthread.lib \ + $(DESTDIR)\lib\afsroken.lib ############################################################################ # build salvager diff --git a/src/vol/clone.c b/src/vol/clone.c index 945253a60..6f7bce3ad 100644 --- a/src/vol/clone.c +++ b/src/vol/clone.c @@ -18,6 +18,7 @@ #include #include +#include #include #include diff --git a/src/vol/daemon_com.c b/src/vol/daemon_com.c index 26d5cb7c8..923306f36 100644 --- a/src/vol/daemon_com.c +++ b/src/vol/daemon_com.c @@ -21,6 +21,7 @@ #include #include +#include #include #include diff --git a/src/vol/fssync-client.c b/src/vol/fssync-client.c index 8a7f35d3a..fc3b6c038 100644 --- a/src/vol/fssync-client.c +++ b/src/vol/fssync-client.c @@ -35,6 +35,7 @@ #include #include +#include #include #include diff --git a/src/vol/fssync-server.c b/src/vol/fssync-server.c index ab9afc951..0f0264a8e 100644 --- a/src/vol/fssync-server.c +++ b/src/vol/fssync-server.c @@ -43,6 +43,7 @@ #include #include +#include #include #include diff --git a/src/vol/ihandle.c b/src/vol/ihandle.c index 2985bffd6..facae4f34 100644 --- a/src/vol/ihandle.c +++ b/src/vol/ihandle.c @@ -14,6 +14,7 @@ #include #include +#include #include #include diff --git a/src/vol/namei_ops.c b/src/vol/namei_ops.c index 8a3b2e815..edbf8fb9f 100644 --- a/src/vol/namei_ops.c +++ b/src/vol/namei_ops.c @@ -14,6 +14,7 @@ #ifdef AFS_NAMEI_ENV +#include #include #include #ifndef AFS_NT40_ENV @@ -24,6 +25,7 @@ #include #include #include +#include #endif #include #include diff --git a/src/vol/ntops.c b/src/vol/ntops.c index 5ee3f2f4e..cf546b4eb 100644 --- a/src/vol/ntops.c +++ b/src/vol/ntops.c @@ -12,6 +12,7 @@ #include #include +#include #ifdef AFS_NT40_ENV #include diff --git a/src/vol/nuke.c b/src/vol/nuke.c index c5e5a89c7..4ca2eab99 100644 --- a/src/vol/nuke.c +++ b/src/vol/nuke.c @@ -10,6 +10,7 @@ #include #include +#include #include #include diff --git a/src/vol/partition.c b/src/vol/partition.c index bc7fe761c..02ad3b700 100644 --- a/src/vol/partition.c +++ b/src/vol/partition.c @@ -21,6 +21,7 @@ #include #include +#include #include #include diff --git a/src/vol/physio.c b/src/vol/physio.c index 673b611af..c5faa2654 100644 --- a/src/vol/physio.c +++ b/src/vol/physio.c @@ -17,6 +17,7 @@ #include #include +#include #include #include diff --git a/src/vol/purge.c b/src/vol/purge.c index 783e5d908..037f96f47 100644 --- a/src/vol/purge.c +++ b/src/vol/purge.c @@ -16,6 +16,7 @@ #include #include +#include #include #ifdef AFS_NT40_ENV diff --git a/src/vol/salvager.c b/src/vol/salvager.c index e2708ae9a..7056718cc 100644 --- a/src/vol/salvager.c +++ b/src/vol/salvager.c @@ -20,6 +20,8 @@ #include #include +#include +#include #include #include @@ -101,7 +103,6 @@ #include #include #include -#include /* signal(), kill(), wait(), etc. */ #ifndef AFS_NT40_ENV #include #endif diff --git a/src/vol/vg_cache.c b/src/vol/vg_cache.c index 17d3fa352..f8c736ec7 100644 --- a/src/vol/vg_cache.c +++ b/src/vol/vg_cache.c @@ -15,6 +15,8 @@ #include #include +#include + #ifdef AFS_DEMAND_ATTACH_FS #include diff --git a/src/vol/vg_scan.c b/src/vol/vg_scan.c index 752187822..391f9504a 100644 --- a/src/vol/vg_scan.c +++ b/src/vol/vg_scan.c @@ -16,6 +16,8 @@ #include #include +#include + #ifdef AFS_DEMAND_ATTACH_FS #include diff --git a/src/vol/vnode.c b/src/vol/vnode.c index a111cc7a6..42270c320 100644 --- a/src/vol/vnode.c +++ b/src/vol/vnode.c @@ -17,6 +17,9 @@ */ #include #include + +#include + #define MAXINT (~(1<<((sizeof(int)*8)-1))) diff --git a/src/vol/vol-info.c b/src/vol/vol-info.c index bf7b1f6b1..b653af306 100644 --- a/src/vol/vol-info.c +++ b/src/vol/vol-info.c @@ -17,6 +17,7 @@ #include #include +#include #include #include diff --git a/src/vol/vol-salvage.c b/src/vol/vol-salvage.c index 1fc0a1283..138bf05e4 100644 --- a/src/vol/vol-salvage.c +++ b/src/vol/vol-salvage.c @@ -86,6 +86,8 @@ Vnodes with 0 inode pointers in RW volumes are now deleted. #include #include +#include +#include #ifndef AFS_NT40_ENV #include diff --git a/src/vol/volume.c b/src/vol/volume.c index 20e542662..4703e1181 100644 --- a/src/vol/volume.c +++ b/src/vol/volume.c @@ -21,6 +21,7 @@ #include #include +#include #include #include diff --git a/src/vol/vutil.c b/src/vol/vutil.c index 182210398..967a3aced 100644 --- a/src/vol/vutil.c +++ b/src/vol/vutil.c @@ -17,6 +17,7 @@ #include #include +#include #include #include diff --git a/src/volser/Makefile.in b/src/volser/Makefile.in index 603fc2589..f4b8124dd 100644 --- a/src/volser/Makefile.in +++ b/src/volser/Makefile.in @@ -89,16 +89,19 @@ ${TOP_LIBDIR}/libvolser.a: libvolser.a restorevol: restorevol.o $(AFS_LDRULE) restorevol.o ${TOP_LIBDIR}/libcmd.a \ - ${TOP_LIBDIR}/util.a ${XLIBS} + ${TOP_LIBDIR}/util.a $(LIB_roken) ${XLIBS} vos: vos.o ${VSOBJS} libvolser.a ${LIBS} - $(AFS_LDRULE) vos.o $(VSOBJS) libvolser.a ${LIBS} ${XLIBS} + $(AFS_LDRULE) vos.o $(VSOBJS) libvolser.a \ + ${LIBS} $(LIB_roken) ${XLIBS} volserver: $(SOBJS) $(LIBS) ${TOP_LIBDIR}/libdir.a - $(AFS_LDRULE) $(SOBJS) ${TOP_LIBDIR}/libdir.a $(LIBS) ${XLIBS} + $(AFS_LDRULE) $(SOBJS) ${TOP_LIBDIR}/libdir.a \ + $(LIBS) $(LIB_roken) ${XLIBS} voldump: vol-dump.o ${VOLDUMP_LIBS} - $(AFS_LDRULE) vol-dump.o ${VOLDUMP_LIBS} ${XLIBS} + $(AFS_LDRULE) vol-dump.o ${VOLDUMP_LIBS} \ + $(LIB_roken) ${XLIBS} libvolser.a: volint.cs.o $(VSOBJS) volint.ss.o AFS_component_version_number.o -$(RM) -f $@ diff --git a/src/volser/NTMakefile b/src/volser/NTMakefile index f13790800..d1b613b73 100644 --- a/src/volser/NTMakefile +++ b/src/volser/NTMakefile @@ -73,7 +73,8 @@ EXEC_LIBS = \ $(DESTDIR)\lib\afs\afsreg.lib \ $(DESTDIR)\lib\afs\afseventlog.lib \ $(DESTDIR)\lib\libafsconf.lib \ - $(DESTDIR)\lib\afs\afspioctl.lib + $(DESTDIR)\lib\afs\afspioctl.lib \ + $(DESTDIR)\lib\afsroken.lib ############################################################################ diff --git a/src/volser/common.c b/src/volser/common.c index 8c4f6f3a2..4eccac4da 100644 --- a/src/volser/common.c +++ b/src/volser/common.c @@ -10,6 +10,8 @@ #include #include +#include + #include #include diff --git a/src/volser/dumpstuff.c b/src/volser/dumpstuff.c index f2bd77e38..216594044 100644 --- a/src/volser/dumpstuff.c +++ b/src/volser/dumpstuff.c @@ -10,6 +10,7 @@ #include #include +#include #include #include diff --git a/src/volser/lockprocs.c b/src/volser/lockprocs.c index a279ba47b..fc4fa1f14 100644 --- a/src/volser/lockprocs.c +++ b/src/volser/lockprocs.c @@ -17,6 +17,7 @@ #include #include +#include #include #ifdef AFS_NT40_ENV diff --git a/src/volser/physio.c b/src/volser/physio.c index e431a3649..9baf650c7 100644 --- a/src/volser/physio.c +++ b/src/volser/physio.c @@ -10,6 +10,7 @@ #include #include +#include #include #ifdef AFS_NT40_ENV diff --git a/src/volser/volmain.c b/src/volser/volmain.c index 4d837d481..cc0b84b6b 100644 --- a/src/volser/volmain.c +++ b/src/volser/volmain.c @@ -10,6 +10,7 @@ #include #include +#include #include #include diff --git a/src/volser/volprocs.c b/src/volser/volprocs.c index a2d6d921a..0d5271f9e 100644 --- a/src/volser/volprocs.c +++ b/src/volser/volprocs.c @@ -12,6 +12,7 @@ #include #include +#include #include #include diff --git a/src/volser/voltrans.c b/src/volser/voltrans.c index 6a0f365e8..3a80c5620 100644 --- a/src/volser/voltrans.c +++ b/src/volser/voltrans.c @@ -17,6 +17,7 @@ #include #include +#include #ifdef AFS_NT40_ENV #include diff --git a/src/volser/vos.c b/src/volser/vos.c index 0fbda28e3..fcff32554 100644 --- a/src/volser/vos.c +++ b/src/volser/vos.c @@ -10,6 +10,8 @@ #include #include +#include + #ifdef IGNORE_SOME_GCC_WARNINGS # pragma GCC diagnostic warning "-Wimplicit-function-declaration" #endif diff --git a/src/volser/vsprocs.c b/src/volser/vsprocs.c index 7376ae001..050df99bd 100644 --- a/src/volser/vsprocs.c +++ b/src/volser/vsprocs.c @@ -10,6 +10,9 @@ #include #include +#include /* signal(), kill(), wait(), etc. */ +#include + #include #include #include @@ -55,7 +58,6 @@ /* for UV_MoveVolume() recovery */ -#include /* signal(), kill(), wait(), etc. */ #include #include "volser_internal.h" diff --git a/src/volser/vsutils.c b/src/volser/vsutils.c index 8861a5144..7ced57603 100644 --- a/src/volser/vsutils.c +++ b/src/volser/vsutils.c @@ -10,6 +10,7 @@ #include #include +#include #include #include diff --git a/src/xstat/Makefile.in b/src/xstat/Makefile.in index ffdd60688..42d7cdcde 100644 --- a/src/xstat/Makefile.in +++ b/src/xstat/Makefile.in @@ -63,7 +63,8 @@ xstat_fs_callback.o: xstat_fs_callback.c ${FSINCLS} xstat_fs_test.o: xstat_fs_test.c ${FSINCLS} AFS_component_version_number.c xstat_fs_test: xstat_fs_test.o libxstat_fs.a ${LIBS} - $(AFS_LDRULE) xstat_fs_test.o libxstat_fs.a ${LIBS} ${XLIBS} + $(AFS_LDRULE) xstat_fs_test.o libxstat_fs.a \ + ${LIBS} $(LIB_roken) ${XLIBS} # # Cache Manager data collection @@ -80,7 +81,8 @@ xstat_cm.o: xstat_cm.c ${CMINCLS} xstat_cm_test.o: xstat_cm_test.c ${CMINCLS} AFS_component_version_number.c xstat_cm_test: xstat_cm_test.o libxstat_cm.a ${LIBS} - $(AFS_LDRULE) xstat_cm_test.o libxstat_cm.a ${LIBS} ${XLIBS} + $(AFS_LDRULE) xstat_cm_test.o libxstat_cm.a \ + ${LIBS} $(LIB_roken) ${XLIBS} # # Installation targets diff --git a/src/xstat/NTMakefile b/src/xstat/NTMakefile index f35183758..306187332 100644 --- a/src/xstat/NTMakefile +++ b/src/xstat/NTMakefile @@ -25,7 +25,8 @@ LIBS= \ $(LIBDIR)\afslwp.lib \ $(LIBDIR)\afs\afspioctl.lib \ $(LIBDIR)\afs\afsutil.lib \ - $(LIBDIR)\afs\afsreg.lib + $(LIBDIR)\afs\afsreg.lib \ + $(LIBDIR)\afsroken.lib install: \ diff --git a/src/xstat/xstat_cm.c b/src/xstat/xstat_cm.c index ba67a4be0..761131a08 100644 --- a/src/xstat/xstat_cm.c +++ b/src/xstat/xstat_cm.c @@ -16,7 +16,7 @@ #include #include - +#include #include "xstat_cm.h" /*Interface for this module */ #include /*Lightweight process package */ diff --git a/src/xstat/xstat_cm_test.c b/src/xstat/xstat_cm_test.c index 9404d9812..75b6b31ff 100644 --- a/src/xstat/xstat_cm_test.c +++ b/src/xstat/xstat_cm_test.c @@ -16,6 +16,7 @@ #include #include +#include #include "xstat_cm.h" /*Interface for xstat_cm module */ #include /*Command line interpreter */ diff --git a/src/xstat/xstat_fs.c b/src/xstat/xstat_fs.c index 7fa7b3415..f969e6c24 100644 --- a/src/xstat/xstat_fs.c +++ b/src/xstat/xstat_fs.c @@ -16,7 +16,7 @@ #include #include - +#include #include "xstat_fs.h" /*Interface for this module */ #include /*Lightweight process package */ diff --git a/src/xstat/xstat_fs_callback.c b/src/xstat/xstat_fs_callback.c index 7e5fd5d82..ed6646c3e 100644 --- a/src/xstat/xstat_fs_callback.c +++ b/src/xstat/xstat_fs_callback.c @@ -24,6 +24,8 @@ #include #include +#include + #ifdef AFS_NT40_ENV #include #include diff --git a/src/xstat/xstat_fs_test.c b/src/xstat/xstat_fs_test.c index fe8adcc4d..79a3523d6 100644 --- a/src/xstat/xstat_fs_test.c +++ b/src/xstat/xstat_fs_test.c @@ -15,6 +15,7 @@ #include #include +#include #include "xstat_fs.h" /*Interface for xstat_fs module */ diff --git a/tests/rpctestlib/NTMakefile b/tests/rpctestlib/NTMakefile index 7d69d6bad..0d929bfba 100644 --- a/tests/rpctestlib/NTMakefile +++ b/tests/rpctestlib/NTMakefile @@ -65,7 +65,8 @@ EXELIBS = \ $(DESTDIR)\lib\afs\mtafsutil.lib \ $(DESTDIR)\lib\afs\mtafsvol.lib \ $(DESTDIR)\lib\afs\mtafsvldb.lib \ - $(DESTDIR)\lib\afspthread.lib + $(DESTDIR)\lib\afspthread.lib \ + $(DESTDIR)\lib\afsroken.lib $(EXEFILE): $(EXEOBJS) $(EXELIBS) $(LIBFILE) $(EXECONLINK) diff --git a/tests/rpctestlib/rpc_test_cb_procs.c b/tests/rpctestlib/rpc_test_cb_procs.c index 7f679b21c..5aa579755 100644 --- a/tests/rpctestlib/rpc_test_cb_procs.c +++ b/tests/rpctestlib/rpc_test_cb_procs.c @@ -30,6 +30,9 @@ #include #include + +#include + #include #include "rpc_test_procs.h" diff --git a/tests/rpctestlib/rpc_test_main.c b/tests/rpctestlib/rpc_test_main.c index bee11da05..c36bb9d15 100644 --- a/tests/rpctestlib/rpc_test_main.c +++ b/tests/rpctestlib/rpc_test_main.c @@ -30,6 +30,9 @@ #include #include + +#include + #include #include "rpc_test_procs.h" diff --git a/tests/rpctestlib/rpc_test_procs.c b/tests/rpctestlib/rpc_test_procs.c index b47e816e0..24b1064b5 100644 --- a/tests/rpctestlib/rpc_test_procs.c +++ b/tests/rpctestlib/rpc_test_procs.c @@ -30,6 +30,9 @@ #include #include + +#include + #include #include "rpc_test_procs.h" -- 2.39.5