diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/base/dbtbase.h | 8 | ||||
| -rw-r--r-- | include/nt/regparms.h | 67 | ||||
| -rw-r--r-- | include/version.h | 32 |
3 files changed, 43 insertions, 64 deletions
diff --git a/include/base/dbtbase.h b/include/base/dbtbase.h index 1e71c42f..e79d6127 100644 --- a/include/base/dbtbase.h +++ b/include/base/dbtbase.h @@ -18,7 +18,7 @@ BEGIN_STR(base) ResDef( DBT_unableToAllocateHashEntry_, 4, "unable to allocate hash entry" )/*extracted from cache.cpp*/ ResDef( DBT_cacheInsertUnableToCreateCacheEn_, 5, "cache_insert: unable to create cache entry" )/*extracted from cache.cpp*/ ResDef( DBT_http10200OkNcontentTypeTextHtmlN_, 6, "HTTP/1.0 200 OK\nContent-type: text/html\n\n" )/*extracted from cache.cpp*/ - ResDef( DBT_H2NetscapeCacheStatusReportH2N_, 7, "<H2>Netscape cache status report</H2>\n" )/*extracted from cache.cpp*/ + ResDef( DBT_H2NetscapeCacheStatusReportH2N_, 7, "<H2>Cache status report</H2>\n" )/*extracted from cache.cpp*/ ResDef( DBT_noCachesOnSystemP_, 8, "No caches on system<P>" )/*extracted from cache.cpp*/ ResDef( DBT_H2SCacheH2N_, 9, "<H2>%s cache</H2>\n" )/*extracted from cache.cpp*/ ResDef( DBT_cacheHitRatioDDFPNPN_, 10, "Cache hit ratio: %d/%d (%f)</P>\n</P>\n" )/*extracted from cache.cpp*/ @@ -52,7 +52,7 @@ BEGIN_STR(base) ResDef( DBT_errorGettingProcessorInfoForProc_, 39, "error getting processor info for processor %d" )/*extracted from daemon.cpp*/ ResDef( DBT_errorBindingToProcessorD_, 40, "Error binding to processor %d" )/*extracted from daemon.cpp*/ ResDef( DBT_boundProcessDToProcessorD_, 41, "bound process %d to processor %d" )/*extracted from daemon.cpp*/ - ResDef( DBT_netscapeServerIsNotExplicitlyBin_, 42, "Netscape server is not explicitly binding to any processors." )/*extracted from daemon.cpp*/ + ResDef( DBT_netscapeServerIsNotExplicitlyBin_, 42, "Server is not explicitly binding to any processors." )/*extracted from daemon.cpp*/ ResDef( DBT_cacheMonitorExited_, 43, "cache monitor exited" )/*extracted from daemon.cpp*/ ResDef( DBT_cacheBatchUpdateDaemonExited_, 44, "cache batch update daemon exited" )/*extracted from daemon.cpp*/ ResDef( DBT_usingSingleThreadedAccepts_, 45, "Using single threaded accepts." )/*extracted from daemon.cpp*/ @@ -61,7 +61,7 @@ BEGIN_STR(base) ResDef( DBT_thisMachineHasDProcessors_, 48, "This machine has %d processors." )/*extracted from daemon.cpp*/ ResDef( DBT_errorCallingThrSeconcurrencyDS_, 49, "Error calling thr_seconcurrency(%d)- (%s)" )/*extracted from daemon.cpp*/ ResDef( DBT_setConncurrencyToD_, 50, "Set conncurrency to %d." )/*extracted from daemon.cpp*/ - ResDef( DBT_warningNetscapeExecutableAndLibr_, 51, "WARNING! netscape executable and library have different versions.\n" )/*extracted from daemon.cpp*/ + ResDef( DBT_warningNetscapeExecutableAndLibr_, 51, "WARNING! executable and library have different versions.\n" )/*extracted from daemon.cpp*/ ResDef( DBT_seminitFailedSN_, 54, "seminit failed (%s)\n" )/*extracted from daemon.cpp*/ ResDef( DBT_thisBetaSoftwareHasExpiredN_, 55, "This beta software has expired.\n" )/*extracted from daemon.cpp*/ ResDef( DBT_cacheMonitorRespawned_, 56, "Cache monitor respawned" )/*extracted from daemon.cpp*/ @@ -125,7 +125,7 @@ BEGIN_STR(base) ResDef( DBT_dnsCacheInsertMallocFailure_, 114, "dns-cache-insert: malloc failure" )/*extracted from dns_cache.cpp*/ ResDef( DBT_successfulServerStartup_, 115, "successful server startup" )/*extracted from ereport.cpp*/ ResDef( DBT_SBS_, 116, "%s B%s" )/*extracted from ereport.cpp*/ - ResDef( DBT_netscapeExecutableAndSharedLibra_, 117, "Netscape executable and shared library have different versions" )/*extracted from ereport.cpp*/ + ResDef( DBT_netscapeExecutableAndSharedLibra_, 117, "executable and shared library have different versions" )/*extracted from ereport.cpp*/ ResDef( DBT_executableVersionIsS_, 118, " executable version is %s" )/*extracted from ereport.cpp*/ ResDef( DBT_sharedLibraryVersionIsS_, 119, " shared library version is %s" )/*extracted from ereport.cpp*/ ResDef( DBT_errorReportingShuttingDown_, 120, "error reporting shutting down" )/*extracted from ereport.cpp*/ diff --git a/include/nt/regparms.h b/include/nt/regparms.h index 3a416338..48f63b51 100644 --- a/include/nt/regparms.h +++ b/include/nt/regparms.h @@ -16,7 +16,7 @@ // 07-24-97 3.5 registry changes, Ted Byrd (tbyrd@netscape.com) // // 09-28-97 4.0 registry changes, Glen Beasley (gbeasley@netscape.com) // //--------------------------------------------------------------------------// -#define KEY_COMPANY "Netscape" +#define KEY_COMPANY "Fedora" #define KEY_APP_PATH "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\App Paths" #define KEY_RUN_ONCE "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\RunOnce" #define KEY_SERVICES "SYSTEM\\CurrentControlSet\\Services" @@ -24,12 +24,12 @@ #define KEY_SNMP_CURRENTVERSION "SNMP\\CurrentVersion" #define KEY_EVENTLOG_MESSAGES "EventLogMessages" #define KEY_EVENTLOG_APP "EventLog\\Application" -#define KEY_SOFTWARE_NETSCAPE "SOFTWARE\\Netscape" +#define KEY_SOFTWARE_NETSCAPE "SOFTWARE\\Fedora" #define VALUE_IMAGE_PATH "ImagePath" #define VALUE_CONFIG_PATH "ConfigurationPath" #define VALUE_ROOT_PATH "RootPath" #define VALUE_APP_PATH "Pathname" -#define PROGRAM_GROUP_NAME "Netscape SuiteSpot" +#define PROGRAM_GROUP_NAME "Fedora SuiteSpot" #define STR_PRODUCT_TYPE "Server" #define STR_EXE ".exe" #define STR_COMPANY_PREFIX "ns-" @@ -38,26 +38,26 @@ #define NSS_NAME_SHORT "SuiteSpot" #define NSS_VERSION "6.0" #define NSS_NAME_VERSION "SuiteSpot 6.0" -#define NSS_NAME_FULL "Netscape SuiteSpot" -#define NSS_NAME_FULL_VERSION "Netscape SuiteSpot 6.0" +#define NSS_NAME_FULL "Fedora SuiteSpot" +#define NSS_NAME_FULL_VERSION "Fedora SuiteSpot 6.0" #define NSS_NAME_UNINSTALL "Uninstall SuiteSpot 6.0" /* Admin IDs */ #define ADM_ID_PRODUCT "admin" #define ADM_NAME_SHORT "Administration" -#define ADM_VERSION "6.2" -#define ADM_NAME_VERSION "Administration 6.2" +#define ADM_VERSION "7.0" +#define ADM_NAME_VERSION "Administration 7.0" #define ADM_NAME_SERVER "Administration Server" -#define ADM_NAME_FULL "Netscape Administration Server" -#define ADM_NAME_FULL_VERSION "Brandx Administration Server 6.2" -#define ADM_NAME_SERVICE "Brandx Administration 6.2" +#define ADM_NAME_FULL "Fedora Administration Server" +#define ADM_NAME_FULL_VERSION "Fedora Administration Server 7.0" +#define ADM_NAME_SERVICE "Fedora Administration 7.0" #define ADM_EXE "ns-admin.exe" #define ADM_EXE_START "admin.exe" -#define ADM_ID_SERVICE "admin62" -#define ADM_KEY_ROOT "Administration\\6.2" +#define ADM_ID_SERVICE "admin70" +#define ADM_KEY_ROOT "Administration\\7.0" #define ADM_SERVER_LST_NAME "adm:Netscape Enterprise Server" #define ADM_DIR_ROOT "admin" -#define ADM_NAME_UNINSTALL "Uninstall Administration Server 6.2" +#define ADM_NAME_UNINSTALL "Uninstall Administration Server 7.0" #if defined( NS_DS ) #define ADMIN_SERVICE_NAME "Admin Server" @@ -67,20 +67,21 @@ /* Enterprise IDs */ #define ENT_ID_PRODUCT "https" #define ENT_NAME_SHORT "Enterprise" -#define ENT_VERSION "3.01" -#define ENT_NAME_VERSION "Enterprise 3.01" +#define ENT_VERSION "6.2" +#define ENT_NAME_VERSION "Enterprise 6.2" #define ENT_NAME_SERVER "Enterprise Server" -#define ENT_NAME_FULL "Netscape Enterprise Server" -#define ENT_NAME_FULL_VERSION "Netscape Enterprise Server 3.01" -#define ENT_NAME_SERVICE "Netscape Enterprise 3.01" +#define ENT_NAME_FULL "Fedora Enterprise Server" +#define ENT_NAME_FULL_VERSION "Fedora Enterprise Server 6.2" +#define ENT_NAME_SERVICE "Fedora Enterprise 6.2" #define ENT_EXE "ns-httpd.exe" #define ENT_EXE_START "httpd.exe" #define ENT_ID_SERVICE "https" -#define ENT_KEY_ROOT "Enterprise\\3.01" -#define ENT_SERVER_LST_NAME "https:Netscape Enterprise Server" +#define ENT_KEY_ROOT "Enterprise\\6.2" +#define ENT_SERVER_LST_NAME "https:Fedora Enterprise Server" #define ENT_DIR_ROOT "https" #define ENT_NAME_UNINSTALL "Uninstall Enterprise Server 3.01" +#if 0 /* Personal IDs */ #define PERSONAL_APP_PATH_KEY "ns-httpd.exe" #define PERSONAL_README_ICON_NAME "FastTrack README" @@ -90,9 +91,6 @@ #define PERSONAL_UNINSTALL_KEY "FastTrackV2.0" #define PERSONAL_SERVER_NAME "Netscape FastTrack Server" - - - #define PER_ID_PRODUCT "httpd" #define PER_NAME_SHORT "FastTrack" #define PER_VERSION "3.01" @@ -214,13 +212,14 @@ #define MAIL_SERVICE_PREFIX "Netscape Admin Server " #define MAIL_README_ICON_NAME "Mail Readme" #define MAIL_UNINSTALL_ICON_NAME "Uninstall Mail" +#endif /* Synchronization Service IDs */ #define DSS_SHORT_NAME "Directory Synchronization Service" -#define DSS_SERVER_NAME "Brandx Directory Synchronization Service" +#define DSS_SERVER_NAME "Fedora Directory Synchronization Service" #define DSS_SERVER_VERSION "7" -#define DSS_SETUP_SHORT_NAME "Brandx Synchronization Service" -#define DSS_SETUP_NAME "Brandx Directory Synchronization Service 7" +#define DSS_SETUP_SHORT_NAME "Fedora Synchronization Service" +#define DSS_SETUP_NAME "Fedora Directory Synchronization Service 7" #define DSS_REGISTRY_ROOT_KEY "Directory Synchronization Service" #define DSS_EXE "dssynch.exe" #define DSS_DIR_ROOT "dssynch" @@ -228,7 +227,7 @@ #define DSS_CONFIG_TOOL "synchcfg.exe" #define DSS_UNINSTALL_KEY "SynchronizationV7" #define DSS_SERVER_LST_NAME "dssynch:Netscape Directory Synchronization Service" -#define DSS_SERVICE_PREFIX "Brandx Directory Synchronization Service " +#define DSS_SERVICE_PREFIX "Fedora Directory Synchronization Service " #define DSS_README_ICON_NAME "Directory Synchronization Service README" #define DSS_CONFIG_ICON_NAME "Directory Synchronization Service Config" #define DSS_UNINSTALL_ICON_NAME "Uninstall Directory Synch Service" @@ -346,14 +345,14 @@ the SuiteSpot servers and should be the final form. */ #define DS_SHORT_NAME "Directory Server" -#define DS_SERVER_NAME "Brandx Directory Server" +#define DS_SERVER_NAME "Fedora Directory Server" #define DS_SERVER_VERSION "7" #define DS_SETUP_SHORT_NAME "Directory Server" -#define DS_SETUP_NAME "Brandx Directory Server 7" +#define DS_SETUP_NAME "Fedora Directory Server 7" #define DS_REGISTRY_ROOT_KEY "Directory Server" #define DS_APP_PATH_KEY "ns-slapd.exe" #define DS_UNINSTALL_KEY "DirectoryV7" -#define DS_SERVICE_PREFIX "Brandx Directory Server " +#define DS_SERVICE_PREFIX "Fedora Directory Server " #define DS_README_ICON_NAME "Directory Server 7 README" #define DS_UNINSTALL_ICON_NAME "Uninstall Directory Server 7" #define DS_PRODUCT_NAME "slapd" @@ -365,15 +364,15 @@ #define DS_VERSION "7" #define DS_NAME_VERSION "Directory 7" #define DS_NAME_SERVER "Directory Server" -#define DS_NAME_FULL "Brandx Directory Server" -#define DS_NAME_FULL_VERSION "Brandx Directory Server 7" -#define DS_NAME_SERVICE "Brandx Directory 7" +#define DS_NAME_FULL "Fedora Directory Server" +#define DS_NAME_FULL_VERSION "Fedora Directory Server 7" +#define DS_NAME_SERVICE "Fedora Directory 7" #define DS_EXE "ns-slapd.exe" #define DS_EXE_START "slapd.exe" #define DS_ID_SERVICE "slapd" #define DS_KEY_ROOT "Directory\\7" #define DS_KEY_ROOT_OLD "Directory\\3.0" -#define DS_SERVER_LST_NAME "slapd:Brandx Directory Server" +#define DS_SERVER_LST_NAME "slapd:Fedora Directory Server" #define DS_DIR_ROOT "slapd" #define DS_NAME_UNINSTALL "Uninstall Directory Server 7" #define DS_SNMP_PATH "bin\\slapd\\server\\ns-ldapagt.dll" diff --git a/include/version.h b/include/version.h index cdd8b4e9..7a20af17 100644 --- a/include/version.h +++ b/include/version.h @@ -14,40 +14,20 @@ #define DIRECTORY_VERSION_DEF "7.1" #define DIRECTORY_COMPATIBLE "3.0" -#define DIRECTORY_VERSION_STRING "Brandx-DirServer/7.1" +#define DIRECTORY_VERSION_STRING "Fedora-DirServer/7.1" #define DS_VERSION_DEF DIRECTORY_VERSION_DEF #define DS_VERSION_STRING DIRECTORY_VERSION_STRING #define DSS_VERSION_DEF DIRECTORY_VERSION_DEF -#define DSS_VERSION_STRING "Brandx-DirSynchService/7.1" +#define DSS_VERSION_STRING "Fedora-DirSynchService/7.1" -#define PROXY_VERSION_DEF "2.0" -#define PROXY_VERSION_STRING "Netscape-Proxy/2.0" - -#define ADMSERV_VERSION_DEF "4.0b1" -#define ADMSERV_VERSION_STRING "Netscape-Administrator/4.0b1" +#define ADMSERV_VERSION_DEF "7.0" +#define ADMSERV_VERSION_STRING "Fedora-Administrator/7.0" /* supposedly the trunk is currently the home of 3.x development */ -#define PERSONAL_VERSION_DEF "3.01b1" -#define PERSONAL_VERSION_STRING "Netscape-FastTrack/3.01b1" - -#define CATALOG_VERSION_DEF "1.0b2" -#define CATALOG_VERSION_STRING "Netscape-Catalog/1.0b2" - -#define RDS_VERSION_DEF "1.0b2" -#define RDS_VERSION_STRING "Netscape-RDS/1.0b2" - #define ENTERPRISE_VERSION_DEF "3.01" #define ENTERPRISE_VERSION_STRING "Netscape-Enterprise/3.01" -#define MAIL_VERSION_DEF "3.0a0" -#define MAIL_VERSION_STRING "Netscape-Mail/3.0a0" - -#define NEWS_VERSION_STRING "Netscape 1.1" - -#define BATMAN_VERSION_DEF "1.0a1" -#define BATMAN_VERSION_STRING "Batman/1.0a1" - -#define VI_COMPANYNAME "Netscape Communications Corporation\0" -#define VI_COPYRIGHT "Copyright 2001 Sun Microsystems, Inc. Portions copyright 1999, 2001-2003 Netscape Communications Corporation. All rights reserved.\0" +#define VI_COMPANYNAME "Fedora Project\0" +#define VI_COPYRIGHT "Copyright (C) 2001 Sun Microsystems, Inc. Used by permission. Copyright (C) 2005 Red Hat, Inc. All rights reserved.\0" |