summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.in9
-rw-r--r--src/config/win-pre.in7
-rw-r--r--src/util/Makefile.in2
-rw-r--r--src/util/wshelper/Makefile.in (renamed from src/windows/wshelper/Makefile.in)2
-rw-r--r--src/util/wshelper/dllmain.c (renamed from src/windows/wshelper/dllmain.c)0
-rw-r--r--src/util/wshelper/gethna.c (renamed from src/windows/wshelper/gethna.c)0
-rw-r--r--src/util/wshelper/hesiod.c (renamed from src/windows/wshelper/hesiod.c)0
-rw-r--r--src/util/wshelper/hesmailh.c (renamed from src/windows/wshelper/hesmailh.c)0
-rw-r--r--src/util/wshelper/hespwnam.c (renamed from src/windows/wshelper/hespwnam.c)0
-rw-r--r--src/util/wshelper/hesservb.c (renamed from src/windows/wshelper/hesservb.c)0
-rw-r--r--src/util/wshelper/inetaton.c (renamed from src/windows/wshelper/inetaton.c)0
-rw-r--r--src/util/wshelper/pwd.h (renamed from src/windows/wshelper/pwd.h)0
-rw-r--r--src/util/wshelper/res_comp.c (renamed from src/windows/wshelper/res_comp.c)0
-rw-r--r--src/util/wshelper/res_init.c (renamed from src/windows/wshelper/res_init.c)0
-rw-r--r--src/util/wshelper/res_quer.c (renamed from src/windows/wshelper/res_quer.c)0
-rw-r--r--src/util/wshelper/resource.h (renamed from src/windows/wshelper/resource.h)0
-rw-r--r--src/util/wshelper/resource.rc (renamed from src/windows/wshelper/resource.rc)4
-rw-r--r--src/util/wshelper/string.rc (renamed from src/windows/wshelper/string.rc)0
-rw-r--r--src/util/wshelper/ver.rc.inc (renamed from src/windows/wshelper/ver.rc.inc)0
-rw-r--r--src/util/wshelper/wsh-int.h (renamed from src/windows/wshelper/wsh-int.h)0
-rw-r--r--src/util/wshelper/wshelp32.def (renamed from src/windows/wshelper/wshelp32.def)0
-rw-r--r--src/util/wshelper/wshelp64.def (renamed from src/windows/wshelper/wshelp64.def)0
-rw-r--r--src/util/wshelper/wshelper.def (renamed from src/windows/wshelper/wshelper.def)0
-rw-r--r--src/windows/Makefile.in2
24 files changed, 18 insertions, 8 deletions
diff --git a/src/Makefile.in b/src/Makefile.in
index 56b3d45448..4be7d0d0c2 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 dc68573a8c..bcef2f4b82 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 6c7f8a7ff0..c791c0626a 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
index f573bf52e7..3da2b5994f 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
index 5ae0016e69..5ae0016e69 100644
--- a/src/windows/wshelper/dllmain.c
+++ b/src/util/wshelper/dllmain.c
diff --git a/src/windows/wshelper/gethna.c b/src/util/wshelper/gethna.c
index 8914c32704..8914c32704 100644
--- a/src/windows/wshelper/gethna.c
+++ b/src/util/wshelper/gethna.c
diff --git a/src/windows/wshelper/hesiod.c b/src/util/wshelper/hesiod.c
index b448849cfd..b448849cfd 100644
--- a/src/windows/wshelper/hesiod.c
+++ b/src/util/wshelper/hesiod.c
diff --git a/src/windows/wshelper/hesmailh.c b/src/util/wshelper/hesmailh.c
index 32791e8d6f..32791e8d6f 100644
--- a/src/windows/wshelper/hesmailh.c
+++ b/src/util/wshelper/hesmailh.c
diff --git a/src/windows/wshelper/hespwnam.c b/src/util/wshelper/hespwnam.c
index 55ddf01c1b..55ddf01c1b 100644
--- a/src/windows/wshelper/hespwnam.c
+++ b/src/util/wshelper/hespwnam.c
diff --git a/src/windows/wshelper/hesservb.c b/src/util/wshelper/hesservb.c
index 01db3a4bf0..01db3a4bf0 100644
--- a/src/windows/wshelper/hesservb.c
+++ b/src/util/wshelper/hesservb.c
diff --git a/src/windows/wshelper/inetaton.c b/src/util/wshelper/inetaton.c
index bc7bd09a0e..bc7bd09a0e 100644
--- a/src/windows/wshelper/inetaton.c
+++ b/src/util/wshelper/inetaton.c
diff --git a/src/windows/wshelper/pwd.h b/src/util/wshelper/pwd.h
index 6954fd77d1..6954fd77d1 100644
--- a/src/windows/wshelper/pwd.h
+++ b/src/util/wshelper/pwd.h
diff --git a/src/windows/wshelper/res_comp.c b/src/util/wshelper/res_comp.c
index 36cd77372a..36cd77372a 100644
--- a/src/windows/wshelper/res_comp.c
+++ b/src/util/wshelper/res_comp.c
diff --git a/src/windows/wshelper/res_init.c b/src/util/wshelper/res_init.c
index bf3d97b509..bf3d97b509 100644
--- a/src/windows/wshelper/res_init.c
+++ b/src/util/wshelper/res_init.c
diff --git a/src/windows/wshelper/res_quer.c b/src/util/wshelper/res_quer.c
index 7836ed9215..7836ed9215 100644
--- a/src/windows/wshelper/res_quer.c
+++ b/src/util/wshelper/res_quer.c
diff --git a/src/windows/wshelper/resource.h b/src/util/wshelper/resource.h
index cc5f082ffe..cc5f082ffe 100644
--- a/src/windows/wshelper/resource.h
+++ b/src/util/wshelper/resource.h
diff --git a/src/windows/wshelper/resource.rc b/src/util/wshelper/resource.rc
index a2d3332847..3fb14771e7 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
index 6916dbc72e..6916dbc72e 100644
--- a/src/windows/wshelper/string.rc
+++ b/src/util/wshelper/string.rc
diff --git a/src/windows/wshelper/ver.rc.inc b/src/util/wshelper/ver.rc.inc
index f927fb195b..f927fb195b 100644
--- a/src/windows/wshelper/ver.rc.inc
+++ b/src/util/wshelper/ver.rc.inc
diff --git a/src/windows/wshelper/wsh-int.h b/src/util/wshelper/wsh-int.h
index 04b1cfe570..04b1cfe570 100644
--- a/src/windows/wshelper/wsh-int.h
+++ b/src/util/wshelper/wsh-int.h
diff --git a/src/windows/wshelper/wshelp32.def b/src/util/wshelper/wshelp32.def
index b0a5aeaaff..b0a5aeaaff 100644
--- a/src/windows/wshelper/wshelp32.def
+++ b/src/util/wshelper/wshelp32.def
diff --git a/src/windows/wshelper/wshelp64.def b/src/util/wshelper/wshelp64.def
index e28dd16cfc..e28dd16cfc 100644
--- a/src/windows/wshelper/wshelp64.def
+++ b/src/util/wshelper/wshelp64.def
diff --git a/src/windows/wshelper/wshelper.def b/src/util/wshelper/wshelper.def
index 5b67a3d602..5b67a3d602 100644
--- a/src/windows/wshelper/wshelper.def
+++ b/src/util/wshelper/wshelper.def
diff --git a/src/windows/Makefile.in b/src/windows/Makefile.in
index 008cfa90f9..ed3d1cffcd 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
generated by cgit (git 2.34.1) at 2024-06-18 11:55:21 +0000