From: Tom Yu <tlyu@mit.edu>
Date: Fri, 19 Oct 2007 20:51:27 +0000 (+0000)
Subject: pull up r19881 from trunk
X-Git-Tag: krb5-1.6.3-final~4
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=e1412862d63a17836e5e5485c4d85be79b81759a;p=krb5.git

pull up r19881 from trunk

 r19881@cathode-dark-space:  jaltman | 2007-08-27 03:08:24 -0400
 ticket: new
 subject: Windows 64-bit - avoid missing symbol errors
 component: windows

 Microsoft defaults stack checking (/Gs) to on.  This requires
 that bufferoverflowU.lib be included in the link step.  The
 macro SCLIB in the build system specifies this library on
 versions of Windows that require it.  Include SCLIB on the
 link line of the makefile.



ticket: 5692
version_fixed: 1.6.3

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-6@20129 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/windows/kfwlogon/Makefile.in b/src/windows/kfwlogon/Makefile.in
index 0d7fcc565..47b48109f 100644
--- a/src/windows/kfwlogon/Makefile.in
+++ b/src/windows/kfwlogon/Makefile.in
@@ -31,11 +31,11 @@ $(EXERES): $(VERSIONRC)
 all-windows:: $(OUTPRE)kfwlogon.dll $(OUTPRE)kfwcpcc.exe
 
 $(KFWLOGON): $(OUTPRE)kfwlogon.obj $(OUTPRE)kfwcommon.obj $(LIBRES)
-    link $(DLL_LINKOPTS) -out:$@ $(OUTPRE)kfwlogon.obj $(OUTPRE)kfwcommon.obj -entry:DllEntryPoint -def:kfwlogon.def $(SYSLIBS) $(KLIB) $(CLIB) $(LIBRES)
+    link $(DLL_LINKOPTS) -out:$@ $(OUTPRE)kfwlogon.obj $(OUTPRE)kfwcommon.obj -entry:DllEntryPoint -def:kfwlogon.def $(SYSLIBS) $(KLIB) $(CLIB) $(SCLIB) $(LIBRES)
     $(_VC_MANIFEST_EMBED_DLL)
 
 $(KFWCPCC): $(OUTPRE)kfwcpcc.obj $(OUTPRE)kfwcommon.obj $(EXERES)
-    link $(EXE_LINKOPTS) -out:$@ $(OUTPRE)kfwcpcc.obj $(OUTPRE)kfwcommon.obj $(SYSLIBS) $(KLIB) $(CLIB) $(EXERES)
+    link $(EXE_LINKOPTS) -out:$@ $(OUTPRE)kfwcpcc.obj $(OUTPRE)kfwcommon.obj $(SYSLIBS) $(KLIB) $(CLIB) $(SCLIB) $(EXERES)
     $(_VC_MANIFEST_EMBED_EXE)
 
 install::