From 780f69ec5044e8862041cfd94180922166b5460f Mon Sep 17 00:00:00 2001 From: Danilo Almeida Date: Sat, 4 Dec 1999 01:50:44 +0000 Subject: [PATCH] Pull src/windows changes from krb5-1-1 branch git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@11936 dc483132-0cff-0310-8789-dd5450dbe970 --- src/windows/ChangeLog | 25 +++++++++++++++++++ src/windows/cns/ChangeLog | 9 +++++++ src/windows/cns/Makefile.in | 10 ++++---- src/windows/cns/cns_reg.c | 19 ++++++++------ src/windows/gina/ChangeLog | 4 +++ src/windows/gina/Makefile.in | 7 +++--- src/windows/gss/ChangeLog | 4 +++ src/windows/gss/Makefile.in | 7 ++---- src/windows/lib/ChangeLog | 4 +++ src/windows/lib/Makefile.in | 2 -- src/windows/mkbin.bat | 8 ------ src/windows/readme | 45 ---------------------------------- src/windows/version.rc | 6 ++--- src/windows/wintel/ChangeLog | 4 +++ src/windows/wintel/Makefile.in | 6 ++--- 15 files changed, 79 insertions(+), 81 deletions(-) delete mode 100644 src/windows/mkbin.bat delete mode 100644 src/windows/readme diff --git a/src/windows/ChangeLog b/src/windows/ChangeLog index 8e874b79c..e4051e389 100644 --- a/src/windows/ChangeLog +++ b/src/windows/ChangeLog @@ -1,3 +1,28 @@ +1999-12-03 Danilo Almeida + + * version.rc: Bump version up to 1.1.1. + +1999-09-15 Danilo Almeida + + * README: Add documentation about configuration under windows and + krbcc32.dll. + +1999-09-09 Danilo Almeida + + * README: Explicitly say that we support only Win32 and not Win16. + +1999-09-08 Danilo Almeida + + * README: Update with install target information and more. + * mkbin.bat: Remove mkbin.bat as it is no longer used. + +1999-09-01 Danilo Almeida + + * readme, README: readme renamed to README. + + * version.rc: Boost version to 1.1. Include 1998 & 1999 in copyright + years. + 1999-06-21 Danilo Almeida * version.rc: Boost version to 1.0.8. diff --git a/src/windows/cns/ChangeLog b/src/windows/cns/ChangeLog index 3d42fe7b7..f99c56a53 100644 --- a/src/windows/cns/ChangeLog +++ b/src/windows/cns/ChangeLog @@ -1,3 +1,12 @@ +1999-12-03 Danilo Almeida + + * Makefile.in: Windows fix for updated win-pre.in. + +1999-08-26 Danilo Almeida + + * cns_reg.c (cns_load_registry, cns_save_registry): Honor setting + in cns_res.cc_override. + Mon May 17 19:55:08 1999 Danilo Almeida * Makefile.in: Add included version resouce script to diff --git a/src/windows/cns/Makefile.in b/src/windows/cns/Makefile.in index b584973c2..095b46cba 100644 --- a/src/windows/cns/Makefile.in +++ b/src/windows/cns/Makefile.in @@ -15,30 +15,30 @@ KRB = KRB$(KVERSION) BUILDTOP = .. LIBDIR = $(BUILDTOP)\lib\krb KLIB = $(LIBDIR)\kerberos.lib -INCLUDES = /I$(BUILDTOP)\include RESFILE = $(OUTPRE)cnsres4.res XOBJS = $(RESFILE) +LOCALINCLUDES = /I$(BUILDTOP)\include !endif !if $(KVERSION) == 5 BUILDTOP =..\.. LIBDIR = $(BUILDTOP)\lib -INCLUDES = /I$(BUILDTOP)\include /I$(BUILDTOP)\include\krb5 RESFILE = $(OUTPRE)cnsres5.res XOBJS = $(RESFILE) $(OUTPRE)kpasswd.obj $(OUTPRE)cns_reg.obj +LOCALINCLUDES = /I$(BUILDTOP)\include /I$(BUILDTOP)\include\krb5 !endif ##### C Compiler #CC = cl !ifdef NODEBUG -CFLAGS = $(CCOPTS2) $(INCLUDES) /D$(KRB)=1 +DEFINES = /D$(KRB)=1 !else -CFLAGS = $(CCOPTS2) $(INCLUDES) /D$(KRB)=1 /DDEBUG +DEFINES = /D$(KRB)=1 /DDEBUG !endif ##### RC Compiler #RC = rc -RFLAGS = /D$(KRB)=1 $(INCLUDES) +RFLAGS = /D$(KRB)=1 $(LOCALINCLUDES) RCFLAGS = $(RFLAGS) -DKRB5_APP ##### CVSRES -- .res -> .obj converter diff --git a/src/windows/cns/cns_reg.c b/src/windows/cns/cns_reg.c index 95a5a5f87..400d72d23 100644 --- a/src/windows/cns/cns_reg.c +++ b/src/windows/cns/cns_reg.c @@ -135,7 +135,7 @@ cns_load_registry(void) } else strcpy(cns_res.confname, cns_res.def_confname); - if (registry_string_get(key, "ccname", &ts) == 0) { + if (cns_res.cc_override && (registry_string_get(key, "ccname", &ts) == 0)) { strcpy(cns_res.ccname, ts); free(ts); } else @@ -197,15 +197,20 @@ cns_save_registry(void) registry_string_set(key, "realm", cns_res.realm); if (cns_res.conf_override) - if (strcmp(cns_res.confname, cns_res.def_confname)) - registry_string_set(key, "confname", cns_res.confname); - else - registry_value_delete(key, "confname"); + { + if (strcmp(cns_res.confname, cns_res.def_confname)) + registry_string_set(key, "confname", cns_res.confname); + else + registry_value_delete(key, "confname"); + } - if (strcmp(cns_res.ccname, cns_res.def_ccname)) + if (cns_res.cc_override) + { + if (strcmp(cns_res.ccname, cns_res.def_ccname)) registry_string_set(key, "ccname", cns_res.ccname); - else + else registry_value_delete(key, "ccname"); + } for (i = 0 ; i < FILE_MENU_MAX_LOGINS ; i++) if (cns_res.logins[i][0] != '\0') { diff --git a/src/windows/gina/ChangeLog b/src/windows/gina/ChangeLog index 7ddbd838e..d2e378bbf 100644 --- a/src/windows/gina/ChangeLog +++ b/src/windows/gina/ChangeLog @@ -1,3 +1,7 @@ +1999-12-03 Danilo Almeida + + * Makefile.in: Windows fix for updated win-pre.in. + Mon May 17 14:24:25 1999 Danilo Almeida * Makefile.in: Reflect that we only build this under win32. diff --git a/src/windows/gina/Makefile.in b/src/windows/gina/Makefile.in index 5cd317376..6cdda3d8a 100644 --- a/src/windows/gina/Makefile.in +++ b/src/windows/gina/Makefile.in @@ -4,7 +4,7 @@ OBJS= $(OUTPRE)ginastub.$(OBJEXT) # Set NODEBUG if building release instead of debug -INCLUDES = -I$(BUILDTOP)\include +LOCALINCLUDES = -I$(BUILDTOP)\include WINLIBS = advapi32.lib comctl32.lib \ libc.lib kernel32.lib wsock32.lib user32.lib shell32.lib oldnames.lib @@ -12,10 +12,11 @@ WINLIBS = advapi32.lib comctl32.lib \ WINDLLFLAGS = /nodefaultlib /incremental:no /release \ /nologo /base:0x1c000000 /dll $(LOPTS) +DEFINES = -DUNICODE -D_UNICODE !ifdef NODEBUG -CFLAGS = $(CCOPTS2) $(INCLUDES) -DUNICODE -D_UNICODE +DEFINES = $(DEFINES) !else -CFLAGS = $(CCOPTS2) $(INCLUDES) -DUNICODE -D_UNICODE -DDBG +DEFINES = $(DEFINES) -DDBG !endif all-windows:: diff --git a/src/windows/gss/ChangeLog b/src/windows/gss/ChangeLog index 7ce6319a3..e192111b0 100644 --- a/src/windows/gss/ChangeLog +++ b/src/windows/gss/ChangeLog @@ -1,3 +1,7 @@ +1999-12-03 Danilo Almeida + + * Makefile.in: * Makefile.in: Windows fix for updated win-pre.in. + Mon May 17 19:53:58 1999 Danilo Almeida * Makefile.in: Add included version resouce script to diff --git a/src/windows/gss/Makefile.in b/src/windows/gss/Makefile.in index fcfee6cc7..306f7c79a 100644 --- a/src/windows/gss/Makefile.in +++ b/src/windows/gss/Makefile.in @@ -8,13 +8,10 @@ XOBJS = $(RESFILE) ##### Options # Set NODEBUG if building release instead of debug BUILDTOP=..\.. -INCLUDES= /I$(BUILDTOP)\include /I$(BUILDTOP)\include\krb5 - -##### C Compiler -CFLAGS = $(CCOPTS2) $(INCLUDES) +LOCALINCLUDES= /I$(BUILDTOP)\include /I$(BUILDTOP)\include\krb5 ##### RC Compiler -RFLAGS = $(INCLUDES) +RFLAGS = $(LOCALINCLUDES) RCFLAGS = $(RFLAGS) -D_WIN32 -DGSS_APP ##### Linker diff --git a/src/windows/lib/ChangeLog b/src/windows/lib/ChangeLog index d6e2395e6..25f20f41d 100644 --- a/src/windows/lib/ChangeLog +++ b/src/windows/lib/ChangeLog @@ -1,3 +1,7 @@ +1999-12-03 Danilo Almeida + + * Makefile.in: Fix of build flags with updated win-pre.in. + Mon May 17 14:26:27 1999 Danilo Almeida * Makefile.in: Uncomment BUILDTOP since we always want it. diff --git a/src/windows/lib/Makefile.in b/src/windows/lib/Makefile.in index ba95a9dcd..c911de701 100644 --- a/src/windows/lib/Makefile.in +++ b/src/windows/lib/Makefile.in @@ -1,5 +1,3 @@ -CFLAGS = $(CCOPTS2) $(DEFS) - BUILDTOP = ..\.. lib-windows: $(OUTPRE)libwin.lib diff --git a/src/windows/mkbin.bat b/src/windows/mkbin.bat deleted file mode 100644 index 889debdd7..000000000 --- a/src/windows/mkbin.bat +++ /dev/null @@ -1,8 +0,0 @@ -mkdir kbin -copy lib\*.dll kbin -copy windows\cns\krb5.exe kbin -copy windows\wintel\telnet.exe kbin -copy windows\gss\gss.exe kbin -copy clients\klist\klist.exe kbin -copy clients\kinit\kinit.exe kbin -copy clients\kdestroy\kdestroy.exe kbin diff --git a/src/windows/readme b/src/windows/readme deleted file mode 100644 index 0bcedafe3..000000000 --- a/src/windows/readme +++ /dev/null @@ -1,45 +0,0 @@ -Building Windows Kerberos 5 - -We build Kerberos 5 on Windows just with MSVC++ 6.0. You should -not need anything else. We do not know whether it currently -builds with other compilers or make utilities. - -There are two basic methods for making the Windows version of Kerberos -5. The traditional method involves starting on a Unix machine and -creating a distribution that can be built on Windows. The second -method works from the sources that come from the CVS tree if you have -certain Unix-type utilities. - -Traditional Method: ------------------- - -On the Unix side -1) cd xxx/src # Go to where the source lives -2) make -f Makefile.in kerbsrc.zip # Do some Unix-side configuring - # ...and create kerbsrc.zip -3) - - -On the PC side -1) md \k5 # Create where we'll put the tree -2) cd \k5 -3) unzip kerbsrc.zip - - or - - pkunzip -d kerbsrc.zip -4) nmake -nologo # Build the sources -5) nmake mkbin # Place binaries generated by the - # ...build in the kbin directory -6) - - -All-Windows Method: ------------------- - -First, make sure you have sed, gawk, cat, and cp. - -1) cd xxx/src # Go to where the source lives -2) nmake -f Makefile.in prep-windows # Create Makefile for Windows -3) nmake -nologo # Build the sources -4) nmake mkbin # Place binaries generated by the - # ...build in the kbin directory diff --git a/src/windows/version.rc b/src/windows/version.rc index 6a6896f1f..67660fc42 100644 --- a/src/windows/version.rc +++ b/src/windows/version.rc @@ -13,10 +13,10 @@ /* we're going to stamp all the DLLs with the same version number */ -#define K5_PRODUCT_VERSION_STRING "1.0.8\0" -#define K5_PRODUCT_VERSION 1, 0, 8, 0 +#define K5_PRODUCT_VERSION_STRING "1.1.1\0" +#define K5_PRODUCT_VERSION 1, 1, 1, 0 -#define K5_COPYRIGHT "Copyright (C) 1997 by the Massachusetts Institute of Technology\0" +#define K5_COPYRIGHT "Copyright (C) 1997-1999 by the Massachusetts Institute of Technology\0" #define K5_COMPANY_NAME "Massachusetts Institute of Technology.\0" /* diff --git a/src/windows/wintel/ChangeLog b/src/windows/wintel/ChangeLog index 1bb010591..a9d690090 100644 --- a/src/windows/wintel/ChangeLog +++ b/src/windows/wintel/ChangeLog @@ -1,3 +1,7 @@ +1999-12-03 Danilo Almeida + + * Makefile.in: Windows fix for updated win-pre.in. + Mon May 17 19:54:51 1999 Danilo Almeida * Makefile.in: Add included version resouce script to diff --git a/src/windows/wintel/Makefile.in b/src/windows/wintel/Makefile.in index 6abad615c..56cddb188 100644 --- a/src/windows/wintel/Makefile.in +++ b/src/windows/wintel/Makefile.in @@ -15,13 +15,13 @@ KVERSION= 5 KRB = KRB$(KVERSION) BUILDTOP=..\.. -INCLUDES= /I$(BUILDTOP)\include /I$(BUILDTOP)\include\krb5 \ +LOCALINCLUDES= /I$(BUILDTOP)\include /I$(BUILDTOP)\include\krb5 \ /I$(BUILDTOP)\lib\crypto\des RESFILE = $(OUTPRE)telnet.res XOBJS = $(RESFILE) $(OUTPRE)k5stream.obj $(OUTPRE)enc_des.obj -CFLAGS = $(CCOPTS2) $(INCLUDES) /D$(KRB)=1 $(KRBOPT) -RFLAGS = $(INCLUDES) +DEFINES = /D$(KRB)=1 $(KRBOPT) +RFLAGS = $(LOCALINCLUDES) RCFLAGS = $(RFLAGS) -D_WIN32 -DTELNET_APP ##### Linker -- 2.26.2