From 5e5a87555b0bb24ff12bfade11e8fed1b3dea39b Mon Sep 17 00:00:00 2001 From: "Asanka C. Herath" Date: Wed, 24 Nov 2010 12:59:37 -0500 Subject: [PATCH] Windows: Catch up with libheimntlm changes --- lib/ntlm/NTMakefile | 12 +++++++++--- lib/ntlm/libheimntlm-exports.def | 3 +++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/lib/ntlm/NTMakefile b/lib/ntlm/NTMakefile index f262b4cae..40ed64449 100644 --- a/lib/ntlm/NTMakefile +++ b/lib/ntlm/NTMakefile @@ -35,20 +35,26 @@ RELDIR=lib\ntlm INCFILES= \ $(INCDIR)\heimntlm.h \ - $(INCDIR)\heimntlm-protos.h + $(INCDIR)\heimntlm-protos.h \ + $(INCDIR)\ntlm_err.h libheimntlm_la_SOURCES = ntlm.c heimntlm.h $(OBJ)\heimntlm-protos.h: $(libheimntlm_la_SOURCES) $(PERL) ../../cf/make-proto.pl -q -P remove -o $(OBJ)\heimntlm-protos.h $(libheimntlm_la_SOURCES) +$(OBJ)\ntlm_err.c $(OBJ)\ntlm_err.h: ntlm_err.et + cd $(OBJ) + $(BINDIR)\compile_et.exe $(SRCDIR)\ntlm_err.et + cd $(SRCDIR) + !ifndef STATICLIBS RES=$(OBJ)\libheimntlm-version.res $(LIBHEIMNTLM): $(BINDIR)\heimntlm.dll -$(BINDIR)\heimntlm.dll: $(OBJ)\ntlm.obj $(LIBHEIMDAL) $(RES) +$(BINDIR)\heimntlm.dll: $(OBJ)\ntlm.obj $(OBJ)\ntlm_err.obj $(LIBHEIMDAL) $(LIBROKEN) $(LIBCOMERR) $(RES) $(DLLGUILINK) -def:libheimntlm-exports.def -implib:$(LIBHEIMNTLM) $(DLLPREP_NODIST) @@ -57,7 +63,7 @@ clean:: !else -$(LIBHEIMNTLM): $(OBJ)\ntlm.obj +$(LIBHEIMNTLM): $(OBJ)\ntlm.obj $(OBJ)\ntlm_err.obj $(LIBCON) !endif diff --git a/lib/ntlm/libheimntlm-exports.def b/lib/ntlm/libheimntlm-exports.def index ce812e0e6..33ac09e70 100644 --- a/lib/ntlm/libheimntlm-exports.def +++ b/lib/ntlm/libheimntlm-exports.def @@ -1,5 +1,6 @@ EXPORTS heim_ntlm_build_ntlm1_master + heim_ntlm_calculate_lm2 heim_ntlm_calculate_ntlm1 heim_ntlm_calculate_ntlm2 heim_ntlm_calculate_ntlm2_sess @@ -19,3 +20,5 @@ EXPORTS heim_ntlm_nt_key heim_ntlm_ntlmv2_key heim_ntlm_verify_ntlm2 + heim_ntlm_unparse_flags + initialize_ntlm_error_table_r