diff options
| author | Danilo Almeida <dalmeida@mit.edu> | 1999-12-04 01:50:44 +0000 |
|---|---|---|
| committer | Danilo Almeida <dalmeida@mit.edu> | 1999-12-04 01:50:44 +0000 |
| commit | 780f69ec5044e8862041cfd94180922166b5460f (patch) | |
| tree | d1477b584c1c232cb46d71e2e26c9538380da49b /src/windows/cns | |
| parent | 2bd37be8b04977f8fc9bbdefffc1f2ebe89db1f7 (diff) | |
| download | krb5-780f69ec5044e8862041cfd94180922166b5460f.tar.gz krb5-780f69ec5044e8862041cfd94180922166b5460f.tar.xz krb5-780f69ec5044e8862041cfd94180922166b5460f.zip | |
Pull src/windows changes from krb5-1-1 branch
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@11936 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/windows/cns')
| -rw-r--r-- | src/windows/cns/ChangeLog | 9 | ||||
| -rw-r--r-- | src/windows/cns/Makefile.in | 10 | ||||
| -rw-r--r-- | src/windows/cns/cns_reg.c | 19 |
3 files changed, 26 insertions, 12 deletions
diff --git a/src/windows/cns/ChangeLog b/src/windows/cns/ChangeLog index 3d42fe7b75..f99c56a53a 100644 --- a/src/windows/cns/ChangeLog +++ b/src/windows/cns/ChangeLog @@ -1,3 +1,12 @@ +1999-12-03 Danilo Almeida <dalmeida@mit.edu> + + * Makefile.in: Windows fix for updated win-pre.in. + +1999-08-26 Danilo Almeida <dalmeida@mit.edu> + + * 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 <dalmeida@mit.edu> * Makefile.in: Add included version resouce script to diff --git a/src/windows/cns/Makefile.in b/src/windows/cns/Makefile.in index b584973c2b..095b46cba2 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 95a5a5f87f..400d72d235 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') { |