From cdcdc5cad5fcbf7fb711852e382b639089d44f14 Mon Sep 17 00:00:00 2001 From: Asanka Herath Date: Thu, 10 Jun 2010 16:42:39 -0400 Subject: [PATCH] Windows: Version information for binaries --- admin/NTMakefile | 2 +- .../ktutil-version.rc | 20 ++++---- kadmin/NTMakefile | 6 ++- .../kadmin-version.rc | 20 ++++---- .../kadmind-version.rc | 20 ++++---- kdc/NTMakefile | 16 ++++--- .../libcom_err-version.rc => kdc/hprop-version.rc | 20 ++++---- .../libcom_err-version.rc => kdc/hpropd-version.rc | 20 ++++---- .../libcom_err-version.rc => kdc/kdc-version.rc | 20 ++++---- .../libcom_err-version.rc => kdc/kstash-version.rc | 20 ++++---- .../libcom_err-version.rc => kdc/libkdc-version.rc | 18 +++---- .../string2key-version.rc | 20 ++++---- kuser/NTMakefile | 14 +++--- .../kdestroy-version.rc | 20 ++++---- .../kdigest-version.rc | 20 ++++---- .../kgetcred-version.rc | 20 ++++---- .../kimpersonate-version.rc | 20 ++++---- .../kinit-version.rc | 20 ++++---- .../klist-version.rc | 20 ++++---- .../kswitch-version.rc | 20 ++++---- lib/asn1/NTMakefile | 3 +- .../asn1_compile-version.rc} | 18 +++---- lib/com_err/NTMakefile | 2 +- ...libcom_err-version.rc => compile_et-version.rc} | 18 +++---- lib/com_err/libcom_err-version.rc | 12 ++--- lib/gssapi/NTMakefile | 6 ++- .../libgssapi-version.rc} | 16 +++---- lib/hdb/NTMakefile | 4 +- .../libhdb-version.rc} | 16 +++---- lib/heimdal/NTMakefile | 6 ++- .../libcom_err-version.rc => heimdal/dllmain.c} | 12 +++-- .../heimdal-version.rc} | 16 +++---- lib/hx509/NTMakefile | 2 +- .../hxtool-version.rc} | 18 +++---- lib/kadm5/NTMakefile | 13 +++-- .../iprop-log-version.rc} | 18 +++---- .../ipropd-master-version.rc} | 18 +++---- .../ipropd-slave-version.rc} | 18 +++---- .../libkadm5srv-version.rc} | 16 +++---- lib/krb5/NTMakefile | 2 +- .../verify_krb5_conf-version.rc} | 18 +++---- lib/ntlm/NTMakefile | 4 +- .../libheimntlm-version.rc} | 16 +++---- windows/version.rc | 56 +++++++++++++++++++--- 44 files changed, 376 insertions(+), 308 deletions(-) copy lib/com_err/libcom_err-version.rc => admin/ktutil-version.rc (87%) copy lib/com_err/libcom_err-version.rc => kadmin/kadmin-version.rc (87%) copy lib/com_err/libcom_err-version.rc => kadmin/kadmind-version.rc (86%) copy lib/com_err/libcom_err-version.rc => kdc/hprop-version.rc (87%) copy lib/com_err/libcom_err-version.rc => kdc/hpropd-version.rc (86%) copy lib/com_err/libcom_err-version.rc => kdc/kdc-version.rc (87%) copy lib/com_err/libcom_err-version.rc => kdc/kstash-version.rc (87%) copy lib/com_err/libcom_err-version.rc => kdc/libkdc-version.rc (89%) copy lib/com_err/libcom_err-version.rc => kdc/string2key-version.rc (87%) copy lib/com_err/libcom_err-version.rc => kuser/kdestroy-version.rc (87%) copy lib/com_err/libcom_err-version.rc => kuser/kdigest-version.rc (87%) copy lib/com_err/libcom_err-version.rc => kuser/kgetcred-version.rc (86%) copy lib/com_err/libcom_err-version.rc => kuser/kimpersonate-version.rc (86%) copy lib/com_err/libcom_err-version.rc => kuser/kinit-version.rc (86%) copy lib/com_err/libcom_err-version.rc => kuser/klist-version.rc (87%) copy lib/com_err/libcom_err-version.rc => kuser/kswitch-version.rc (86%) copy lib/{com_err/libcom_err-version.rc => asn1/asn1_compile-version.rc} (89%) copy lib/com_err/{libcom_err-version.rc => compile_et-version.rc} (89%) copy lib/{com_err/libcom_err-version.rc => gssapi/libgssapi-version.rc} (88%) copy lib/{com_err/libcom_err-version.rc => hdb/libhdb-version.rc} (91%) copy lib/{com_err/libcom_err-version.rc => heimdal/dllmain.c} (91%) copy lib/{com_err/libcom_err-version.rc => heimdal/heimdal-version.rc} (90%) copy lib/{com_err/libcom_err-version.rc => hx509/hxtool-version.rc} (88%) copy lib/{com_err/libcom_err-version.rc => kadm5/iprop-log-version.rc} (89%) copy lib/{com_err/libcom_err-version.rc => kadm5/ipropd-master-version.rc} (89%) copy lib/{com_err/libcom_err-version.rc => kadm5/ipropd-slave-version.rc} (89%) copy lib/{com_err/libcom_err-version.rc => kadm5/libkadm5srv-version.rc} (89%) copy lib/{com_err/libcom_err-version.rc => krb5/verify_krb5_conf-version.rc} (88%) copy lib/{com_err/libcom_err-version.rc => ntlm/libheimntlm-version.rc} (90%) diff --git a/admin/NTMakefile b/admin/NTMakefile index 580d1ab6a..e45a5e75f 100644 --- a/admin/NTMakefile +++ b/admin/NTMakefile @@ -55,7 +55,7 @@ KTUTIL_LIBS= \ $(LIBROKEN) \ $(LIBVERS) -$(SBINDIR)\ktutil.exe: $(KTUTIL_OBJS) $(KTUTIL_LIBS) +$(SBINDIR)\ktutil.exe: $(KTUTIL_OBJS) $(KTUTIL_LIBS) $(OBJ)\ktutil-version.res $(EXECONLINK) $(EXEPREP) diff --git a/lib/com_err/libcom_err-version.rc b/admin/ktutil-version.rc similarity index 87% copy from lib/com_err/libcom_err-version.rc copy to admin/ktutil-version.rc index 5f38c1f7c..e0e91c5ce 100644 --- a/lib/com_err/libcom_err-version.rc +++ b/admin/ktutil-version.rc @@ -1,19 +1,19 @@ /*********************************************************************** - * Copyright (c) 2009, Secure Endpoints Inc. + * Copyright (c) 2010, Secure Endpoints Inc. * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * + * * - Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. - * + * * - Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS @@ -26,11 +26,11 @@ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED * OF THE POSSIBILITY OF SUCH DAMAGE. - * + * **********************************************************************/ -#define RC_FILE_TYPE VFT_DLL -#define RC_FILE_COMMENT_0409 "Some comment" -#define RC_FILE_ORIG_0409 "com_err.dll" +#define RC_FILE_TYPE VFT_APP +#define RC_FILE_DESC_0409 "Kerberos Keytab Tool" +#define RC_FILE_ORIG_0409 "ktutil.exe" -#include "../../windows/version.rc" +#include "../windows/version.rc" diff --git a/kadmin/NTMakefile b/kadmin/NTMakefile index 91cfef845..f20592362 100644 --- a/kadmin/NTMakefile +++ b/kadmin/NTMakefile @@ -64,7 +64,8 @@ KADMIN_OBJS= \ $(OBJ)\util.obj \ $(OBJ)\pw_quality.obj \ $(OBJ)\random_password.obj \ - $(OBJ)\kadmin-commands.obj + $(OBJ)\kadmin-commands.obj \ + $(OBJ)\kadmin-version.res KADMIN_LIBS= \ $(LIBKADM5CLNT) \ @@ -90,7 +91,8 @@ KADMIND_OBJS= \ $(OBJ)\rpc.obj \ $(OBJ)\server.obj \ $(OBJ)\kadmind.obj \ - $(OBJ)\kadm_conn.obj + $(OBJ)\kadm_conn.obj \ + $(OBJ)\kadmind-version.res KADMIND_LIBS=\ $(LIBKADM5SRV) \ diff --git a/lib/com_err/libcom_err-version.rc b/kadmin/kadmin-version.rc similarity index 87% copy from lib/com_err/libcom_err-version.rc copy to kadmin/kadmin-version.rc index 5f38c1f7c..d04058864 100644 --- a/lib/com_err/libcom_err-version.rc +++ b/kadmin/kadmin-version.rc @@ -1,19 +1,19 @@ /*********************************************************************** - * Copyright (c) 2009, Secure Endpoints Inc. + * Copyright (c) 2010, Secure Endpoints Inc. * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * + * * - Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. - * + * * - Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS @@ -26,11 +26,11 @@ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED * OF THE POSSIBILITY OF SUCH DAMAGE. - * + * **********************************************************************/ -#define RC_FILE_TYPE VFT_DLL -#define RC_FILE_COMMENT_0409 "Some comment" -#define RC_FILE_ORIG_0409 "com_err.dll" +#define RC_FILE_TYPE VFT_APP +#define RC_FILE_DESC_0409 "Kerberos Administration Tool" +#define RC_FILE_ORIG_0409 "kadmin.exe" -#include "../../windows/version.rc" +#include "../windows/version.rc" diff --git a/lib/com_err/libcom_err-version.rc b/kadmin/kadmind-version.rc similarity index 86% copy from lib/com_err/libcom_err-version.rc copy to kadmin/kadmind-version.rc index 5f38c1f7c..090bc816d 100644 --- a/lib/com_err/libcom_err-version.rc +++ b/kadmin/kadmind-version.rc @@ -1,19 +1,19 @@ /*********************************************************************** - * Copyright (c) 2009, Secure Endpoints Inc. + * Copyright (c) 2010, Secure Endpoints Inc. * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * + * * - Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. - * + * * - Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS @@ -26,11 +26,11 @@ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED * OF THE POSSIBILITY OF SUCH DAMAGE. - * + * **********************************************************************/ -#define RC_FILE_TYPE VFT_DLL -#define RC_FILE_COMMENT_0409 "Some comment" -#define RC_FILE_ORIG_0409 "com_err.dll" +#define RC_FILE_TYPE VFT_APP +#define RC_FILE_DESC_0409 "Kerberos Administration Server" +#define RC_FILE_ORIG_0409 "kadmind.exe" -#include "../../windows/version.rc" +#include "../windows/version.rc" diff --git a/kdc/NTMakefile b/kdc/NTMakefile index dc74455be..f9ee92b56 100644 --- a/kdc/NTMakefile +++ b/kdc/NTMakefile @@ -63,7 +63,7 @@ BIN_LIBS=\ $(LIBROKEN) \ $(LIBVERS) -$(LIBEXECDIR)\hprop.exe: $(OBJ)\hprop.obj $(OBJ)\mit_dump.obj $(BIN_LIBS) +$(LIBEXECDIR)\hprop.exe: $(OBJ)\hprop.obj $(OBJ)\mit_dump.obj $(BIN_LIBS) $(OBJ)\hprop-version.res $(EXECONLINK) $(EXEPREP) @@ -72,15 +72,15 @@ $(LIBEXECDIR)\hprop.exe: $(OBJ)\v4_dump.obj !endif -$(LIBEXECDIR)\hpropd.exe: $(OBJ)\hpropd.obj $(BIN_LIBS) +$(LIBEXECDIR)\hpropd.exe: $(OBJ)\hpropd.obj $(BIN_LIBS) $(OBJ)\hpropd-version.res $(EXECONLINK) $(EXEPREP) -$(SBINDIR)\kstash.exe: $(OBJ)\kstash.obj $(BIN_LIBS) +$(SBINDIR)\kstash.exe: $(OBJ)\kstash.obj $(BIN_LIBS) $(OBJ)\kstash-version.res $(EXECONLINK) $(EXEPREP) -$(BINDIR)\string2key.exe: $(OBJ)\string2key.obj $(BIN_LIBS) +$(BINDIR)\string2key.exe: $(OBJ)\string2key.obj $(BIN_LIBS) $(OBJ)\string2key-version.res $(EXECONLINK) $(EXEPREP) @@ -89,7 +89,9 @@ $(BINDIR)\digest-service.exe: $(OBJ)\digest-service.obj $(BIN_LIBS) $(EXEPREP) $(LIBEXECDIR)\kdc.exe: \ -$(OBJ)\connect.obj $(OBJ)\config.obj $(OBJ)\announce.obj $(OBJ)\main.obj $(LIBKDC) $(BIN_LIBS) + $(OBJ)\connect.obj $(OBJ)\config.obj $(OBJ)\announce.obj \ + $(OBJ)\main.obj $(OBJ)\kdc-version.res \ + $(LIBKDC) $(BIN_LIBS) $(EXECONLINK) $(EXEPREP) @@ -119,7 +121,9 @@ LIBKDC_LIBS=\ $(LIBHEIMNTLM) \ $(LIBROKEN) -$(LIBEXECDIR)\libkdc.dll: $(LIBKDC_OBJS) $(LIBKDC_LIBS) +LIBKDCRES=$(OBJ)\libkdc-version.res + +$(LIBEXECDIR)\libkdc.dll: $(LIBKDC_OBJS) $(LIBKDC_LIBS) $(LIBKDCRES) $(DLLGUILINK) -implib:$(LIBKDC) -def:libkdc-exports.def $(DLLPREP) diff --git a/lib/com_err/libcom_err-version.rc b/kdc/hprop-version.rc similarity index 87% copy from lib/com_err/libcom_err-version.rc copy to kdc/hprop-version.rc index 5f38c1f7c..1e782f5d7 100644 --- a/lib/com_err/libcom_err-version.rc +++ b/kdc/hprop-version.rc @@ -1,19 +1,19 @@ /*********************************************************************** - * Copyright (c) 2009, Secure Endpoints Inc. + * Copyright (c) 2010, Secure Endpoints Inc. * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * + * * - Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. - * + * * - Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS @@ -26,11 +26,11 @@ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED * OF THE POSSIBILITY OF SUCH DAMAGE. - * + * **********************************************************************/ -#define RC_FILE_TYPE VFT_DLL -#define RC_FILE_COMMENT_0409 "Some comment" -#define RC_FILE_ORIG_0409 "com_err.dll" +#define RC_FILE_TYPE VFT_APP +#define RC_FILE_DESC_0409 "KDC Database Propagation Tool" +#define RC_FILE_ORIG_0409 "hprop.exe" -#include "../../windows/version.rc" +#include "../windows/version.rc" diff --git a/lib/com_err/libcom_err-version.rc b/kdc/hpropd-version.rc similarity index 86% copy from lib/com_err/libcom_err-version.rc copy to kdc/hpropd-version.rc index 5f38c1f7c..388d64d92 100644 --- a/lib/com_err/libcom_err-version.rc +++ b/kdc/hpropd-version.rc @@ -1,19 +1,19 @@ /*********************************************************************** - * Copyright (c) 2009, Secure Endpoints Inc. + * Copyright (c) 2010, Secure Endpoints Inc. * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * + * * - Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. - * + * * - Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS @@ -26,11 +26,11 @@ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED * OF THE POSSIBILITY OF SUCH DAMAGE. - * + * **********************************************************************/ -#define RC_FILE_TYPE VFT_DLL -#define RC_FILE_COMMENT_0409 "Some comment" -#define RC_FILE_ORIG_0409 "com_err.dll" +#define RC_FILE_TYPE VFT_APP +#define RC_FILE_DESC_0409 "Propagated KDC database recipient" +#define RC_FILE_ORIG_0409 "hpropd.exe" -#include "../../windows/version.rc" +#include "../windows/version.rc" diff --git a/lib/com_err/libcom_err-version.rc b/kdc/kdc-version.rc similarity index 87% copy from lib/com_err/libcom_err-version.rc copy to kdc/kdc-version.rc index 5f38c1f7c..662aff475 100644 --- a/lib/com_err/libcom_err-version.rc +++ b/kdc/kdc-version.rc @@ -1,19 +1,19 @@ /*********************************************************************** - * Copyright (c) 2009, Secure Endpoints Inc. + * Copyright (c) 2010, Secure Endpoints Inc. * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * + * * - Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. - * + * * - Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS @@ -26,11 +26,11 @@ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED * OF THE POSSIBILITY OF SUCH DAMAGE. - * + * **********************************************************************/ -#define RC_FILE_TYPE VFT_DLL -#define RC_FILE_COMMENT_0409 "Some comment" -#define RC_FILE_ORIG_0409 "com_err.dll" +#define RC_FILE_TYPE VFT_APP +#define RC_FILE_DESC_0409 "Heimdal Kerberos v5 Server" +#define RC_FILE_ORIG_0409 "kdc.exe" -#include "../../windows/version.rc" +#include "../windows/version.rc" diff --git a/lib/com_err/libcom_err-version.rc b/kdc/kstash-version.rc similarity index 87% copy from lib/com_err/libcom_err-version.rc copy to kdc/kstash-version.rc index 5f38c1f7c..c3d221466 100644 --- a/lib/com_err/libcom_err-version.rc +++ b/kdc/kstash-version.rc @@ -1,19 +1,19 @@ /*********************************************************************** - * Copyright (c) 2009, Secure Endpoints Inc. + * Copyright (c) 2010, Secure Endpoints Inc. * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * + * * - Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. - * + * * - Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS @@ -26,11 +26,11 @@ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED * OF THE POSSIBILITY OF SUCH DAMAGE. - * + * **********************************************************************/ -#define RC_FILE_TYPE VFT_DLL -#define RC_FILE_COMMENT_0409 "Some comment" -#define RC_FILE_ORIG_0409 "com_err.dll" +#define RC_FILE_TYPE VFT_APP +#define RC_FILE_DESC_0409 "KDC Master Password Stash Tool" +#define RC_FILE_ORIG_0409 "kstash.exe" -#include "../../windows/version.rc" +#include "../windows/version.rc" diff --git a/lib/com_err/libcom_err-version.rc b/kdc/libkdc-version.rc similarity index 89% copy from lib/com_err/libcom_err-version.rc copy to kdc/libkdc-version.rc index 5f38c1f7c..fee500415 100644 --- a/lib/com_err/libcom_err-version.rc +++ b/kdc/libkdc-version.rc @@ -1,19 +1,19 @@ /*********************************************************************** - * Copyright (c) 2009, Secure Endpoints Inc. + * Copyright (c) 2010, Secure Endpoints Inc. * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * + * * - Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. - * + * * - Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS @@ -26,11 +26,11 @@ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED * OF THE POSSIBILITY OF SUCH DAMAGE. - * + * **********************************************************************/ #define RC_FILE_TYPE VFT_DLL -#define RC_FILE_COMMENT_0409 "Some comment" -#define RC_FILE_ORIG_0409 "com_err.dll" +#define RC_FILE_DESC_0409 "Heimdal KDC Library" +#define RC_FILE_ORIG_0409 "libkdc.dll" -#include "../../windows/version.rc" +#include "../windows/version.rc" diff --git a/lib/com_err/libcom_err-version.rc b/kdc/string2key-version.rc similarity index 87% copy from lib/com_err/libcom_err-version.rc copy to kdc/string2key-version.rc index 5f38c1f7c..120ef4b22 100644 --- a/lib/com_err/libcom_err-version.rc +++ b/kdc/string2key-version.rc @@ -1,19 +1,19 @@ /*********************************************************************** - * Copyright (c) 2009, Secure Endpoints Inc. + * Copyright (c) 2010, Secure Endpoints Inc. * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * + * * - Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. - * + * * - Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS @@ -26,11 +26,11 @@ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED * OF THE POSSIBILITY OF SUCH DAMAGE. - * + * **********************************************************************/ -#define RC_FILE_TYPE VFT_DLL -#define RC_FILE_COMMENT_0409 "Some comment" -#define RC_FILE_ORIG_0409 "com_err.dll" +#define RC_FILE_TYPE VFT_APP +#define RC_FILE_DESC_0409 "Password to Key Mapper" +#define RC_FILE_ORIG_0409 "string2key.exe" -#include "../../windows/version.rc" +#include "../windows/version.rc" diff --git a/kuser/NTMakefile b/kuser/NTMakefile index 0226685ad..c6e3d4629 100644 --- a/kuser/NTMakefile +++ b/kuser/NTMakefile @@ -62,31 +62,31 @@ all:: $(BINPROGRAMS) $(LIBEXECPROGRAMS) clean:: -$(RM) $(BINPROGRAMS) $(LIBEXECPROGRAMS) -$(BINDIR)\kinit.exe: $(OBJ)\kinit.obj $(BINLIBS) +$(BINDIR)\kinit.exe: $(OBJ)\kinit.obj $(BINLIBS) $(OBJ)\kinit-version.res $(EXECONLINK) $(EXEPREP) -$(BINDIR)\klist.exe: $(OBJ)\klist.obj $(BINLIBS) +$(BINDIR)\klist.exe: $(OBJ)\klist.obj $(BINLIBS) $(OBJ)\klist-version.res $(EXECONLINK) $(EXEPREP) -$(BINDIR)\kdestroy.exe: $(OBJ)\kdestroy.obj $(BINLIBS) +$(BINDIR)\kdestroy.exe: $(OBJ)\kdestroy.obj $(BINLIBS) $(OBJ)\kdestroy-version.res $(EXECONLINK) $(EXEPREP) -$(BINDIR)\kgetcred.exe: $(OBJ)\kgetcred.obj $(BINLIBS) +$(BINDIR)\kgetcred.exe: $(OBJ)\kgetcred.obj $(BINLIBS) $(OBJ)\kgetcred-version.res $(EXECONLINK) $(EXEPREP) -$(BINDIR)\kswitch.exe: $(OBJ)\kswitch.obj $(BINLIBS) +$(BINDIR)\kswitch.exe: $(OBJ)\kswitch.obj $(BINLIBS) $(OBJ)\kswitch-version.res $(EXECONLINK) $(EXEPREP) -$(LIBEXECDIR)\kdigest.exe: $(OBJ)\kdigest-commands.obj $(OBJ)\kdigest.obj $(BINLIBS) $(LIBSL) +$(LIBEXECDIR)\kdigest.exe: $(OBJ)\kdigest-commands.obj $(OBJ)\kdigest.obj $(BINLIBS) $(LIBSL) $(OBJ)\kdigest-version.res $(EXECONLINK) $(EXEPREP) @@ -100,7 +100,7 @@ $(OBJ)\kdigest-commands.c $(OBJ)\kdigest-commands.h: kdigest-commands.in cd $(SRCDIR) -$(LIBEXECDIR)\kimpersonate.exe: $(OBJ)\kimpersonate.obj $(BINLIBS) +$(LIBEXECDIR)\kimpersonate.exe: $(OBJ)\kimpersonate.obj $(BINLIBS) $(OBJ)\kimpersonate-version.res $(EXECONLINK) $(EXEPREP) diff --git a/lib/com_err/libcom_err-version.rc b/kuser/kdestroy-version.rc similarity index 87% copy from lib/com_err/libcom_err-version.rc copy to kuser/kdestroy-version.rc index 5f38c1f7c..9ccbdef9e 100644 --- a/lib/com_err/libcom_err-version.rc +++ b/kuser/kdestroy-version.rc @@ -1,19 +1,19 @@ /*********************************************************************** - * Copyright (c) 2009, Secure Endpoints Inc. + * Copyright (c) 2010, Secure Endpoints Inc. * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * + * * - Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. - * + * * - Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS @@ -26,11 +26,11 @@ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED * OF THE POSSIBILITY OF SUCH DAMAGE. - * + * **********************************************************************/ -#define RC_FILE_TYPE VFT_DLL -#define RC_FILE_COMMENT_0409 "Some comment" -#define RC_FILE_ORIG_0409 "com_err.dll" +#define RC_FILE_TYPE VFT_APP +#define RC_FILE_DESC_0409 "Destroy Kerberos Tickets" +#define RC_FILE_ORIG_0409 "kdestroy.exe" -#include "../../windows/version.rc" +#include "../windows/version.rc" diff --git a/lib/com_err/libcom_err-version.rc b/kuser/kdigest-version.rc similarity index 87% copy from lib/com_err/libcom_err-version.rc copy to kuser/kdigest-version.rc index 5f38c1f7c..8e5b16ee2 100644 --- a/lib/com_err/libcom_err-version.rc +++ b/kuser/kdigest-version.rc @@ -1,19 +1,19 @@ /*********************************************************************** - * Copyright (c) 2009, Secure Endpoints Inc. + * Copyright (c) 2010, Secure Endpoints Inc. * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * + * * - Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. - * + * * - Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS @@ -26,11 +26,11 @@ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED * OF THE POSSIBILITY OF SUCH DAMAGE. - * + * **********************************************************************/ -#define RC_FILE_TYPE VFT_DLL -#define RC_FILE_COMMENT_0409 "Some comment" -#define RC_FILE_ORIG_0409 "com_err.dll" +#define RC_FILE_TYPE VFT_APP +#define RC_FILE_DESC_0409 "KDC Digest Interface Tool" +#define RC_FILE_ORIG_0409 "kdigest.exe" -#include "../../windows/version.rc" +#include "../windows/version.rc" diff --git a/lib/com_err/libcom_err-version.rc b/kuser/kgetcred-version.rc similarity index 86% copy from lib/com_err/libcom_err-version.rc copy to kuser/kgetcred-version.rc index 5f38c1f7c..cd3064935 100644 --- a/lib/com_err/libcom_err-version.rc +++ b/kuser/kgetcred-version.rc @@ -1,19 +1,19 @@ /*********************************************************************** - * Copyright (c) 2009, Secure Endpoints Inc. + * Copyright (c) 2010, Secure Endpoints Inc. * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * + * * - Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. - * + * * - Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS @@ -26,11 +26,11 @@ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED * OF THE POSSIBILITY OF SUCH DAMAGE. - * + * **********************************************************************/ -#define RC_FILE_TYPE VFT_DLL -#define RC_FILE_COMMENT_0409 "Some comment" -#define RC_FILE_ORIG_0409 "com_err.dll" +#define RC_FILE_TYPE VFT_APP +#define RC_FILE_DESC_0409 "Get Kerberos Ticket For Service" +#define RC_FILE_ORIG_0409 "kgetcred.exe" -#include "../../windows/version.rc" +#include "../windows/version.rc" diff --git a/lib/com_err/libcom_err-version.rc b/kuser/kimpersonate-version.rc similarity index 86% copy from lib/com_err/libcom_err-version.rc copy to kuser/kimpersonate-version.rc index 5f38c1f7c..8552b05df 100644 --- a/lib/com_err/libcom_err-version.rc +++ b/kuser/kimpersonate-version.rc @@ -1,19 +1,19 @@ /*********************************************************************** - * Copyright (c) 2009, Secure Endpoints Inc. + * Copyright (c) 2010, Secure Endpoints Inc. * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * + * * - Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. - * + * * - Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS @@ -26,11 +26,11 @@ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED * OF THE POSSIBILITY OF SUCH DAMAGE. - * + * **********************************************************************/ -#define RC_FILE_TYPE VFT_DLL -#define RC_FILE_COMMENT_0409 "Some comment" -#define RC_FILE_ORIG_0409 "com_err.dll" +#define RC_FILE_TYPE VFT_APP +#define RC_FILE_DESC_0409 "Impersonate a Kerberos Principal" +#define RC_FILE_ORIG_0409 "kimpersonate.exe" -#include "../../windows/version.rc" +#include "../windows/version.rc" diff --git a/lib/com_err/libcom_err-version.rc b/kuser/kinit-version.rc similarity index 86% copy from lib/com_err/libcom_err-version.rc copy to kuser/kinit-version.rc index 5f38c1f7c..3eb53e25a 100644 --- a/lib/com_err/libcom_err-version.rc +++ b/kuser/kinit-version.rc @@ -1,19 +1,19 @@ /*********************************************************************** - * Copyright (c) 2009, Secure Endpoints Inc. + * Copyright (c) 2010, Secure Endpoints Inc. * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * + * * - Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. - * + * * - Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS @@ -26,11 +26,11 @@ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED * OF THE POSSIBILITY OF SUCH DAMAGE. - * + * **********************************************************************/ -#define RC_FILE_TYPE VFT_DLL -#define RC_FILE_COMMENT_0409 "Some comment" -#define RC_FILE_ORIG_0409 "com_err.dll" +#define RC_FILE_TYPE VFT_APP +#define RC_FILE_DESC_0409 "Acquire Initial Kerberos Tickets" +#define RC_FILE_ORIG_0409 "kinit.exe" -#include "../../windows/version.rc" +#include "../windows/version.rc" diff --git a/lib/com_err/libcom_err-version.rc b/kuser/klist-version.rc similarity index 87% copy from lib/com_err/libcom_err-version.rc copy to kuser/klist-version.rc index 5f38c1f7c..c98b7f406 100644 --- a/lib/com_err/libcom_err-version.rc +++ b/kuser/klist-version.rc @@ -1,19 +1,19 @@ /*********************************************************************** - * Copyright (c) 2009, Secure Endpoints Inc. + * Copyright (c) 2010, Secure Endpoints Inc. * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * + * * - Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. - * + * * - Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS @@ -26,11 +26,11 @@ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED * OF THE POSSIBILITY OF SUCH DAMAGE. - * + * **********************************************************************/ -#define RC_FILE_TYPE VFT_DLL -#define RC_FILE_COMMENT_0409 "Some comment" -#define RC_FILE_ORIG_0409 "com_err.dll" +#define RC_FILE_TYPE VFT_APP +#define RC_FILE_DESC_0409 "List Kerberos Tickets" +#define RC_FILE_ORIG_0409 "klist.exe" -#include "../../windows/version.rc" +#include "../windows/version.rc" diff --git a/lib/com_err/libcom_err-version.rc b/kuser/kswitch-version.rc similarity index 86% copy from lib/com_err/libcom_err-version.rc copy to kuser/kswitch-version.rc index 5f38c1f7c..3437e275d 100644 --- a/lib/com_err/libcom_err-version.rc +++ b/kuser/kswitch-version.rc @@ -1,19 +1,19 @@ /*********************************************************************** - * Copyright (c) 2009, Secure Endpoints Inc. + * Copyright (c) 2010, Secure Endpoints Inc. * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * + * * - Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. - * + * * - Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS @@ -26,11 +26,11 @@ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED * OF THE POSSIBILITY OF SUCH DAMAGE. - * + * **********************************************************************/ -#define RC_FILE_TYPE VFT_DLL -#define RC_FILE_COMMENT_0409 "Some comment" -#define RC_FILE_ORIG_0409 "com_err.dll" +#define RC_FILE_TYPE VFT_APP +#define RC_FILE_DESC_0409 "Switch Between Default Credential Caches" +#define RC_FILE_ORIG_0409 "kswitch.exe" -#include "../../windows/version.rc" +#include "../windows/version.rc" diff --git a/lib/asn1/NTMakefile b/lib/asn1/NTMakefile index 99a43e954..ee58ad5d3 100644 --- a/lib/asn1/NTMakefile +++ b/lib/asn1/NTMakefile @@ -510,7 +510,8 @@ $(BINDIR)\asn1_compile.exe: \ $(OBJ)\hash.obj \ $(OBJ)\lex.obj \ $(OBJ)\main.obj \ - $(OBJ)\symbol.obj + $(OBJ)\symbol.obj \ + $(OBJ)\asn1_compile-version.res $(EXECONLINK) $(LIBROKEN) $(LIBVERS) $(EXEPREP) diff --git a/lib/com_err/libcom_err-version.rc b/lib/asn1/asn1_compile-version.rc similarity index 89% copy from lib/com_err/libcom_err-version.rc copy to lib/asn1/asn1_compile-version.rc index 5f38c1f7c..120fb85c4 100644 --- a/lib/com_err/libcom_err-version.rc +++ b/lib/asn1/asn1_compile-version.rc @@ -1,19 +1,19 @@ /*********************************************************************** - * Copyright (c) 2009, Secure Endpoints Inc. + * Copyright (c) 2010, Secure Endpoints Inc. * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * + * * - Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. - * + * * - Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS @@ -26,11 +26,11 @@ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED * OF THE POSSIBILITY OF SUCH DAMAGE. - * + * **********************************************************************/ -#define RC_FILE_TYPE VFT_DLL -#define RC_FILE_COMMENT_0409 "Some comment" -#define RC_FILE_ORIG_0409 "com_err.dll" +#define RC_FILE_TYPE VFT_APP +#define RC_FILE_DESC_0409 "ASN.1 Compiler" +#define RC_FILE_ORIG_0409 "asn1_compile.exe" #include "../../windows/version.rc" diff --git a/lib/com_err/NTMakefile b/lib/com_err/NTMakefile index 3ff86ff27..f6a221590 100644 --- a/lib/com_err/NTMakefile +++ b/lib/com_err/NTMakefile @@ -56,7 +56,7 @@ $(COMERRDLL): $(libcomerr_OBJs) $(OBJ)\libcom_err-version.res !endif -$(BINDIR)\compile_et.exe: $(OBJ)\parse.obj $(OBJ)\lex.obj $(OBJ)\compile_et.obj +$(BINDIR)\compile_et.exe: $(OBJ)\parse.obj $(OBJ)\lex.obj $(OBJ)\compile_et.obj $(OBJ)\compile_et-version.res $(EXECONLINK) $(LIBROKEN) $(LIBVERS) $(EXEPREP) diff --git a/lib/com_err/libcom_err-version.rc b/lib/com_err/compile_et-version.rc similarity index 89% copy from lib/com_err/libcom_err-version.rc copy to lib/com_err/compile_et-version.rc index 5f38c1f7c..5b0b91abe 100644 --- a/lib/com_err/libcom_err-version.rc +++ b/lib/com_err/compile_et-version.rc @@ -1,19 +1,19 @@ /*********************************************************************** - * Copyright (c) 2009, Secure Endpoints Inc. + * Copyright (c) 2010, Secure Endpoints Inc. * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * + * * - Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. - * + * * - Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS @@ -26,11 +26,11 @@ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED * OF THE POSSIBILITY OF SUCH DAMAGE. - * + * **********************************************************************/ -#define RC_FILE_TYPE VFT_DLL -#define RC_FILE_COMMENT_0409 "Some comment" -#define RC_FILE_ORIG_0409 "com_err.dll" +#define RC_FILE_TYPE VFT_APP +#define RC_FILE_DESC_0409 "Error Table Compiler" +#define RC_FILE_ORIG_0409 "compile_et.exe" #include "../../windows/version.rc" diff --git a/lib/com_err/libcom_err-version.rc b/lib/com_err/libcom_err-version.rc index 5f38c1f7c..7fe64323e 100644 --- a/lib/com_err/libcom_err-version.rc +++ b/lib/com_err/libcom_err-version.rc @@ -1,19 +1,19 @@ /*********************************************************************** * Copyright (c) 2009, Secure Endpoints Inc. * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * + * * - Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. - * + * * - Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS @@ -26,11 +26,11 @@ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED * OF THE POSSIBILITY OF SUCH DAMAGE. - * + * **********************************************************************/ #define RC_FILE_TYPE VFT_DLL -#define RC_FILE_COMMENT_0409 "Some comment" +#define RC_FILE_DESC_0409 "Common Error Library" #define RC_FILE_ORIG_0409 "com_err.dll" #include "../../windows/version.rc" diff --git a/lib/gssapi/NTMakefile b/lib/gssapi/NTMakefile index 0f2ce0013..c909b929f 100644 --- a/lib/gssapi/NTMakefile +++ b/lib/gssapi/NTMakefile @@ -463,11 +463,13 @@ LIBGSSAPI_SDKLIBS=\ !ifndef STATICLIBS -$(BINDIR)\libgssapi.dll: $(libgssapi_OBJs) +RES=$(OBJ)\libgssapi-version.res + +$(BINDIR)\libgssapi.dll: $(libgssapi_OBJs) $(RES) $(DLLGUILINK_C) -implib:$(LIBGSSAPI) \ -out:$(BINDIR)\libgssapi.dll \ -def:libgssapi-exports.def \ - $(LIBGSSAPI_LIBS) $(LIBGSSAPI_SDKLIBS) @<< + $(LIBGSSAPI_LIBS) $(RES) $(LIBGSSAPI_SDKLIBS) @<< $(libgssapi_OBJs: = ) << diff --git a/lib/com_err/libcom_err-version.rc b/lib/gssapi/libgssapi-version.rc similarity index 88% copy from lib/com_err/libcom_err-version.rc copy to lib/gssapi/libgssapi-version.rc index 5f38c1f7c..8e8b96481 100644 --- a/lib/com_err/libcom_err-version.rc +++ b/lib/gssapi/libgssapi-version.rc @@ -1,19 +1,19 @@ /*********************************************************************** - * Copyright (c) 2009, Secure Endpoints Inc. + * Copyright (c) 2010, Secure Endpoints Inc. * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * + * * - Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. - * + * * - Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS @@ -26,11 +26,11 @@ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED * OF THE POSSIBILITY OF SUCH DAMAGE. - * + * **********************************************************************/ #define RC_FILE_TYPE VFT_DLL -#define RC_FILE_COMMENT_0409 "Some comment" -#define RC_FILE_ORIG_0409 "com_err.dll" +#define RC_FILE_DESC_0409 "Generic Security Service Application Program Interface library" +#define RC_FILE_ORIG_0409 "libgssapi.dll" #include "../../windows/version.rc" diff --git a/lib/hdb/NTMakefile b/lib/hdb/NTMakefile index 56e2f8e38..73c2e6992 100644 --- a/lib/hdb/NTMakefile +++ b/lib/hdb/NTMakefile @@ -140,9 +140,11 @@ INCFILES= \ !ifndef STATICLIBS +RES=$(OBJ)\libhdb-version.res + $(LIBHDB): $(BINDIR)\libhdb.dll -$(BINDIR)\libhdb.dll: $(libhdb_OBJs) $(ldap_lib) $(LIBHEIMDAL) $(LIBSQLITE) $(LIBCOMERR) $(LIBROKEN) +$(BINDIR)\libhdb.dll: $(libhdb_OBJs) $(ldap_lib) $(LIBHEIMDAL) $(LIBSQLITE) $(LIBCOMERR) $(LIBROKEN) $(RES) $(DLLGUILINK) -def:libhdb-exports.def -implib:$(LIBHDB) $(DLLPREP) diff --git a/lib/com_err/libcom_err-version.rc b/lib/hdb/libhdb-version.rc similarity index 91% copy from lib/com_err/libcom_err-version.rc copy to lib/hdb/libhdb-version.rc index 5f38c1f7c..b0d417b37 100644 --- a/lib/com_err/libcom_err-version.rc +++ b/lib/hdb/libhdb-version.rc @@ -1,19 +1,19 @@ /*********************************************************************** - * Copyright (c) 2009, Secure Endpoints Inc. + * Copyright (c) 2010, Secure Endpoints Inc. * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * + * * - Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. - * + * * - Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS @@ -26,11 +26,11 @@ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED * OF THE POSSIBILITY OF SUCH DAMAGE. - * + * **********************************************************************/ #define RC_FILE_TYPE VFT_DLL -#define RC_FILE_COMMENT_0409 "Some comment" -#define RC_FILE_ORIG_0409 "com_err.dll" +#define RC_FILE_DESC_0409 "Heimdal DB Library" +#define RC_FILE_ORIG_0409 "libhdb.dll" #include "../../windows/version.rc" diff --git a/lib/heimdal/NTMakefile b/lib/heimdal/NTMakefile index 4b4bf1211..d861f6063 100644 --- a/lib/heimdal/NTMakefile +++ b/lib/heimdal/NTMakefile @@ -54,6 +54,8 @@ DLLSDKDEPS= \ DEF=$(OBJ)\heimdal.def +RES=$(OBJ)\heimdal-version.res + DEFSRC= ..\asn1\libasn1-exports.def \ ..\wind\libwind-exports.def \ ..\hcrypto\libhcrypto-exports.def \ @@ -67,8 +69,8 @@ DLL=$(BINDIR)\heimdal.dll $(LIBHEIMDAL): $(BINDIR)\heimdal.dll -$(DLL): $(DLLDEPS) $(DEF) - $(DLLGUILINK_C) $(DLLDEPS) $(DLLSDKDEPS) \ +$(DLL): $(DLLDEPS) $(DEF) $(RES) + $(DLLGUILINK_C) $(DLLDEPS) $(DLLSDKDEPS) $(RES) \ -def:$(DEF) -out:$(DLL) \ -implib:$(LIBHEIMDAL) $(DLLPREP) diff --git a/lib/com_err/libcom_err-version.rc b/lib/heimdal/dllmain.c similarity index 91% copy from lib/com_err/libcom_err-version.rc copy to lib/heimdal/dllmain.c index 5f38c1f7c..4b34e7ef5 100644 --- a/lib/com_err/libcom_err-version.rc +++ b/lib/heimdal/dllmain.c @@ -29,8 +29,12 @@ * **********************************************************************/ -#define RC_FILE_TYPE VFT_DLL -#define RC_FILE_COMMENT_0409 "Some comment" -#define RC_FILE_ORIG_0409 "com_err.dll" +#include -#include "../../windows/version.rc" +BOOL WINAPI +DllMain(__in HINSTANCE hinstDLL, + __in DWORD fdwReason, + __in LPVOID lpvReserved) +{ + return TRUE; +} diff --git a/lib/com_err/libcom_err-version.rc b/lib/heimdal/heimdal-version.rc similarity index 90% copy from lib/com_err/libcom_err-version.rc copy to lib/heimdal/heimdal-version.rc index 5f38c1f7c..1da512cfb 100644 --- a/lib/com_err/libcom_err-version.rc +++ b/lib/heimdal/heimdal-version.rc @@ -1,19 +1,19 @@ /*********************************************************************** - * Copyright (c) 2009, Secure Endpoints Inc. + * Copyright (c) 2010, Secure Endpoints Inc. * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * + * * - Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. - * + * * - Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS @@ -26,11 +26,11 @@ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED * OF THE POSSIBILITY OF SUCH DAMAGE. - * + * **********************************************************************/ #define RC_FILE_TYPE VFT_DLL -#define RC_FILE_COMMENT_0409 "Some comment" -#define RC_FILE_ORIG_0409 "com_err.dll" +#define RC_FILE_DESC_0409 "Heimdal Kerberos Library" +#define RC_FILE_ORIG_0409 "heimdal.dll" #include "../../windows/version.rc" diff --git a/lib/hx509/NTMakefile b/lib/hx509/NTMakefile index 5eae91860..5b651b89e 100644 --- a/lib/hx509/NTMakefile +++ b/lib/hx509/NTMakefile @@ -194,7 +194,7 @@ $(OBJ)\hxtool-commands.c $(OBJ)\hxtool-commands.h: hxtool-commands.in $(SLC) $(SLC) hxtool-commands.in cd $(SRCDIR) -$(BINDIR)\hxtool.exe: $(OBJ)\hxtool.obj $(OBJ)\hxtool-commands.obj $(LIBHEIMDAL) +$(BINDIR)\hxtool.exe: $(OBJ)\hxtool.obj $(OBJ)\hxtool-commands.obj $(LIBHEIMDAL) $(OBJ)\hxtool-version.res $(EXECONLINK) $(LIBHEIMDAL) $(LIBROKEN) $(LIBSL) $(LIBVERS) $(LIBCOMERR) $(EXEPREP) diff --git a/lib/com_err/libcom_err-version.rc b/lib/hx509/hxtool-version.rc similarity index 88% copy from lib/com_err/libcom_err-version.rc copy to lib/hx509/hxtool-version.rc index 5f38c1f7c..7e5197cc4 100644 --- a/lib/com_err/libcom_err-version.rc +++ b/lib/hx509/hxtool-version.rc @@ -1,19 +1,19 @@ /*********************************************************************** - * Copyright (c) 2009, Secure Endpoints Inc. + * Copyright (c) 2010, Secure Endpoints Inc. * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * + * * - Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. - * + * * - Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS @@ -26,11 +26,11 @@ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED * OF THE POSSIBILITY OF SUCH DAMAGE. - * + * **********************************************************************/ -#define RC_FILE_TYPE VFT_DLL -#define RC_FILE_COMMENT_0409 "Some comment" -#define RC_FILE_ORIG_0409 "com_err.dll" +#define RC_FILE_TYPE VFT_APP +#define RC_FILE_DESC_0409 "Heimdal X.509 Certificate Tool" +#define RC_FILE_ORIG_0409 "hxtool.exe" #include "../../windows/version.rc" diff --git a/lib/kadm5/NTMakefile b/lib/kadm5/NTMakefile index 7b0a7ed70..45db74298 100644 --- a/lib/kadm5/NTMakefile +++ b/lib/kadm5/NTMakefile @@ -194,24 +194,29 @@ EXELIBDEPS= \ $(LIBCOMERR) \ $(LIBVERS) -$(SBINDIR)\iprop-log.exe: $(OBJ)\iprop-log.obj $(OBJ)\iprop-commands.obj $(EXELIBDEPS) +$(SBINDIR)\iprop-log.exe: $(OBJ)\iprop-log.obj $(OBJ)\iprop-commands.obj $(EXELIBDEPS) \ + $(OBJ)\iprop-log-version.res $(EXECONLINK) $(EXEPREP) -$(LIBEXECDIR)\ipropd-master.exe: $(OBJ)\ipropd_master.obj $(OBJ)\ipropd_common.obj $(EXELIBDEPS) +$(LIBEXECDIR)\ipropd-master.exe: $(OBJ)\ipropd_master.obj $(OBJ)\ipropd_common.obj \ + $(EXELIBDEPS) $(OBJ)\ipropd-master-version.res $(EXECONLINK) $(EXEPREP) -$(LIBEXECDIR)\ipropd-slave.exe: $(OBJ)\ipropd_slave.obj $(OBJ)\ipropd_common.obj $(EXELIBDEPS) +$(LIBEXECDIR)\ipropd-slave.exe: $(OBJ)\ipropd_slave.obj $(OBJ)\ipropd_common.obj \ + $(EXELIBDEPS) $(OBJ)\ipropd-slave-version.res $(EXECONLINK) $(EXEPREP) $(LIBKADM5CLNT): $(LIBKADM5CLNT_OBJS) $(LIBCON) +LIBKADM5SRVRES=$(OBJ)\libkadm5srv-version.res + $(LIBKADM5SRV): $(BINDIR)\libkadm5srv.dll -$(BINDIR)\libkadm5srv.dll: $(LIBKADM5SRV_OBJS) $(LIBHEIMDAL) $(LIBROKEN) $(LIBHDB) $(LIBCOMERR) $(LIBSQLITE) +$(BINDIR)\libkadm5srv.dll: $(LIBKADM5SRV_OBJS) $(LIBHEIMDAL) $(LIBROKEN) $(LIBHDB) $(LIBCOMERR) $(LIBSQLITE) $(LIBKADM5SRVRES) $(DLLGUILINK) -implib:$(LIBKADM5SRV) -def:libkadm5srv-exports.def $(DLLPREP) diff --git a/lib/com_err/libcom_err-version.rc b/lib/kadm5/iprop-log-version.rc similarity index 89% copy from lib/com_err/libcom_err-version.rc copy to lib/kadm5/iprop-log-version.rc index 5f38c1f7c..b8a229577 100644 --- a/lib/com_err/libcom_err-version.rc +++ b/lib/kadm5/iprop-log-version.rc @@ -1,19 +1,19 @@ /*********************************************************************** - * Copyright (c) 2009, Secure Endpoints Inc. + * Copyright (c) 2010, Secure Endpoints Inc. * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * + * * - Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. - * + * * - Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS @@ -26,11 +26,11 @@ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED * OF THE POSSIBILITY OF SUCH DAMAGE. - * + * **********************************************************************/ -#define RC_FILE_TYPE VFT_DLL -#define RC_FILE_COMMENT_0409 "Some comment" -#define RC_FILE_ORIG_0409 "com_err.dll" +#define RC_FILE_TYPE VFT_APP +#define RC_FILE_DESC_0409 "IProp Log Tool" +#define RC_FILE_ORIG_0409 "iprop-log.exe" #include "../../windows/version.rc" diff --git a/lib/com_err/libcom_err-version.rc b/lib/kadm5/ipropd-master-version.rc similarity index 89% copy from lib/com_err/libcom_err-version.rc copy to lib/kadm5/ipropd-master-version.rc index 5f38c1f7c..f51a89168 100644 --- a/lib/com_err/libcom_err-version.rc +++ b/lib/kadm5/ipropd-master-version.rc @@ -1,19 +1,19 @@ /*********************************************************************** - * Copyright (c) 2009, Secure Endpoints Inc. + * Copyright (c) 2010, Secure Endpoints Inc. * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * + * * - Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. - * + * * - Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS @@ -26,11 +26,11 @@ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED * OF THE POSSIBILITY OF SUCH DAMAGE. - * + * **********************************************************************/ -#define RC_FILE_TYPE VFT_DLL -#define RC_FILE_COMMENT_0409 "Some comment" -#define RC_FILE_ORIG_0409 "com_err.dll" +#define RC_FILE_TYPE VFT_APP +#define RC_FILE_DESC_0409 "IProp Master" +#define RC_FILE_ORIG_0409 "ipropd-master.exe" #include "../../windows/version.rc" diff --git a/lib/com_err/libcom_err-version.rc b/lib/kadm5/ipropd-slave-version.rc similarity index 89% copy from lib/com_err/libcom_err-version.rc copy to lib/kadm5/ipropd-slave-version.rc index 5f38c1f7c..a1cee87e1 100644 --- a/lib/com_err/libcom_err-version.rc +++ b/lib/kadm5/ipropd-slave-version.rc @@ -1,19 +1,19 @@ /*********************************************************************** - * Copyright (c) 2009, Secure Endpoints Inc. + * Copyright (c) 2010, Secure Endpoints Inc. * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * + * * - Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. - * + * * - Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS @@ -26,11 +26,11 @@ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED * OF THE POSSIBILITY OF SUCH DAMAGE. - * + * **********************************************************************/ -#define RC_FILE_TYPE VFT_DLL -#define RC_FILE_COMMENT_0409 "Some comment" -#define RC_FILE_ORIG_0409 "com_err.dll" +#define RC_FILE_TYPE VFT_APP +#define RC_FILE_DESC_0409 "IProp Slave" +#define RC_FILE_ORIG_0409 "ipropd-slave.exe" #include "../../windows/version.rc" diff --git a/lib/com_err/libcom_err-version.rc b/lib/kadm5/libkadm5srv-version.rc similarity index 89% copy from lib/com_err/libcom_err-version.rc copy to lib/kadm5/libkadm5srv-version.rc index 5f38c1f7c..065c18f95 100644 --- a/lib/com_err/libcom_err-version.rc +++ b/lib/kadm5/libkadm5srv-version.rc @@ -1,19 +1,19 @@ /*********************************************************************** - * Copyright (c) 2009, Secure Endpoints Inc. + * Copyright (c) 2010, Secure Endpoints Inc. * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * + * * - Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. - * + * * - Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS @@ -26,11 +26,11 @@ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED * OF THE POSSIBILITY OF SUCH DAMAGE. - * + * **********************************************************************/ #define RC_FILE_TYPE VFT_DLL -#define RC_FILE_COMMENT_0409 "Some comment" -#define RC_FILE_ORIG_0409 "com_err.dll" +#define RC_FILE_DESC_0409 "Heimdal Kerberos v5 Administration Library" +#define RC_FILE_ORIG_0409 "libkadm5srv.dll" #include "../../windows/version.rc" diff --git a/lib/krb5/NTMakefile b/lib/krb5/NTMakefile index 5a4b9df43..dc01e4648 100644 --- a/lib/krb5/NTMakefile +++ b/lib/krb5/NTMakefile @@ -314,7 +314,7 @@ all-tools:: $(BINDIR)\verify_krb5_conf.exe clean:: -$(RM) $(BINDIR)\verify_krb5_conf.exe -$(BINDIR)\verify_krb5_conf.exe: $(OBJ)\verify_krb5_conf.obj $(LIBHEIMDAL) $(LIBROKEN) $(LIBVERS) +$(BINDIR)\verify_krb5_conf.exe: $(OBJ)\verify_krb5_conf.obj $(LIBHEIMDAL) $(LIBROKEN) $(LIBVERS) $(OBJ)\verify_krb5_conf-version.res $(EXECONLINK) $(EXEPREP) diff --git a/lib/com_err/libcom_err-version.rc b/lib/krb5/verify_krb5_conf-version.rc similarity index 88% copy from lib/com_err/libcom_err-version.rc copy to lib/krb5/verify_krb5_conf-version.rc index 5f38c1f7c..f7d90dfae 100644 --- a/lib/com_err/libcom_err-version.rc +++ b/lib/krb5/verify_krb5_conf-version.rc @@ -1,19 +1,19 @@ /*********************************************************************** - * Copyright (c) 2009, Secure Endpoints Inc. + * Copyright (c) 2010, Secure Endpoints Inc. * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * + * * - Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. - * + * * - Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS @@ -26,11 +26,11 @@ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED * OF THE POSSIBILITY OF SUCH DAMAGE. - * + * **********************************************************************/ -#define RC_FILE_TYPE VFT_DLL -#define RC_FILE_COMMENT_0409 "Some comment" -#define RC_FILE_ORIG_0409 "com_err.dll" +#define RC_FILE_TYPE VFT_APP +#define RC_FILE_DESC_0409 "Krb5.conf Verification Tool" +#define RC_FILE_ORIG_0409 "verify_krb5_conf.exe" #include "../../windows/version.rc" diff --git a/lib/ntlm/NTMakefile b/lib/ntlm/NTMakefile index dcd677a60..55f6c738a 100644 --- a/lib/ntlm/NTMakefile +++ b/lib/ntlm/NTMakefile @@ -44,9 +44,11 @@ $(OBJ)\heimntlm-protos.h: $(libheimntlm_la_SOURCES) !ifndef STATICLIBS +RES=$(OBJ)\libheimntlm-version.res + $(LIBHEIMNTLM): $(BINDIR)\libheimntlm.dll -$(BINDIR)\libheimntlm.dll: $(OBJ)\ntlm.obj $(LIBHEIMDAL) +$(BINDIR)\libheimntlm.dll: $(OBJ)\ntlm.obj $(LIBHEIMDAL) $(RES) $(DLLGUILINK) -def:libheimntlm-exports.def -implib:$(LIBHEIMNTLM) $(DLLPREP) diff --git a/lib/com_err/libcom_err-version.rc b/lib/ntlm/libheimntlm-version.rc similarity index 90% copy from lib/com_err/libcom_err-version.rc copy to lib/ntlm/libheimntlm-version.rc index 5f38c1f7c..2055c9d67 100644 --- a/lib/com_err/libcom_err-version.rc +++ b/lib/ntlm/libheimntlm-version.rc @@ -1,19 +1,19 @@ /*********************************************************************** - * Copyright (c) 2009, Secure Endpoints Inc. + * Copyright (c) 2010, Secure Endpoints Inc. * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * + * * - Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. - * + * * - Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS @@ -26,11 +26,11 @@ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED * OF THE POSSIBILITY OF SUCH DAMAGE. - * + * **********************************************************************/ #define RC_FILE_TYPE VFT_DLL -#define RC_FILE_COMMENT_0409 "Some comment" -#define RC_FILE_ORIG_0409 "com_err.dll" +#define RC_FILE_DESC_0409 "Heimdal NTLM Support Library" +#define RC_FILE_ORIG_0409 "libheimntlm.dll" #include "../../windows/version.rc" diff --git a/windows/version.rc b/windows/version.rc index cb345f27f..59d197869 100644 --- a/windows/version.rc +++ b/windows/version.rc @@ -1,3 +1,51 @@ +/*********************************************************************** + * Copyright (c) 2010, Secure Endpoints Inc. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, + * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + * + **********************************************************************/ + +/* + * This version script is not meant to be used as-is. It requires the + * following parameters that must be supplied using preprocessor + * macros: + * + * RC_FILE_TYPE (Set to either VFT_DLL or VFT_APP) + * RC_FILE_DESC_0409 (File description (English)) + * RC_FILE_ORIG_0409 (Original file name (English)) + * + * The following macros are optional: + * + * RC_FILE_SUBTYPE (File subtype. See MSDN.) + * RC_FILEVER_C (Comma separated file version, if different from + * product version) + * RC_FILE_COMMENT_0409 (File comment (English)) + */ + #include #include @@ -36,10 +84,6 @@ values as a substitute */ #define RC_FILE_VER_0409 RC_PRODUCT_VER_0409 #endif -#ifndef RC_FILE_SUBTYPE -#define RC_FILE_SUBTYPE VFT2_UNKNOWN -#endif - #ifndef RC_FILE_INTERNAL_0409 #define RC_FILE_INTERNAL_0409 RC_FILE_ORIG_0409 #endif @@ -51,7 +95,9 @@ values as a substitute */ FILEFLAGS (P_DEBUG|P_PRE|P_PRIVATE|P_SPECIAL) FILEOS VOS_NT FILETYPE RC_FILE_TYPE +#ifdef RC_FILE_SUBTYPE FILESUBTYPE RC_FILE_SUBTYPE +#endif BEGIN BLOCK "StringFileInfo" BEGIN @@ -65,9 +111,7 @@ values as a substitute */ #ifdef RC_FILE_COMMENT_0409 VALUE "Comments", RC_FILE_COMMENT_0409 #endif -#ifdef RC_FILE_DESC_0409 VALUE "FileDescription", RC_FILE_DESC_0409 -#endif VALUE "FileVersion", RC_FILE_VER_0409 VALUE "InternalName", RC_FILE_INTERNAL_0409 VALUE "OriginalFilename", RC_FILE_ORIG_0409 -- 2.11.4.GIT