From 432479c4bb20fef14043cf913bdd669d01281990 Mon Sep 17 00:00:00 2001
From: Jeffrey Altman <jaltman@mit.edu>
Date: Thu, 5 Aug 2004 17:31:34 +0000
Subject: [PATCH] mpr-lib-required-20040805

All executables which include the pioctl functions now require mpr.lib
to be linked
---
 src/WINNT/afsd/NTMakefile    | 18 +++++++++---------
 src/WINNT/aklog/NTMakefile   |  6 +++---
 src/bozo/NTMakefile          |  4 ++--
 src/bucoord/NTMakefile       |  2 +-
 src/butc/NTMakefile          |  2 +-
 src/kauth/NTMakefile         | 12 ++++++------
 src/libafsauthent/NTMakefile |  2 +-
 src/ptserver/NTMakefile      | 12 ++++++------
 src/tbutc/NTMakefile         |  2 +-
 src/vlserver/NTMakefile      |  4 ++--
 src/volser/NTMakefile        |  4 ++--
 11 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/src/WINNT/afsd/NTMakefile b/src/WINNT/afsd/NTMakefile
index 44c012e..6586818 100644
--- a/src/WINNT/afsd/NTMakefile
+++ b/src/WINNT/afsd/NTMakefile
@@ -172,7 +172,7 @@ CONF_DLLLIBS = \
     $(DESTDIR)\lib\afs\afsreg.lib
 
 $(CONF_DLLFILE): $(CONFOBJS) $(OUT)\libafsconf.res $(CONF_DLLLIBS)
-	$(DLLGUILINK) -def:libafsconf.def dnsapi.lib
+	$(DLLGUILINK) -def:libafsconf.def dnsapi.lib mpr.lib
 	$(DLLPREP)
 	$(COPY) $*.lib $(ILIBDIR)
 	$(DEL) $*.lib $*.exp
@@ -221,7 +221,7 @@ LOGON_DLLLIBS =\
     $(AFSKFWLIB)
 
 LOGON_DLLSDKLIBS =\
-	dnsapi.lib \
+	dnsapi.lib mpr.lib \
 	advapi32.lib \
 	secur32.lib \
 	strsafe.lib \
@@ -251,7 +251,7 @@ LOG95_DLLLIBS =\
 	$(DESTDIR)\lib\libafsconf.lib
 
 $(LOG95_DLLFILE): $(LOG95_DLLOBJS) $(LOG95_DLLLIBS)
-	$(DLLGUILINK) $(LOGONLINKFLAGS) -def:afslog95.def dnsapi.lib
+	$(DLLGUILINK) $(LOGONLINKFLAGS) -def:afslog95.def dnsapi.lib mpr.lib
 	$(DLLPREP)
 	$(COPY) $*.lib $(DESTDIR)\lib
 	$(DEL) $*.lib $*.exp
@@ -318,17 +318,17 @@ EXELIBS = \
 
 # klog.exe
 $(EXEDIR)\klog.exe: $(OUT)\cklog.obj $(OUT)\klog.res $(EXELIBS)
-	$(EXECONLINK) dnsapi.lib
+	$(EXECONLINK) dnsapi.lib mpr.lib
 	$(EXEPREP)
 
 # tokens.exe
 $(EXEDIR)\tokens.exe: $(OUT)\ctokens.obj $(OUT)\tokens.res $(EXELIBS)
-	$(EXECONLINK) dnsapi.lib
+	$(EXECONLINK) dnsapi.lib mpr.lib
 	$(EXEPREP)
 
 # unlog.exe
 $(EXEDIR)\unlog.exe: $(OUT)\cunlog.obj $(OUT)\unlog.res $(EXELIBS)
-	$(EXECONLINK) dnsapi.lib
+	$(EXECONLINK) dnsapi.lib mpr.lib
 	$(EXEPREP)
 
 # afsd.exe
@@ -337,7 +337,7 @@ AFSD_EXEFILE = $(EXEDIR)\afsd.exe
 AFSD_SDKLIBS =\
 	largeint.lib \
 	netapi32.lib \
-    dnsapi.lib \
+    dnsapi.lib mpr.lib \
 	rpcrt4.lib \
 	user32.lib \
     Dbghelp.lib \
@@ -369,12 +369,12 @@ $(EXEDIR)\afsd_service.exe: $(OUT)\afsd_service.obj $(AFSDOBJS) $(OUT)\afsd_serv
 
 # fs.exe
 $(EXEDIR)\fs.exe: $(FSOBJS) $(OUT)\fs.res $(EXELIBS)
-	$(EXECONLINK) dnsapi.lib
+	$(EXECONLINK) dnsapi.lib mpr.lib
 	$(EXEPREP)
 
 # symlink.exe
 $(EXEDIR)\symlink.exe: $(SLOBJS) $(OUT)\symlink.res  $(EXELIBS)
-	$(EXECONLINK) dnsapi.lib
+	$(EXECONLINK) dnsapi.lib mpr.lib
 	$(EXEPREP)
 
 # afsshare.exe
diff --git a/src/WINNT/aklog/NTMakefile b/src/WINNT/aklog/NTMakefile
index 8bb6462..20d12cf 100644
--- a/src/WINNT/aklog/NTMakefile
+++ b/src/WINNT/aklog/NTMakefile
@@ -29,7 +29,7 @@ EXELIBS = \
 OTHERLIBS = \
     ..\kfw\lib\i386\krbv4w32.lib \
     ..\kfw\lib\i386\krb5_32.lib \
-    dnsapi.lib
+    dnsapi.lib mpr.lib
 
 afscflags = -I..\kfw\inc\krb5 -I..\kfw\inc\krb4 $(afscflags)
 
@@ -38,8 +38,8 @@ $(EXEOBJS): $$(@B).c
 
 ############################################################################
 
-$(EXEFILE) : $(EXEOBJS) $(OUT)\aklog.res $(EXELIBS)
-	$(EXECONLINK) $(OTHERLIBS)
+$(EXEFILE) : $(EXEOBJS) $(EXELIBS) $(OUT)\aklog.res
+	$(EXECONLINK) $(EXELIBS) $(OTHERLIBS)
 	$(EXEPREP) 
 
 install : $(COPYHEADERS) $(EXEFILE)
diff --git a/src/bozo/NTMakefile b/src/bozo/NTMakefile
index 8d7b8a7..dd5f8ae 100644
--- a/src/bozo/NTMakefile
+++ b/src/bozo/NTMakefile
@@ -70,7 +70,7 @@ BOSSERVER_EXELIBS =\
 	$(DESTDIR)\lib\cm_dns.obj
 
 $(BOSSERVER_EXEFILE): $(BOSSERVER_EXEOBJS) $(BOSSERVER_EXELIBS)
-	$(EXECONLINK) dnsapi.lib
+	$(EXECONLINK) dnsapi.lib mpr.lib
 	$(EXEPREP)
 
 
@@ -106,7 +106,7 @@ BOS_EXELIBS =\
 
 
 $(RS_BOS_EXEFILE): $(BOS_EXEOBJS) $(BOS_EXELIBS)
-	$(EXECONLINK) dnsapi.lib
+	$(EXECONLINK) dnsapi.lib mpr.lib
 	$(EXEPREP)
 
 $(CL_BOS_EXEFILE): $(RS_BOS_EXEFILE)
diff --git a/src/bucoord/NTMakefile b/src/bucoord/NTMakefile
index 95af55b..27574c2 100644
--- a/src/bucoord/NTMakefile
+++ b/src/bucoord/NTMakefile
@@ -91,7 +91,7 @@ EXELIBS =\
 	
 
 $(EXEFILE): $(EXEOBJS) $(EXELIBS)
-	$(EXECONLINK) dnsapi.lib
+	$(EXECONLINK) dnsapi.lib mpr.lib
 	$(EXEPREP)
 
 
diff --git a/src/butc/NTMakefile b/src/butc/NTMakefile
index 9622f5e..99ad8e3 100644
--- a/src/butc/NTMakefile
+++ b/src/butc/NTMakefile
@@ -54,7 +54,7 @@ EXELIBS =\
 	$(DESTDIR)\lib\cm_dns.obj
 
 $(EXEFILE): $(EXEOBJS) $(EXELIBS)
-	$(EXECONLINK) dnsapi.lib
+	$(EXECONLINK) dnsapi.lib mpr.lib
 	$(EXEPREP)
 
 ############################################################################
diff --git a/src/kauth/NTMakefile b/src/kauth/NTMakefile
index d89b5a8..e7f722a 100644
--- a/src/kauth/NTMakefile
+++ b/src/kauth/NTMakefile
@@ -125,7 +125,7 @@ KASERVER_EXELIBS =\
 	$(DESTDIR)\lib\afs\afsprocmgmt.lib
 
 $(KASERVER): $(KASERVER_OBJS) $(AFSLIBS) $(KASERVER_EXELIBS)
-	$(EXECONLINK) dnsapi.lib
+	$(EXECONLINK) dnsapi.lib mpr.lib
 	$(EXEPREP) 
 
 #build $(OUT)\kadatabase.obj
@@ -149,7 +149,7 @@ KAS_OBJS =\
 	$(OUT)\kas.res
 	
 $(KAS): $(KAS_OBJS) $(AFSLIBS) $(KAUTH_LIBFILE) $(TOKENLIB)
-	$(EXECONLINK) dnsapi.lib
+	$(EXECONLINK) dnsapi.lib mpr.lib
 	$(EXEPREP) 
 
 ########### Misc Exes #######################################################
@@ -162,20 +162,20 @@ KPASSWD_OBJS =\
 	$(OUT)\kpasswd.res
 
 $(KPASSWD_EXEFILE): $(KPASSWD_OBJS) $(AFSLIBS) $(KAUTH_LIBFILE) $(TOKENLIB)
-	$(EXECONLINK) dnsapi.lib
+	$(EXECONLINK) dnsapi.lib mpr.lib
 	$(EXEPREP)
 
 #kpwvalid.exe
 $(OUT)\kpwvalid.exe: $(OUT)\kpwvalid.obj $(AFSLIBS) $(KAUTH_LIBFILE)
-	$(EXECONLINK) dnsapi.lib
+	$(EXECONLINK) dnsapi.lib mpr.lib
 
 #kdb.exe - Not implemented for NT - because dbm not available on NT
 #kdb.exe: $(OUT)\kdb.obj $(AFSLIBS) $(KAUTH_LIBFILE) 
-#	$(EXECONLINK) dnsapi.lib
+#	$(EXECONLINK) dnsapi.lib mpr.lib
 
 #rebuild.exe 
 $(OUT)\rebuild.exe: $(OUT)\rebuild.obj $(OUT)\kautils.obj $(AFSLIBS) 
-	$(EXECONLINK) dnsapi.lib
+	$(EXECONLINK) dnsapi.lib mpr.lib
 
 ############################################################################
 # Definitions for generating versioninfo resources
diff --git a/src/libafsauthent/NTMakefile b/src/libafsauthent/NTMakefile
index 2942eb5..0e65c5e 100644
--- a/src/libafsauthent/NTMakefile
+++ b/src/libafsauthent/NTMakefile
@@ -141,7 +141,7 @@ DLLLIBS =\
     $(DESTDIR)\lib\lanahelper.lib
 
 $(LIBFILE): $(DLLOBJS) $(DLLLIBS) $(RXOBJS)
-	$(DLLCONLINK) /DEF:afsauthent.def rpcrt4.lib dnsapi.lib
+	$(DLLCONLINK) /DEF:afsauthent.def rpcrt4.lib dnsapi.lib mpr.lib
 	$(DLLPREP)
 
 # Definitions for generating versioninfo resources
diff --git a/src/ptserver/NTMakefile b/src/ptserver/NTMakefile
index ae2c058..78b75ea 100644
--- a/src/ptserver/NTMakefile
+++ b/src/ptserver/NTMakefile
@@ -73,7 +73,7 @@ PTSERVER_EXELIBS =$(PTSERVER_EXELIBS) $(DESTDIR)\lib\afs\afsprocmgmt.lib
 !ENDIF
 
 $(PTSERVER): $(PTSERVER_EXEOBJS) $(RXKADOBJS) $(PTSERVER_EXELIBS)
-	$(EXECONLINK) dnsapi.lib
+	$(EXECONLINK) dnsapi.lib mpr.lib
 	$(EXEPREP) 
 
 
@@ -104,7 +104,7 @@ PTS_EXELIBS =\
 	$(DESTDIR)\lib\cm_dns.obj
 
 $(PTS): $(PTS_EXEOBJS) $(PTS_EXELIBS) 
-	$(EXECONLINK) dnsapi.lib
+	$(EXECONLINK) dnsapi.lib mpr.lib
 	$(EXEPREP) 
 
 
@@ -180,16 +180,16 @@ clean::
 TEST_LIBS = $(PTS_EXELIBS)
 
 $(OUT)\readgroup.exe: $(OUT)\readgroup.obj $(LIBFILE) $(TEST_LIBS)
-	$(EXECONLINK) dnsapi.lib
+	$(EXECONLINK) dnsapi.lib mpr.lib
 
 $(OUT)\readpwd.exe: $(OUT)\readpwd.obj $(LIBFILE) $(TEST_LIBS)
-	$(EXECONLINK) dnsapi.lib
+	$(EXECONLINK) dnsapi.lib mpr.lib 
 
 $(OUT)\testpt.exe: $(OUT)\testpt.obj $(LIBFILE) $(TEST_LIBS)
-	$(EXECONLINK) dnsapi.lib
+	$(EXECONLINK) dnsapi.lib mpr.lib 
 
 $(OUT)\db_verify.exe: $(OUT)\db_verify.obj $(OUT)\pterror.obj $(OUT)\display.obj $(LIBFILE) $(TEST_LIBS)
-	$(EXECONLINK) dnsapi.lib
+	$(EXECONLINK) dnsapi.lib mpr.lib 
 
 mkdir:
 	
diff --git a/src/tbutc/NTMakefile b/src/tbutc/NTMakefile
index 0d0a3f7..95555ba 100644
--- a/src/tbutc/NTMakefile
+++ b/src/tbutc/NTMakefile
@@ -111,7 +111,7 @@ BUTCLIBS=$(DESTDIR)\lib\afs\afsbudb.lib  \
 #----------------------------------------------- BUTC
 
 $(BUTCEXE): $(BUTCOBJS) $(BUTCLIBS)
-	$(EXECONLINK) dnsapi.lib
+	$(EXECONLINK) dnsapi.lib mpr.lib
 	$(EXEPREP)
 
 .c.$(OUT)\obj:
diff --git a/src/vlserver/NTMakefile b/src/vlserver/NTMakefile
index 86f6a3e..84be1a6 100644
--- a/src/vlserver/NTMakefile
+++ b/src/vlserver/NTMakefile
@@ -89,7 +89,7 @@ VLSERVER_EXECLIBS = \
 
 	
 $(VLSERVER): $(VLSERVER_EXEOBJS) $(LIBFILE) $(VLSERVER_EXECLIBS)
-	$(EXECONLINK) dnsapi.lib
+	$(EXECONLINK) dnsapi.lib mpr.lib
 	$(EXEPREP) 
 
 ############################################################################
@@ -135,7 +135,7 @@ VLCLIENT_LIBS = \
 	$(DESTDIR)\lib\afs\afspioctl.lib
 
 $(OUT)\vlclient.exe: $(OUT)\vlclient.obj  $(LIBFILE) $(VLSERVER_EXECLIBS) $(VLCLIENT_LIBS)
-	$(EXECONLINK) dnsapi.lib
+	$(EXECONLINK) dnsapi.lib mpr.lib
 
 
 ############################################################################
diff --git a/src/volser/NTMakefile b/src/volser/NTMakefile
index e86eb8d..8f0b2ef 100644
--- a/src/volser/NTMakefile
+++ b/src/volser/NTMakefile
@@ -93,7 +93,7 @@ VOLSERVER_EXELIBS = \
 	$(DESTDIR)\lib\afs\afsprocmgmt.lib
 
 $(VOLSERVER_EXEFILE): $(VOLSERVER_EXEOBJS) $(VOLSERVER_EXELIBS) $(EXEC_LIBS)
-	$(EXECONLINK) dnsapi.lib
+	$(EXECONLINK) dnsapi.lib mpr.lib
 	$(EXEPREP) 
 
 ############################################################################
@@ -118,7 +118,7 @@ VOS_EXELIBS = \
 	$(DESTDIR)\lib\afs\afspioctl.lib
 
 $(RS_VOS_EXEFILE): $(VOS_EXEOBJS) $(VOS_EXELIBS) $(EXEC_LIBS)
-	$(EXECONLINK) dnsapi.lib
+	$(EXECONLINK) dnsapi.lib mpr.lib
 	$(EXEPREP) 
 
 $(CL_VOS_EXEFILE): $(RS_VOS_EXEFILE)
-- 
1.9.4