From 17ffebf7ff813118f15d7346e0211089fe2e95f0 Mon Sep 17 00:00:00 2001 From: Sam Hartman Date: Wed, 28 Sep 2011 20:57:53 +0000 Subject: [PATCH] Windows fixes: enable DNS lookups; turn on KDC lookup by default Moved wshelper from windows to util to fix build order dependencies. Signed-off-by: Kevin Wasserman git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@25273 dc483132-0cff-0310-8789-dd5450dbe970 --- src/Makefile.in | 9 ++++++--- src/config/win-pre.in | 7 +++++++ src/util/Makefile.in | 2 +- src/{windows => util}/wshelper/Makefile.in | 2 +- src/{windows => util}/wshelper/dllmain.c | 0 src/{windows => util}/wshelper/gethna.c | 0 src/{windows => util}/wshelper/hesiod.c | 0 src/{windows => util}/wshelper/hesmailh.c | 0 src/{windows => util}/wshelper/hespwnam.c | 0 src/{windows => util}/wshelper/hesservb.c | 0 src/{windows => util}/wshelper/inetaton.c | 0 src/{windows => util}/wshelper/pwd.h | 0 src/{windows => util}/wshelper/res_comp.c | 0 src/{windows => util}/wshelper/res_init.c | 0 src/{windows => util}/wshelper/res_quer.c | 0 src/{windows => util}/wshelper/resource.h | 0 src/{windows => util}/wshelper/resource.rc | 4 ++-- src/{windows => util}/wshelper/string.rc | 0 src/{windows => util}/wshelper/ver.rc.inc | 0 src/{windows => util}/wshelper/wsh-int.h | 0 src/{windows => util}/wshelper/wshelp32.def | 0 src/{windows => util}/wshelper/wshelp64.def | 0 src/{windows => util}/wshelper/wshelper.def | 0 src/windows/Makefile.in | 2 +- 24 files changed, 18 insertions(+), 8 deletions(-) rename src/{windows => util}/wshelper/Makefile.in (95%) rename src/{windows => util}/wshelper/dllmain.c (100%) rename src/{windows => util}/wshelper/gethna.c (100%) rename src/{windows => util}/wshelper/hesiod.c (100%) rename src/{windows => util}/wshelper/hesmailh.c (100%) rename src/{windows => util}/wshelper/hespwnam.c (100%) rename src/{windows => util}/wshelper/hesservb.c (100%) rename src/{windows => util}/wshelper/inetaton.c (100%) rename src/{windows => util}/wshelper/pwd.h (100%) rename src/{windows => util}/wshelper/res_comp.c (100%) rename src/{windows => util}/wshelper/res_init.c (100%) rename src/{windows => util}/wshelper/res_quer.c (100%) rename src/{windows => util}/wshelper/resource.h (100%) rename src/{windows => util}/wshelper/resource.rc (94%) rename src/{windows => util}/wshelper/string.rc (100%) rename src/{windows => util}/wshelper/ver.rc.inc (100%) rename src/{windows => util}/wshelper/wsh-int.h (100%) rename src/{windows => util}/wshelper/wshelp32.def (100%) rename src/{windows => util}/wshelper/wshelp64.def (100%) rename src/{windows => util}/wshelper/wshelper.def (100%) diff --git a/src/Makefile.in b/src/Makefile.in index 56b3d4544..4be7d0d0c 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -191,7 +191,8 @@ WINMAKEFILES=Makefile \ util\et\Makefile util\profile\Makefile util\profile\testmod\Makefile \ util\support\Makefile \ util\windows\Makefile \ - windows\Makefile windows\wshelper\Makefile windows\lib\Makefile \ + util\wshelper\Makefile \ + windows\Makefile windows\lib\Makefile \ windows\cns\Makefile windows\gina\Makefile \ windows\gss\Makefile windows\ms2mit\Makefile \ windows\wintel\Makefile windows\kfwlogon\Makefile windows\leashdll\Makefile @@ -304,14 +305,14 @@ WINMAKEFILES=Makefile \ ##DOS## $(WCONFIG) config < $@.in > $@ ##DOS##util\windows\Makefile: util\windows\Makefile.in $(MKFDEP) ##DOS## $(WCONFIG) config < $@.in > $@ +##DOS##util\wshelper\Makefile: util\wshelper\Makefile.in $(MKFDEP) +##DOS## $(WCONFIG) config < $@.in > $@ ##DOS##windows\Makefile: windows\Makefile.in $(MKFDEP) ##DOS## $(WCONFIG) config < $@.in > $@ ##DOS##windows\lib\Makefile: windows\lib\Makefile.in $(MKFDEP) ##DOS## $(WCONFIG) config < $@.in > $@ ##DOS##windows\cns\Makefile: windows\cns\Makefile.in $(MKFDEP) ##DOS## $(WCONFIG) config < $@.in > $@ -##DOS##windows\wshelper\Makefile: windows\wshelper\Makefile.in $(MKFDEP) -##DOS## $(WCONFIG) config < $@.in > $@ ##DOS##windows\gina\Makefile: windows\gina\Makefile.in $(MKFDEP) ##DOS## $(WCONFIG) config < $@.in > $@ ##DOS##windows\gss\Makefile: windows\gss\Makefile.in $(MKFDEP) @@ -555,6 +556,8 @@ install-windows:: copy appl\gss-sample\$(OUTPRE)gss-server.exe "$(KRB_INSTALL_DIR)\bin\." copy appl\gss-sample\$(OUTPRE)gss-client.exe "$(KRB_INSTALL_DIR)\bin\." copy windows\ms2mit\$(OUTPRE)ms2mit.exe "$(KRB_INSTALL_DIR)\bin\." + copy util\wshelper\$(OUTPRE)$(DLIB).lib "$(KRB_INSTALL_DIR)\lib\." + copy util\wshelper\$(OUTPRE)$(DLIB).dll "$(KRB_INSTALL_DIR)\bin\." copy ccapi\lib\win\srctmp\$(OUTPRE)$(CCLIB).dll "$(KRB_INSTALL_DIR)\bin\." copy ccapi\server\win\srctmp\$(OUTPRE)ccapiserver.exe "$(KRB_INSTALL_DIR)\bin\." copy clients\kvno\$(OUTPRE)kvno.exe "$(KRB_INSTALL_DIR)\bin\." diff --git a/src/config/win-pre.in b/src/config/win-pre.in index dc68573a8..bcef2f4b8 100644 --- a/src/config/win-pre.in +++ b/src/config/win-pre.in @@ -88,6 +88,11 @@ C=.^\ srcdir = . top_srcdir = $(srcdir)\$(BUILDTOP) +KRB5_USE_DNS=1 +KRB5_USE_DNS_KDC=1 +DNS_LIB=$(BUILDTOP)\util\wshelper\$(OUTPRE)$(DLIB).lib +DNS_INC=$(BUILDTOP)\util\wshelper + !if defined(KRB5_USE_DNS) || defined(KRB5_USE_DNS_KDC) || defined(KRB5_USE_DNS_REALMS) !if defined(KRB5_NO_WSHELPER) DNSMSG=resolver @@ -195,6 +200,7 @@ KLIB=$(BUILDTOP)\lib\$(OUTPRE)krb5_32.lib K4LIB=$(BUILDTOP)\lib\$(OUTPRE)krb4_32.lib SLIB=$(BUILDTOP)\lib\$(OUTPRE)k5sprt32.lib GLIB=$(BUILDTOP)\lib\$(OUTPRE)gssapi32.lib +DLIB=wshelp32 CCLIB=krbcc32 WLIB= @@ -205,6 +211,7 @@ KLIB=$(BUILDTOP)\lib\$(OUTPRE)krb5_64.lib K4LIB=$(BUILDTOP)\lib\$(OUTPRE)krb4_64.lib SLIB=$(BUILDTOP)\lib\$(OUTPRE)k5sprt64.lib GLIB=$(BUILDTOP)\lib\$(OUTPRE)gssapi64.lib +DLIB=wshelp64 CCLIB=krbcc64 WLIB= diff --git a/src/util/Makefile.in b/src/util/Makefile.in index 6c7f8a7ff..c791c0626 100644 --- a/src/util/Makefile.in +++ b/src/util/Makefile.in @@ -6,7 +6,7 @@ mydir=util SUBDIRS=support $(MAYBE_ET_@COM_ERR_VERSION@) $(MAYBE_SS_@SS_VERSION@) \ profile send-pr gss-kernel-lib $(MAYBE_VERTO_@VERTO_VERSION@) ##WIN32##!endif -WINSUBDIRS=windows support et profile +WINSUBDIRS=windows support et profile wshelper BUILDTOP=$(REL).. MAYBE_ET_k5 = et diff --git a/src/windows/wshelper/Makefile.in b/src/util/wshelper/Makefile.in similarity index 95% rename from src/windows/wshelper/Makefile.in rename to src/util/wshelper/Makefile.in index f573bf52e..3da2b5994 100644 --- a/src/windows/wshelper/Makefile.in +++ b/src/util/wshelper/Makefile.in @@ -61,4 +61,4 @@ $(OUTPRE)dllmain.$(OBJEXT): pwd.h $(OUTPRE)hespwnam.$(OBJEXT): pwd.h $(OUTPRE)dllmain.$(OBJEXT): wsh-int.h $(OUTPRE)res_init.$(OBJEXT): wsh-int.h -$(RESFILE): resource.rc ../version.rc ../kerberos.ver +$(RESFILE): resource.rc ../../windows/version.rc ../../windows/kerberos.ver diff --git a/src/windows/wshelper/dllmain.c b/src/util/wshelper/dllmain.c similarity index 100% rename from src/windows/wshelper/dllmain.c rename to src/util/wshelper/dllmain.c diff --git a/src/windows/wshelper/gethna.c b/src/util/wshelper/gethna.c similarity index 100% rename from src/windows/wshelper/gethna.c rename to src/util/wshelper/gethna.c diff --git a/src/windows/wshelper/hesiod.c b/src/util/wshelper/hesiod.c similarity index 100% rename from src/windows/wshelper/hesiod.c rename to src/util/wshelper/hesiod.c diff --git a/src/windows/wshelper/hesmailh.c b/src/util/wshelper/hesmailh.c similarity index 100% rename from src/windows/wshelper/hesmailh.c rename to src/util/wshelper/hesmailh.c diff --git a/src/windows/wshelper/hespwnam.c b/src/util/wshelper/hespwnam.c similarity index 100% rename from src/windows/wshelper/hespwnam.c rename to src/util/wshelper/hespwnam.c diff --git a/src/windows/wshelper/hesservb.c b/src/util/wshelper/hesservb.c similarity index 100% rename from src/windows/wshelper/hesservb.c rename to src/util/wshelper/hesservb.c diff --git a/src/windows/wshelper/inetaton.c b/src/util/wshelper/inetaton.c similarity index 100% rename from src/windows/wshelper/inetaton.c rename to src/util/wshelper/inetaton.c diff --git a/src/windows/wshelper/pwd.h b/src/util/wshelper/pwd.h similarity index 100% rename from src/windows/wshelper/pwd.h rename to src/util/wshelper/pwd.h diff --git a/src/windows/wshelper/res_comp.c b/src/util/wshelper/res_comp.c similarity index 100% rename from src/windows/wshelper/res_comp.c rename to src/util/wshelper/res_comp.c diff --git a/src/windows/wshelper/res_init.c b/src/util/wshelper/res_init.c similarity index 100% rename from src/windows/wshelper/res_init.c rename to src/util/wshelper/res_init.c diff --git a/src/windows/wshelper/res_quer.c b/src/util/wshelper/res_quer.c similarity index 100% rename from src/windows/wshelper/res_quer.c rename to src/util/wshelper/res_quer.c diff --git a/src/windows/wshelper/resource.h b/src/util/wshelper/resource.h similarity index 100% rename from src/windows/wshelper/resource.h rename to src/util/wshelper/resource.h diff --git a/src/windows/wshelper/resource.rc b/src/util/wshelper/resource.rc similarity index 94% rename from src/windows/wshelper/resource.rc rename to src/util/wshelper/resource.rc index a2d333284..3fb14771e 100644 --- a/src/windows/wshelper/resource.rc +++ b/src/util/wshelper/resource.rc @@ -40,7 +40,7 @@ END 3 TEXTINCLUDE DISCARDABLE BEGIN - "#include ""..\\version.rc""\r\n" + "#include ""..\\..\\windows\\version.rc""\r\n" "#include ""string.rc""\r\n" "\0" END @@ -57,7 +57,7 @@ END // // Generated from the TEXTINCLUDE 3 resource. // -#include "..\version.rc" +#include "..\..\windows\version.rc" #include "string.rc" ///////////////////////////////////////////////////////////////////////////// diff --git a/src/windows/wshelper/string.rc b/src/util/wshelper/string.rc similarity index 100% rename from src/windows/wshelper/string.rc rename to src/util/wshelper/string.rc diff --git a/src/windows/wshelper/ver.rc.inc b/src/util/wshelper/ver.rc.inc similarity index 100% rename from src/windows/wshelper/ver.rc.inc rename to src/util/wshelper/ver.rc.inc diff --git a/src/windows/wshelper/wsh-int.h b/src/util/wshelper/wsh-int.h similarity index 100% rename from src/windows/wshelper/wsh-int.h rename to src/util/wshelper/wsh-int.h diff --git a/src/windows/wshelper/wshelp32.def b/src/util/wshelper/wshelp32.def similarity index 100% rename from src/windows/wshelper/wshelp32.def rename to src/util/wshelper/wshelp32.def diff --git a/src/windows/wshelper/wshelp64.def b/src/util/wshelper/wshelp64.def similarity index 100% rename from src/windows/wshelper/wshelp64.def rename to src/util/wshelper/wshelp64.def diff --git a/src/windows/wshelper/wshelper.def b/src/util/wshelper/wshelper.def similarity index 100% rename from src/windows/wshelper/wshelper.def rename to src/util/wshelper/wshelper.def diff --git a/src/windows/Makefile.in b/src/windows/Makefile.in index 008cfa90f..ed3d1cffc 100644 --- a/src/windows/Makefile.in +++ b/src/windows/Makefile.in @@ -1,3 +1,3 @@ BUILDTOP=.. NO_OUTPRE=1 -SUBDIRS= wshelper lib leashdll cns gss gina ms2mit kfwlogon +SUBDIRS= lib leashdll cns gss gina ms2mit kfwlogon -- 2.26.2