diff options
| author | Rich Megginson <rmeggins@redhat.com> | 2005-10-29 02:28:24 +0000 |
|---|---|---|
| committer | Rich Megginson <rmeggins@redhat.com> | 2005-10-29 02:28:24 +0000 |
| commit | 2021746ab9832bbd8a4cbb4d788f1a8556667d81 (patch) | |
| tree | 18541feca5f4ceb4730176304df5de051e369288 | |
| parent | 1edb0d5cd52be6c43a2291997468d7ff413f6a21 (diff) | |
| download | ds-2021746ab9832bbd8a4cbb4d788f1a8556667d81.tar.gz ds-2021746ab9832bbd8a4cbb4d788f1a8556667d81.tar.xz ds-2021746ab9832bbd8a4cbb4d788f1a8556667d81.zip | |
Bug(s) fixed: 172005
Bug Description: Change ldapserver version to 1.0
Reviewed by: Noriko (Thanks!)
Fix Description: This also fixes some lingering build issues involving
perldap, which is no longer a separate setup package, but just gets
included into DS in a similar manner to nspr, nss, etc.
Platforms tested: RHEL4
Flag Day: no
Doc impact: no
QA impact: should be covered by regular nightly and manual testing
New Tests integrated into TET: none
47 files changed, 150 insertions, 136 deletions
@@ -132,7 +132,7 @@ help: ifeq ($(INTERNAL_BUILD), 1) COMPONENT_DEPENDENCIES = $(ADMINUTIL_DEP) $(NSPR_DEP) $(ARLIB_DEP) $(DBM_DEP) $(SECURITY_DEP) $(SVRCORE_DEP) \ $(ICU_DEP) $(SETUPUTIL_DEP) $(LDAPSDK_DEP) $(DB_LIB_DEP) $(SASL_DEP) $(NETSNMP_DEP) \ - $(AXIS_DEP) $(DSMLJAR_DEP) $(DSDOC_DEP) $(ADSYNC_DEP) $(NT4SYNC_DEP) + $(AXIS_DEP) $(DSMLJAR_DEP) $(DSDOC_DEP) $(ADSYNC_DEP) $(NT4SYNC_DEP) $(PERLDAP_DEP) endif # Pull WiX MSI toolkit on Windows. diff --git a/component_versions.mk b/component_versions.mk index 4d3d7f1b..261e8091 100644 --- a/component_versions.mk +++ b/component_versions.mk @@ -114,10 +114,10 @@ endif # admin server ifndef ADM_RELDATE - ADM_RELDATE = 20050901 + ADM_RELDATE = 20051028 endif ifndef ADM_VERSDIR - ADM_VERSDIR = adminserver/7.1 + ADM_VERSDIR = adminserver/1.0 endif # Net-SNMP @@ -127,22 +127,17 @@ endif # setuputil ifndef SETUPUTIL_RELDATE - SETUPUTIL_RELDATE = 20050831 + SETUPUTIL_RELDATE = 20051027 endif ifndef SETUPUTIL_VER - SETUPUTIL_VER = 71 - SETUPUTIL_DOT_VER = 7.1 + SETUPUTIL_VER = 10 + SETUPUTIL_DOT_VER = 1.0 endif ifndef SETUPUTIL_VERSDIR SETUPUTIL_VERSDIR=setuputil/$(SETUPUTIL_DOT_VER) endif -# infozip utilities -ifndef INFOZIP_RELDATE - INFOZIP_RELDATE = CMSTOOLS_7_x -endif - # server core ifndef SVRCORE_RELDATE SVRCORE_RELDATE = SVRCORE_4_0_RTM @@ -150,11 +145,11 @@ endif # admin utility library ifndef ADMINUTIL_VER - ADMINUTIL_VER=71 - ADMINUTIL_DOT_VER=7.1 + ADMINUTIL_VER=10 + ADMINUTIL_DOT_VER=1.0 endif ifndef ADMINUTIL_RELDATE - ADMINUTIL_RELDATE=20050721 + ADMINUTIL_RELDATE=20051026 endif ifndef ADMINUTIL_VERSDIR @@ -163,17 +158,17 @@ endif # LDAP Console ifndef LDAPCONSOLE_REL - LDAPCONSOLE_REL=71 + LDAPCONSOLE_REL=10 endif ifndef LDAPCONSOLE_COMP LDAPCONSOLE_COMP = ldapconsole$(LDAPCONSOLE_REL) endif ifndef LDAPCONSOLE_RELDATE - LDAPCONSOLE_RELDATE=20050913 + LDAPCONSOLE_RELDATE=20051028 endif ifndef PERLDAP_VERSION - PERLDAP_VERSION=20050330 + PERLDAP_VERSION=20051028 endif ifndef JSS_COMP @@ -236,9 +231,9 @@ ifndef MAVEN_VERSION endif ifndef ADSYNC_VERSION - ADSYNC_VERSION=20050912 + ADSYNC_VERSION=20051017 endif ifndef NT4SYNC_VERSION - NT4SYNC_VERSION=20050912 + NT4SYNC_VERSION=20051017 endif diff --git a/include/nt/regparms.h b/include/nt/regparms.h index f0cbeff5..a76a9534 100644 --- a/include/nt/regparms.h +++ b/include/nt/regparms.h @@ -77,19 +77,19 @@ /* Admin IDs */ #define ADM_ID_PRODUCT "admin" #define ADM_NAME_SHORT "Administration" -#define ADM_VERSION "7.0" -#define ADM_NAME_VERSION "Administration 7.0" +#define ADM_VERSION "1.0" +#define ADM_NAME_VERSION "Administration 1.0" #define ADM_NAME_SERVER "Administration Server" #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_NAME_FULL_VERSION "Fedora Administration Server 1.0" +#define ADM_NAME_SERVICE "Fedora Administration 1.0" #define ADM_EXE "ns-admin.exe" #define ADM_EXE_START "admin.exe" -#define ADM_ID_SERVICE "admin70" -#define ADM_KEY_ROOT "Administration\\7.0" +#define ADM_ID_SERVICE "admin10" +#define ADM_KEY_ROOT "Administration\\1.0" #define ADM_SERVER_LST_NAME "adm:Netscape Enterprise Server" #define ADM_DIR_ROOT "admin" -#define ADM_NAME_UNINSTALL "Uninstall Administration Server 7.0" +#define ADM_NAME_UNINSTALL "Uninstall Administration Server 1.0" #if defined( NS_DS ) #define ADMIN_SERVICE_NAME "Admin Server" @@ -249,15 +249,15 @@ /* Synchronization Service IDs */ #define DSS_SHORT_NAME "Directory Synchronization Service" #define DSS_SERVER_NAME "Fedora Directory Synchronization Service" -#define DSS_SERVER_VERSION "7" +#define DSS_SERVER_VERSION "1" #define DSS_SETUP_SHORT_NAME "Fedora Synchronization Service" -#define DSS_SETUP_NAME "Fedora Directory Synchronization Service 7" +#define DSS_SETUP_NAME "Fedora Directory Synchronization Service 1" #define DSS_REGISTRY_ROOT_KEY "Directory Synchronization Service" #define DSS_EXE "dssynch.exe" #define DSS_DIR_ROOT "dssynch" #define DSS_APP_PATH_KEY "dssynch.exe" #define DSS_CONFIG_TOOL "synchcfg.exe" -#define DSS_UNINSTALL_KEY "SynchronizationV7" +#define DSS_UNINSTALL_KEY "SynchronizationV1" #define DSS_SERVER_LST_NAME "dssynch:Netscape Directory Synchronization Service" #define DSS_SERVICE_PREFIX "Fedora Directory Synchronization Service " #define DSS_README_ICON_NAME "Directory Synchronization Service README" @@ -378,35 +378,35 @@ */ #define DS_SHORT_NAME "Directory Server" #define DS_SERVER_NAME "Fedora Directory Server" -#define DS_SERVER_VERSION "7" +#define DS_SERVER_VERSION "1" #define DS_SETUP_SHORT_NAME "Directory Server" -#define DS_SETUP_NAME "Fedora Directory Server 7" +#define DS_SETUP_NAME "Fedora Directory Server 1" #define DS_REGISTRY_ROOT_KEY "Directory Server" #define DS_APP_PATH_KEY "ns-slapd.exe" -#define DS_UNINSTALL_KEY "DirectoryV7" +#define DS_UNINSTALL_KEY "DirectoryV1" #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_README_ICON_NAME "Directory Server 1 README" +#define DS_UNINSTALL_ICON_NAME "Uninstall Directory Server 1" #define DS_PRODUCT_NAME "slapd" #define DS_ID_PRODUCT "slapd" #define DS_NAME_SHORT "Directory" #define DS_VERSION_OLD "3.0" #undef DS_VERSION -#define DS_VERSION "7" -#define DS_NAME_VERSION "Directory 7" +#define DS_VERSION "1" +#define DS_NAME_VERSION "Directory 1" #define DS_NAME_SERVER "Directory Server" #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_NAME_FULL_VERSION "Fedora Directory Server 1" +#define DS_NAME_SERVICE "Fedora Directory 1" #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 "Directory\\1" #define DS_KEY_ROOT_OLD "Directory\\3.0" #define DS_SERVER_LST_NAME "slapd:Fedora Directory Server" #define DS_DIR_ROOT "slapd" -#define DS_NAME_UNINSTALL "Uninstall Directory Server 7" +#define DS_NAME_UNINSTALL "Uninstall Directory Server 1" #define DS_SNMP_PATH "bin\\slapd\\server\\ns-ldapagt.dll" #define DS_OPTIONS "Select the installation option from below" #define DS_OPTIONS_TITLE "Directory Server Installions Options" diff --git a/include/version.h b/include/version.h index f8520232..4d1caffc 100644 --- a/include/version.h +++ b/include/version.h @@ -44,18 +44,18 @@ exist, the PRODUCT_VERSION define has _DEF appended. */ -#define DIRECTORY_VERSION_DEF "7.1" +#define DIRECTORY_VERSION_DEF "1.0" #define DIRECTORY_COMPATIBLE "3.0" -#define DIRECTORY_VERSION_STRING "Fedora-DirServer/7.1" +#define DIRECTORY_VERSION_STRING "Fedora-DirServer/1.0" #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 "Fedora-DirSynchService/7.1" +#define DSS_VERSION_STRING "Fedora-DirSynchService/1.0" -#define ADMSERV_VERSION_DEF "7.0" -#define ADMSERV_VERSION_STRING "Fedora-Administrator/7.0" +#define ADMSERV_VERSION_DEF "1.0" +#define ADMSERV_VERSION_STRING "Fedora-Administrator/1.0" /* supposedly the trunk is currently the home of 3.x development */ #define ENTERPRISE_VERSION_DEF "3.01" diff --git a/internal_comp_deps.mk b/internal_comp_deps.mk index af9bd94d..90492f28 100644 --- a/internal_comp_deps.mk +++ b/internal_comp_deps.mk @@ -574,7 +574,26 @@ endif #PERLDAP_COMPONENT_DIR = $(COMPONENTS_DIR_DEV)/perldap/$(PERLDAP_VERSION)/$(NSOBJDIR_NAME_32) PERLDAP_COMPONENT_DIR = $(COMPONENTS_DIR)/perldap/$(PERLDAP_VERSION)/$(NSOBJDIR_NAME_32) -PERLDAP_ZIP_FILE = perldap14.zip +PERLDAP_FILES=lib,arch +PERLDAP_DEP = $(PERLDAP_BUILT_DIR)/lib + +# this is the rule to pull PerLDAP +ifndef PERLDAP_PULL_METHOD +PERLDAP_PULL_METHOD = FTP +endif + +$(PERLDAP_DEP): +ifdef INTERNAL_BUILD + $(RM) $@ + $(FTP_PULL) -method $(PERLDAP_PULL_METHOD) \ + -objdir $(dir $@) \ + -componentdir $(PERLDAP_COMPONENT_DIR) \ + -files $(PERLDAP_FILES) + @if [ ! -f $@ ] ; \ + then echo "Error: could not get component PERLDAP file $@" ; \ + exit 1 ; \ + fi +endif ########################################################### ### Admin Server package ################################## diff --git a/ldap/admin/src/configure_instance.cpp b/ldap/admin/src/configure_instance.cpp index 5beb9ff2..ed69bb3e 100644 --- a/ldap/admin/src/configure_instance.cpp +++ b/ldap/admin/src/configure_instance.cpp @@ -133,7 +133,7 @@ extern "C" { // name of script file to generate relative to slapd instance directory #define SCRIPT_FILE_NAME "start-console" -#define DS_JAR_FILE_NAME "ds71.jar" +#define DS_JAR_FILE_NAME "ds10.jar" #define DS_CONSOLE_CLASS_NAME "com.netscape.admin.dirserv.DSAdmin" #ifdef XP_WIN32 diff --git a/ldap/admin/src/updatedsgw b/ldap/admin/src/updatedsgw index e7b055ba..03efd21f 100755 --- a/ldap/admin/src/updatedsgw +++ b/ldap/admin/src/updatedsgw @@ -50,7 +50,7 @@ if (!$nshome ) { if (!getopts('h:i:d:e:s:t:n:') || !$opt_n || !$opt_h ) { print "usage: " . $0 . " -n nshome -h current_slapd_host:current_slapd_port [options]\n"; print "\nrequired:\n"; - print " -n directory\tthe directory where 7.1 is installed (NS-HOME)\n"; + print " -n directory\tthe directory where 1.0 is installed (NS-HOME)\n"; print " -h host[:port]\tthe current host and port of the directory server\n"; print " \tto which the gateway connects.\n"; print "\noptions:\n"; @@ -59,7 +59,7 @@ if (!$nshome ) { print " -t suffix\t\tthe new ESCAPED suffix of the directory server\n"; print " -d dirmgrdn\t\tthe old manager dn of the directory server\n"; print " -e dirmgrdn\t\tthe new manager dn of the directory server\n"; - print "\nexample:\n " . $0 . " -n /home/servers/ds71/ -h gargoyle:1974 -i brooklyn -s \"dc=example,dc=com\" -t \"o%3Dredhat.com\" -d \"cn=directory manager\" -e \"cn=directory guru\"\n"; + print "\nexample:\n " . $0 . " -n /home/servers/ds10/ -h gargoyle:1974 -i brooklyn -s \"dc=example,dc=com\" -t \"o%3Ddirectory.fedora.redhat.com\" -d \"cn=directory manager\" -e \"cn=directory guru\"\n"; exit; } diff --git a/ldap/cm/fixPerlDAPInf.pl b/ldap/cm/fixPerlDAPInf.pl index 790a68d4..7875c77e 100644 --- a/ldap/cm/fixPerlDAPInf.pl +++ b/ldap/cm/fixPerlDAPInf.pl @@ -53,7 +53,7 @@ while (<IN>) { s/The Sun \| Netscape Alliance/Fedora/g; } print OUT; - if (/^Archive=perldap14.zip/) { + if (/^Archive=perldap.*\.zip/) { print OUT "Visible=FALSE\n"; } } diff --git a/ldap/cm/newinst/ns-keygen b/ldap/cm/newinst/ns-keygen index 9ba028ee..5c23e957 100755 --- a/ldap/cm/newinst/ns-keygen +++ b/ldap/cm/newinst/ns-keygen @@ -41,7 +41,7 @@ # # Usage ns-keygen password_file fully_qualified_hostname # Example: -# ./ns-keygen ../password.txt myhost.redhat.com +# ./ns-keygen ../password.txt myhost.directory.fedora.redhat.com # # Assumes that NSHOME is Set # if NSHOME is not set, it will be derived from the path of this script, which is diff --git a/ldap/cm/newinst/slapd-patch.inf b/ldap/cm/newinst/slapd-patch.inf index 27559a2c..c09309fb 100644 --- a/ldap/cm/newinst/slapd-patch.inf +++ b/ldap/cm/newinst/slapd-patch.inf @@ -38,17 +38,17 @@ # [General] Name= %%%SERVER_NAME%%% -Components=slapd-71 +Components=slapd-10 -[slapd-71] +[slapd-10] Name= %%%SERVER_NAME%%% InstanceNamePrefix= %%%INSTANCE_NAME_PREFIX%%% Description= %%%SERVER_NAME%%% -NickName= slapd-71 +NickName= slapd-10 Version= %%%SERVER_VERSION%%% BuildNumber= %%%SERVER_BUILD_NUM%%% -Archive= nsslapd-71.zip -SourcePath=slapd-71 +Archive= nsslapd-10.zip +SourcePath=slapd-10 PreInstall= ns-config -r PostInstall= bin/slapd/admin/bin/ns-update PreUninstall= bin/slapd/admin/bin/uninstall diff --git a/ldap/cm/newinstnt/dsinst.rc b/ldap/cm/newinstnt/dsinst.rc index 0e0ef2c4..cddf42ec 100644 --- a/ldap/cm/newinstnt/dsinst.rc +++ b/ldap/cm/newinstnt/dsinst.rc @@ -83,13 +83,13 @@ BEGIN BLOCK "040904b0" BEGIN VALUE "CompanyName", "Fedora\0" - VALUE "FileDescription", "Directory Server 7.1\0" + VALUE "FileDescription", "Directory Server 1.0\0" VALUE "FileVersion", "1, 0, 0, 1\0" - VALUE "InternalName", "Directory Server 7.1\0" + VALUE "InternalName", "Directory Server 1.0\0" VALUE "LegalCopyright", "Copyright 2001 Sun Microsystems, Inc. Portions copyright 1999, 2002 Netscape Communications Corporation. All rights reserved.\0" VALUE "OriginalFilename", "\0" VALUE "ProductName", "Fedora Server Products\0" - VALUE "ProductVersion", "7, 1, 0, 0\0" + VALUE "ProductVersion", "1, 0, 0, 0\0" END END BLOCK "VarFileInfo" @@ -134,7 +134,7 @@ END IDD_MCC_SETTINGS DIALOG DISCARDABLE 0, 0, 297, 163 STYLE WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Directory Server 7.1" +CAPTION "Directory Server 1.0" FONT 8, "MS Sans Serif" BEGIN EDITTEXT IDC_EDIT_HOST,158,68,103,13,ES_AUTOHSCROLL | WS_DISABLED @@ -165,7 +165,7 @@ END IDD_ROOTDN DIALOG DISCARDABLE 0, 0, 297, 163 STYLE WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Directory Server 7.1 Directory Manager Settings" +CAPTION "Directory Server 1.0 Directory Manager Settings" FONT 8, "MS Sans Serif" BEGIN CONTROL 102,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,0,0,85,160 @@ -190,7 +190,7 @@ END IDD_SUITESPOTID DIALOG DISCARDABLE 0, 0, 297, 163 STYLE WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION -"Directory Server 7.1 Fedora configuration directory server administrator " +"Directory Server 1.0 Fedora configuration directory server administrator " FONT 8, "MS Sans Serif" BEGIN @@ -212,7 +212,7 @@ END IDD_SERVER_SETTINGS DIALOG DISCARDABLE 0, 0, 297, 163 STYLE WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Directory Server 7.1 Server Settings" +CAPTION "Directory Server 1.0 Server Settings" FONT 8, "MS Sans Serif" BEGIN GROUPBOX "General Settings",IDC_STATIC_GENERAL_SETTINGS,97,33,194, @@ -234,7 +234,7 @@ END IDD_SAMPLE_ENTRIES_ORG DIALOG DISCARDABLE 0, 0, 377, 179 STYLE WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Directory Server 7.1 Populate Database" +CAPTION "Directory Server 1.0 Populate Database" FONT 8, "MS Sans Serif" BEGIN GROUPBOX "Sample Organizational Structure", @@ -266,7 +266,7 @@ END IDD_CONSUMER_REPLICATION_SETTINGS DIALOG DISCARDABLE 0, 0, 297, 163 STYLE WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Directory Server 7.1 Consumer Replication Settings" +CAPTION "Directory Server 1.0 Consumer Replication Settings" FONT 8, "MS Sans Serif" BEGIN CONTROL 102,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,0,0,85,160 @@ -289,7 +289,7 @@ END IDD_SUPPLIER_REPLICATION_SETTINGS DIALOG DISCARDABLE 0, 0, 297, 163 STYLE WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Directory Server 7.1 Supplier Replication Settings" +CAPTION "Directory Server 1.0 Supplier Replication Settings" FONT 8, "MS Sans Serif" BEGIN CONTROL 102,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,0,0,85,160 @@ -307,7 +307,7 @@ END IDD_CONSUMER_DN DIALOG DISCARDABLE 0, 0, 297, 163 STYLE WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Directory Server 7.1 Consumer DN Settings " +CAPTION "Directory Server 1.0 Consumer DN Settings " FONT 8, "MS Sans Serif" BEGIN CONTROL 102,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,0,0,85,160 @@ -332,7 +332,7 @@ END IDD_REPLICATION_AGREEMENT DIALOG DISCARDABLE 0, 0, 297, 163 STYLE WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Directory Server 7.1 Configure Replication Agreement" +CAPTION "Directory Server 1.0 Configure Replication Agreement" FONT 8, "MS Sans Serif" BEGIN EDITTEXT IDC_EDIT_HOST,159,13,80,13,ES_AUTOHSCROLL @@ -388,7 +388,7 @@ END IDD_CHOOSE_REPLICATION_SETUP DIALOG DISCARDABLE 0, 0, 297, 163 STYLE WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Directory Server 7.1 Configure Server for Replication" +CAPTION "Directory Server 1.0 Configure Server for Replication" FONT 8, "MS Sans Serif" BEGIN CONTROL "A Consumer that will pull updates", @@ -426,7 +426,7 @@ END IDD_DISABLE_SCHEMA_CHECKING DIALOG DISCARDABLE 0, 0, 297, 163 STYLE WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Directory Server 7.1 Disable Schema Checking" +CAPTION "Directory Server 1.0 Disable Schema Checking" FONT 8, "MS Sans Serif" BEGIN CONTROL 102,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,0,0,85,160 @@ -443,7 +443,7 @@ END IDD_ADMIN_DOMAIN DIALOG DISCARDABLE 0, 0, 297, 163 STYLE WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Directory Server 7.1 Administration Domain" +CAPTION "Directory Server 1.0 Administration Domain" FONT 8, "MS Sans Serif" BEGIN CONTROL 102,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,0,0,85,160 @@ -462,7 +462,7 @@ END IDD_REINSTALL_CONFIG DIALOG DISCARDABLE 0, 0, 297, 163 STYLE WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Directory Server 7.1 Reinstall Settings" +CAPTION "Directory Server 1.0 Reinstall Settings" FONT 8, "MS Sans Serif" BEGIN CONTROL 102,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,0,0,85,160 @@ -489,7 +489,7 @@ END IDD_ADMIN_ID_ONLY DIALOG DISCARDABLE 0, 0, 297, 163 STYLE WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION -"Directory Server 7.1 Fedora configuration directory server administrator " +"Directory Server 1.0 Fedora configuration directory server administrator " FONT 8, "MS Sans Serif" BEGIN diff --git a/ldap/docs/README.txt b/ldap/docs/README.txt index 1cf5dcae..bfe665e5 100644 --- a/ldap/docs/README.txt +++ b/ldap/docs/README.txt @@ -1,5 +1,5 @@ ======================================================================= - Fedora Directory Server 7.1 + Fedora Directory Server 1.0 ======================================================================= The Fedora Directory Server is subject to the terms detailed in the @@ -8,4 +8,4 @@ license agreement file called LICENSE.txt. Late-breaking news and information on the Fedora Directory Server is available at the following location: - http://fedora.redhat.com/ + http://directory.fedora.redhat.com diff --git a/ldap/ldif/roledit.ldif b/ldap/ldif/roledit.ldif index bdae9a29..85ce05db 100644 --- a/ldap/ldif/roledit.ldif +++ b/ldap/ldif/roledit.ldif @@ -44,39 +44,39 @@ objectclass: extensibleObject ou: admin nsmerge: ADD_IF_EMPTY -dn: ou=4.0, ou=Admin, ou=Global Preferences +dn: ou=1.0, ou=Admin, ou=Global Preferences objectclass: top objectclass: organizationalunit objectclass: extensibleObject -ou: 4.0 +ou: 1.0 nsmerge: ADD_IF_EMPTY -dn: cn=ResourceEditorExtension, ou=4.0, ou=Admin, ou=Global Preferences +dn: cn=ResourceEditorExtension, ou=1.0, ou=Admin, ou=Global Preferences objectclass: top objectclass: nsResourceRef objectclass: extensibleObject cn: ResourceEditorExtension nsmerge: ADD_IF_EMPTY -dn: cn=nsroledefinition, cn=ResourceEditorExtension, ou=4.0, ou=Admin, ou=Global Preferences +dn: cn=nsroledefinition, cn=ResourceEditorExtension, ou=1.0, ou=Admin, ou=Global Preferences cn: nsroledefinition objectclass: top objectclass: extensibleObject objectclass: nsResourceRef objectclass: nsAdminResourceEditorExtension -nsclassname: com.netscape.admin.dirserv.roledit.ResEditorRoleInfo@ds71.jar -nsclassname: com.netscape.admin.dirserv.roledit.ResEditorRoleMembers@ds71.jar -nsclassname: com.netscape.admin.dirserv.roledit.ResEditorRoleAccountPage@ds71.jar +nsclassname: com.netscape.admin.dirserv.roledit.ResEditorRoleInfo@ds10.jar +nsclassname: com.netscape.admin.dirserv.roledit.ResEditorRoleMembers@ds10.jar +nsclassname: com.netscape.admin.dirserv.roledit.ResEditorRoleAccountPage@ds10.jar nsmerge: {nsclassname}MULTI_MERGE -dn: cn=cossuperdefinition, cn=ResourceEditorExtension, ou=4.0, ou=Admin, ou=Global Preferences +dn: cn=cossuperdefinition, cn=ResourceEditorExtension, ou=1.0, ou=Admin, ou=Global Preferences cn: cossuperdefinition objectclass: top objectclass: extensibleObject objectclass: nsResourceRef objectclass: nsAdminResourceEditorExtension -nsclassname: com.netscape.admin.dirserv.cosedit.ResEditorCosInfo@ds71.jar -nsclassname: com.netscape.admin.dirserv.cosedit.ResEditorCosAttributes@ds71.jar -nsclassname: com.netscape.admin.dirserv.cosedit.ResEditorCosTemplate@ds71.jar +nsclassname: com.netscape.admin.dirserv.cosedit.ResEditorCosInfo@ds10.jar +nsclassname: com.netscape.admin.dirserv.cosedit.ResEditorCosAttributes@ds10.jar +nsclassname: com.netscape.admin.dirserv.cosedit.ResEditorCosTemplate@ds10.jar nsmerge: {nsclassname}MULTI_MERGE diff --git a/ldap/ldif/tasks.ldif b/ldap/ldif/tasks.ldif index 5c3d8740..683d56c5 100644 --- a/ldap/ldif/tasks.ldif +++ b/ldap/ldif/tasks.ldif @@ -62,60 +62,60 @@ dn: cn=start, cn=Operation, cn=Tasks objectclass: top objectclass: nstask objectclass: nsAdminObject -nsClassname: com.netscape.admin.dirserv.task.Start@ds71.jar +nsClassname: com.netscape.admin.dirserv.task.Start@ds10.jar nsexecref: start dn: cn=stop, cn=Operation, cn=Tasks objectclass: top objectclass: nstask objectclass: nsAdminObject -nsClassname: com.netscape.admin.dirserv.task.Stop@ds71.jar +nsClassname: com.netscape.admin.dirserv.task.Stop@ds10.jar nsexecref: shutdown dn: cn=restart, cn=Operation, cn=Tasks objectclass: top objectclass: nstask objectclass: nsAdminObject -nsClassname: com.netscape.admin.dirserv.task.Restart@ds71.jar +nsClassname: com.netscape.admin.dirserv.task.Restart@ds10.jar nsexecref: restart dn: cn=Backup, cn=operation, cn=Tasks objectclass: top objectclass: nstask objectclass: nsAdminObject -nsClassname: com.netscape.admin.dirserv.task.Backup@ds71.jar +nsClassname: com.netscape.admin.dirserv.task.Backup@ds10.jar nsexecref: ds_db2bak dn: cn=Restore, cn=operation, cn=Tasks objectclass: top objectclass: nstask objectclass: nsAdminObject -nsClassname: com.netscape.admin.dirserv.task.Restore@ds71.jar +nsClassname: com.netscape.admin.dirserv.task.Restore@ds10.jar nsexecref: ds_bak2db dn: cn=KeyCert, cn=operation, cn=Tasks objectclass: top objectclass: nstask objectclass: nsAdminObject -nsClassname: com.netscape.admin.dirserv.task.KeyCert@ds71.jar +nsClassname: com.netscape.admin.dirserv.task.KeyCert@ds10.jar dn: cn=Authenticate, cn=operation, cn=Tasks objectclass: top objectclass: nstask objectclass: nsAdminObject -nsClassname: com.netscape.admin.dirserv.task.Authenticate@ds71.jar +nsClassname: com.netscape.admin.dirserv.task.Authenticate@ds10.jar dn: cn=CompleteImport, cn=operation, cn=Tasks objectclass: top objectclass: nstask objectclass: nsAdminObject -nsClassname: com.netscape.admin.dirserv.task.CompleteImport@ds71.jar +nsClassname: com.netscape.admin.dirserv.task.CompleteImport@ds10.jar dn: cn=CompleteExport, cn=operation, cn=Tasks objectclass: top objectclass: nstask objectclass: nsAdminObject -nsClassname: com.netscape.admin.dirserv.task.CompleteExport@ds71.jar +nsClassname: com.netscape.admin.dirserv.task.CompleteExport@ds10.jar dn: cn=Export, cn=operation, cn=Tasks objectclass: top diff --git a/ldap/servers/plugins/acl/libacl.def b/ldap/servers/plugins/acl/libacl.def index 10d36a76..b436696b 100644 --- a/ldap/servers/plugins/acl/libacl.def +++ b/ldap/servers/plugins/acl/libacl.def @@ -38,7 +38,7 @@ ; ; ; -DESCRIPTION 'Fedora Directory Server 7.1 ACL Plugin' +DESCRIPTION 'Fedora Directory Server 1.0 ACL Plugin' ;CODE SHARED READ EXECUTE ;DATA SHARED READ WRITE EXPORTS diff --git a/ldap/servers/plugins/chainingdb/libcb.def b/ldap/servers/plugins/chainingdb/libcb.def index b09ae61b..47c7ce80 100644 --- a/ldap/servers/plugins/chainingdb/libcb.def +++ b/ldap/servers/plugins/chainingdb/libcb.def @@ -38,7 +38,7 @@ ; ; ; -DESCRIPTION 'Fedora Directory Server 7 Chaining Database Plugin' +DESCRIPTION 'Fedora Directory Server 1.0 Chaining Database Plugin' ;CODE SHARED READ EXECUTE ;DATA SHARED READ WRITE EXPORTS diff --git a/ldap/servers/plugins/collation/collation.def b/ldap/servers/plugins/collation/collation.def index 89ed7366..397c86c8 100644 --- a/ldap/servers/plugins/collation/collation.def +++ b/ldap/servers/plugins/collation/collation.def @@ -36,7 +36,7 @@ ; All rights reserved. ; END COPYRIGHT BLOCK ; -DESCRIPTION 'Fedora Directory Server 7 Collation Plugin' +DESCRIPTION 'Fedora Directory Server 1.0 Collation Plugin' EXPORTS orderingRule_init @2 plugin_init_debug_level @3 diff --git a/ldap/servers/plugins/cos/cos.def b/ldap/servers/plugins/cos/cos.def index d22503ed..a1906ba9 100644 --- a/ldap/servers/plugins/cos/cos.def +++ b/ldap/servers/plugins/cos/cos.def @@ -36,7 +36,7 @@ ; All rights reserved. ; END COPYRIGHT BLOCK ; -DESCRIPTION 'Fedora Directory Server 7 Class Of Service Plugin' +DESCRIPTION 'Fedora Directory Server 1.0 Class Of Service Plugin' EXPORTS cos_init @2 plugin_init_debug_level @3 diff --git a/ldap/servers/plugins/distrib/README b/ldap/servers/plugins/distrib/README index 319dab18..fddf4f30 100644 --- a/ldap/servers/plugins/distrib/README +++ b/ldap/servers/plugins/distrib/README @@ -42,7 +42,7 @@ ---------------------------- This directory contains code for some sample server plug-ins intended for -use with the Fedora Directory Server 7. +use with the Fedora Directory Server 1. NOTE: Before you compile and run these examples, make sure to change any server-specific data in the examples to diff --git a/ldap/servers/plugins/distrib/libdistrib.def b/ldap/servers/plugins/distrib/libdistrib.def index 09ce7c39..d8a0b02c 100644 --- a/ldap/servers/plugins/distrib/libdistrib.def +++ b/ldap/servers/plugins/distrib/libdistrib.def @@ -35,7 +35,7 @@ ; Copyright (C) 2005 Red Hat, Inc. ; All rights reserved. ; --- END COPYRIGHT BLOCK --- -DESCRIPTION 'Fedora Directory Server 7 distribution logic example' +DESCRIPTION 'Fedora Directory Server 1.0 distribution logic example' EXPORTS alpha_distribution @1 hash_distribution @2 diff --git a/ldap/servers/plugins/passthru/libpassthru.def b/ldap/servers/plugins/passthru/libpassthru.def index 3cdeefe6..0fd850f8 100644 --- a/ldap/servers/plugins/passthru/libpassthru.def +++ b/ldap/servers/plugins/passthru/libpassthru.def @@ -38,7 +38,7 @@ ; ; ; -DESCRIPTION 'Fedora Directory Server 7 Pass Through Authentication Plugin' +DESCRIPTION 'Fedora Directory Server 1.0 Pass Through Authentication Plugin' ;CODE SHARED READ EXECUTE ;DATA SHARED READ WRITE EXPORTS diff --git a/ldap/servers/plugins/presence/presence.def b/ldap/servers/plugins/presence/presence.def index d0c407c1..780c4550 100644 --- a/ldap/servers/plugins/presence/presence.def +++ b/ldap/servers/plugins/presence/presence.def @@ -36,7 +36,7 @@ ; All rights reserved. ; END COPYRIGHT BLOCK ; -DESCRIPTION 'Fedora Directory Server 7 Presence Plugin' +DESCRIPTION 'Fedora Directory Server 1.0 Presence Plugin' EXPORTS presence_init @2 plugin_init_debug_level @3 diff --git a/ldap/servers/plugins/pwdstorage/libpwdstorage.def b/ldap/servers/plugins/pwdstorage/libpwdstorage.def index dd6f9a16..07a42f2a 100644 --- a/ldap/servers/plugins/pwdstorage/libpwdstorage.def +++ b/ldap/servers/plugins/pwdstorage/libpwdstorage.def @@ -36,7 +36,7 @@ ; All rights reserved. ; END COPYRIGHT BLOCK ; -DESCRIPTION 'Fedora Directory Server 7 password storage scheme Plugin' +DESCRIPTION 'Fedora Directory Server 1.0 password storage scheme Plugin' EXPORTS sha_pwd_storage_scheme_init @2 ssha_pwd_storage_scheme_init @3 diff --git a/ldap/servers/plugins/referint/referint.def b/ldap/servers/plugins/referint/referint.def index b10ca812..97d088c5 100644 --- a/ldap/servers/plugins/referint/referint.def +++ b/ldap/servers/plugins/referint/referint.def @@ -36,7 +36,7 @@ ; All rights reserved. ; END COPYRIGHT BLOCK ; -DESCRIPTION 'Fedora Directory Server 7 Referint Plugin' +DESCRIPTION 'Fedora Directory Server 1.0 Referint Plugin' CODE SHARED READ EXECUTE DATA SHARED READ WRITE EXPORTS diff --git a/ldap/servers/plugins/replication/replication.def b/ldap/servers/plugins/replication/replication.def index e1fe647c..2019486d 100644 --- a/ldap/servers/plugins/replication/replication.def +++ b/ldap/servers/plugins/replication/replication.def @@ -38,7 +38,7 @@ ; ; ; -DESCRIPTION 'Fedora Directory Server 7.1 Replication Plugin' +DESCRIPTION 'Fedora Directory Server 1.0 Replication Plugin' ;CODE SHARED READ EXECUTE ;DATA SHARED READ WRITE EXPORTS diff --git a/ldap/servers/plugins/retrocl/retrocl.def b/ldap/servers/plugins/retrocl/retrocl.def index 63acf441..23ca9fac 100644 --- a/ldap/servers/plugins/retrocl/retrocl.def +++ b/ldap/servers/plugins/retrocl/retrocl.def @@ -38,7 +38,7 @@ ; ; -DESCRIPTION 'Fedora Directory Server 7.1 Retro-Changelog Plugin' +DESCRIPTION 'Fedora Directory Server 1.0 Retro-Changelog Plugin' ;CODE SHARED READ EXECUTE ;DATA SHARED READ WRITE EXPORTS diff --git a/ldap/servers/plugins/roles/roles.def b/ldap/servers/plugins/roles/roles.def index 5c4b5c0c..efa79acc 100644 --- a/ldap/servers/plugins/roles/roles.def +++ b/ldap/servers/plugins/roles/roles.def @@ -36,7 +36,7 @@ ; All rights reserved. ; END COPYRIGHT BLOCK ; -DESCRIPTION 'Fedora Directory Server 7.1 Roles Plugin' +DESCRIPTION 'Fedora Directory Server 1.0 Roles Plugin' EXPORTS roles_init @2 plugin_init_debug_level @3 diff --git a/ldap/servers/plugins/statechange/statechange.def b/ldap/servers/plugins/statechange/statechange.def index ad8fd5f5..553c0eea 100644 --- a/ldap/servers/plugins/statechange/statechange.def +++ b/ldap/servers/plugins/statechange/statechange.def @@ -36,7 +36,7 @@ ; All rights reserved. ; END COPYRIGHT BLOCK ; -DESCRIPTION 'Fedora Directory Server 7.1 State Change Plugin' +DESCRIPTION 'Fedora Directory Server 1.0 State Change Plugin' EXPORTS statechange_init @2 plugin_init_debug_level @3 diff --git a/ldap/servers/plugins/syntaxes/libsyntax.def b/ldap/servers/plugins/syntaxes/libsyntax.def index 9ab16505..b3da6a60 100644 --- a/ldap/servers/plugins/syntaxes/libsyntax.def +++ b/ldap/servers/plugins/syntaxes/libsyntax.def @@ -36,7 +36,7 @@ ; All rights reserved. ; END COPYRIGHT BLOCK ; -DESCRIPTION 'Fedora Directory Server 7 syntaxes Plugin' +DESCRIPTION 'Fedora Directory Server 1.0 syntaxes Plugin' EXPORTS cis_init @2 ces_init @3 diff --git a/ldap/servers/plugins/uiduniq/libuiduniq.def b/ldap/servers/plugins/uiduniq/libuiduniq.def index f8a116ad..ed05549e 100644 --- a/ldap/servers/plugins/uiduniq/libuiduniq.def +++ b/ldap/servers/plugins/uiduniq/libuiduniq.def @@ -38,7 +38,7 @@ ; ; ; -DESCRIPTION 'Fedora Directory Server 7 Unique Attribute Checking Plugin' +DESCRIPTION 'Fedora Directory Server 1.0 Unique Attribute Checking Plugin' ;CODE SHARED READ EXECUTE ;DATA SHARED READ WRITE EXPORTS diff --git a/ldap/servers/plugins/views/views.def b/ldap/servers/plugins/views/views.def index b440d1e1..b045be62 100644 --- a/ldap/servers/plugins/views/views.def +++ b/ldap/servers/plugins/views/views.def @@ -36,7 +36,7 @@ ; All rights reserved. ; END COPYRIGHT BLOCK ; -DESCRIPTION 'Fedora Directory Server 7.1 State Change Plugin' +DESCRIPTION 'Fedora Directory Server 1.0 State Change Plugin' EXPORTS views_init @2 plugin_init_debug_level @3 diff --git a/ldap/servers/slapd/libslapd.def b/ldap/servers/slapd/libslapd.def index b6401ca8..bc3fecad 100644 --- a/ldap/servers/slapd/libslapd.def +++ b/ldap/servers/slapd/libslapd.def @@ -36,7 +36,7 @@ ; All rights reserved. ; END COPYRIGHT BLOCK ; -DESCRIPTION 'Fedora Directory Server 7 Utility Library' +DESCRIPTION 'Fedora Directory Server 1 Utility Library' EXPORTS slapd_log_error_proc @2 slapd_log_audit_proc @3 diff --git a/ldap/servers/slapd/ntperfdll/nsldapctrs.ini b/ldap/servers/slapd/ntperfdll/nsldapctrs.ini index 20868364..99009713 100644 --- a/ldap/servers/slapd/ntperfdll/nsldapctrs.ini +++ b/ldap/servers/slapd/ntperfdll/nsldapctrs.ini @@ -38,14 +38,14 @@ # END COPYRIGHT BLOCK # [info] -drivername=slapd7 +drivername=slapd1 symbolfile=nsldapctrdef.h [languages] 009=English [text] -NS_OBJ_009_NAME=Fedora Directory Server 7.1 +NS_OBJ_009_NAME=Fedora Directory Server 1.0 NS_OBJ_009_HELP=Fedora Directory Server CONN_RATE_009_NAME=Client Connections/sec CONN_RATE_009_HELP=Rate of incoming client connections diff --git a/ldap/servers/slapd/ntperfdll/nsldapreg.ini b/ldap/servers/slapd/ntperfdll/nsldapreg.ini index b1ded2f5..c508130e 100644 --- a/ldap/servers/slapd/ntperfdll/nsldapreg.ini +++ b/ldap/servers/slapd/ntperfdll/nsldapreg.ini @@ -41,7 +41,7 @@ System CurrentControlSet Services - slapd7 + slapd1 Performance Close = REG_SZ CloseNSPerformanceData Collect = REG_SZ CollectNSPerformanceData diff --git a/ldap/servers/slapd/test-plugins/README b/ldap/servers/slapd/test-plugins/README index 7dbec119..6964e0fc 100644 --- a/ldap/servers/slapd/test-plugins/README +++ b/ldap/servers/slapd/test-plugins/README @@ -39,11 +39,11 @@ ---------------------------- Sample Server Plug-Ins - for Directory Server 7 + for Directory Server 1 ---------------------------- This directory contains code for some sample server plug-ins intended for -use with the Fedora Directory Server 7. +use with the Fedora Directory Server 1. NOTE: Before you compile and run these examples, make sure to change any server-specific data in the examples to diff --git a/ldap/servers/slapd/test-plugins/testbind.c b/ldap/servers/slapd/test-plugins/testbind.c index 08e12a0c..eab460a0 100644 --- a/ldap/servers/slapd/test-plugins/testbind.c +++ b/ldap/servers/slapd/test-plugins/testbind.c @@ -69,7 +69,7 @@ #include <string.h> #include "slapi-plugin.h" -Slapi_PluginDesc bindpdesc = { "test-bind", "Fedora Project", "7.1", +Slapi_PluginDesc bindpdesc = { "test-bind", "Fedora Project", "1.0", "sample bind pre-operation plugin" }; static Slapi_ComponentId *plugin_id = NULL; diff --git a/ldap/servers/slapd/test-plugins/testdatainterop.c b/ldap/servers/slapd/test-plugins/testdatainterop.c index 2c871838..648f754e 100644 --- a/ldap/servers/slapd/test-plugins/testdatainterop.c +++ b/ldap/servers/slapd/test-plugins/testdatainterop.c @@ -113,7 +113,7 @@ /* * Static variables. */ -static Slapi_PluginDesc plugindesc = { PLUGIN_NAME, "Fedora Project", "7.1", +static Slapi_PluginDesc plugindesc = { PLUGIN_NAME, "Fedora Project", "1.0", "sample pre-operation null suffix plugin" }; static Slapi_ComponentId *plugin_id = NULL; diff --git a/ldap/servers/slapd/test-plugins/testentry.c b/ldap/servers/slapd/test-plugins/testentry.c index fabb1a6e..a7b13306 100644 --- a/ldap/servers/slapd/test-plugins/testentry.c +++ b/ldap/servers/slapd/test-plugins/testentry.c @@ -90,7 +90,7 @@ nsslapd-pluginId: test-entry #include <string.h> #include "slapi-plugin.h" -Slapi_PluginDesc entrypdesc = { "test-entry", "Fedora Project", "7.1", +Slapi_PluginDesc entrypdesc = { "test-entry", "Fedora Project", "1.0", "sample entry modification plugin" }; /* Entry store plug-in function */ diff --git a/ldap/servers/slapd/test-plugins/testextendedop.c b/ldap/servers/slapd/test-plugins/testextendedop.c index 5f5b638a..8956eb51 100644 --- a/ldap/servers/slapd/test-plugins/testextendedop.c +++ b/ldap/servers/slapd/test-plugins/testextendedop.c @@ -83,7 +83,7 @@ /* OID of the extended operation handled by this plug-in */ #define MY_OID "1.2.3.4" -Slapi_PluginDesc expdesc = { "test-extendedop", "Fedora Project", "7.1", +Slapi_PluginDesc expdesc = { "test-extendedop", "Fedora Project", "1.0", "sample extended operation plugin" }; diff --git a/ldap/servers/slapd/test-plugins/testgetip.c b/ldap/servers/slapd/test-plugins/testgetip.c index 8867ee29..4d38ebc5 100644 --- a/ldap/servers/slapd/test-plugins/testgetip.c +++ b/ldap/servers/slapd/test-plugins/testgetip.c @@ -74,7 +74,7 @@ #include "slapi-plugin.h" #include "nspr.h" -Slapi_PluginDesc getippdesc = { "test-getip", "Fedora Project", "7.1", +Slapi_PluginDesc getippdesc = { "test-getip", "Fedora Project", "1.0", "sample pre-operation plugin" }; static char *netaddr2str( PRNetAddr *addrp, char *buf, size_t buflen ); diff --git a/ldap/servers/slapd/test-plugins/testplugin.def b/ldap/servers/slapd/test-plugins/testplugin.def index 8fd0d6d9..f7909f1c 100644 --- a/ldap/servers/slapd/test-plugins/testplugin.def +++ b/ldap/servers/slapd/test-plugins/testplugin.def @@ -36,7 +36,7 @@ ; All rights reserved. ; END COPYRIGHT BLOCK ; -DESCRIPTION 'Fedora Directory Server 7 test plugin' +DESCRIPTION 'Fedora Directory Server 1 test plugin' EXPORTS testentry_scramble @2 testentry_unscramble @3 diff --git a/ldap/servers/slapd/test-plugins/testpostop.c b/ldap/servers/slapd/test-plugins/testpostop.c index 7c82bf7f..f702dfc6 100644 --- a/ldap/servers/slapd/test-plugins/testpostop.c +++ b/ldap/servers/slapd/test-plugins/testpostop.c @@ -93,7 +93,7 @@ static char changelogfile[MAX_PATH+1]; static char *changelogfile = "/tmp/changelog"; #endif -Slapi_PluginDesc postoppdesc = { "test-postop", "Fedora Project", "7.1", +Slapi_PluginDesc postoppdesc = { "test-postop", "Fedora Project", "1.0", "sample post-operation plugin" }; static void write_changelog( int optype, char *dn, void *change, int flag ); diff --git a/ldap/servers/slapd/test-plugins/testpreop.c b/ldap/servers/slapd/test-plugins/testpreop.c index bc72dd03..160fe5cc 100644 --- a/ldap/servers/slapd/test-plugins/testpreop.c +++ b/ldap/servers/slapd/test-plugins/testpreop.c @@ -79,7 +79,7 @@ #include <string.h> #include "slapi-plugin.h" -Slapi_PluginDesc preoppdesc = { "test-preop", "Fedora Project", "7.1", +Slapi_PluginDesc preoppdesc = { "test-preop", "Fedora Project", "1.0", "sample pre-operation plugin" }; /* Pre-operation plug-in function */ diff --git a/ldap/servers/slapd/test-plugins/testsaslbind.c b/ldap/servers/slapd/test-plugins/testsaslbind.c index b259a80d..54722882 100644 --- a/ldap/servers/slapd/test-plugins/testsaslbind.c +++ b/ldap/servers/slapd/test-plugins/testsaslbind.c @@ -80,7 +80,7 @@ nsslapd-plugindescription: sample SASL bind pre-operation plugin #include <string.h> #include "slapi-plugin.h" -Slapi_PluginDesc saslpdesc = { "test-saslbind", "Fedora Project", "7.1", +Slapi_PluginDesc saslpdesc = { "test-saslbind", "Fedora Project", "1.0", "sample SASL bind pre-operation plugin" }; diff --git a/ldap/servers/snmp/ntagt/Makefile b/ldap/servers/snmp/ntagt/Makefile index 2e7d59ce..b0f50b98 100644 --- a/ldap/servers/snmp/ntagt/Makefile +++ b/ldap/servers/snmp/ntagt/Makefile @@ -107,7 +107,7 @@ $(AGTMMAP): $(SLAPD_ROOT)/$(AGTMMAP).c $(SLAPD_ROOT)/$(AGTMMAP).h $(SNMP_OBJS): $(SNMP_SRCS) $(SNMP_INCS) $(BINDIR)/$(SNMP_LIB): $(SNMP_OBJS) $(SNMP_RES) Makefile - $(LINK_DLL) $(LD_EXTRAS) /DEF:"nsldapagt_nt.def" /VERSION:"7" \ + $(LINK_DLL) $(LD_EXTRAS) /DEF:"nsldapagt_nt.def" /VERSION:"1" \ $(SNMP_OBJS) $(EXTRA_LIBS) $(LIBDEST)/%.$(OBJ_SUFFIX): %.cxx diff --git a/ldap/servers/snmp/ntagt/nsldapagt_nt.c b/ldap/servers/snmp/ntagt/nsldapagt_nt.c index 853ac04b..bb73dbf6 100644 --- a/ldap/servers/snmp/ntagt/nsldapagt_nt.c +++ b/ldap/servers/snmp/ntagt/nsldapagt_nt.c @@ -784,7 +784,7 @@ int MagtLoadStaticInfo(MagtStaticInfo_t *staticInfo, char *pszRootDir, int *SNMP REPLACE(staticInfo->entityDescr.val, "Fedora Directory Server"); staticInfo->entityDescr.len = strlen(staticInfo->entityDescr.val); - REPLACE(staticInfo->entityVers.val, "7"); + REPLACE(staticInfo->entityVers.val, "1"); staticInfo->entityVers.len = strlen(staticInfo->entityVers.val); REPLACE(staticInfo->entityOrg.val, "Not Available"); @@ -141,10 +141,10 @@ RPATHFLAG=../bin/slapd/lib:.:../lib:../../lib:../../../lib:../../../../lib endif endif -MAJOR_VERSION:="7" -MINOR_VERSION:="1" -MAJOR_VERSION_NOQUOTES:=7 -MINOR_VERSION_NOQUOTES:=1 +MAJOR_VERSION:="1" +MINOR_VERSION:="0" +MAJOR_VERSION_NOQUOTES:=1 +MINOR_VERSION_NOQUOTES:=0 # the LINK version is the one used for -l linking e.g. -l$(LINK_HTTPDLL_NAME) ifeq ($(BUILD_ARCH), WINNT) @@ -232,9 +232,9 @@ COMMON_OBJDIR_32= $(subst $(NS64TAG),,$(COMMON_OBJDIR)) OBJDIR=$(COMMON_OBJDIR) OBJDIR_32=$(COMMON_OBJDIR_32) DO_SEARCH=no -DIR_VERSION:=7.1 -NOSP_DIR_VERSION:=7.1 -DIR_NORM_VERSION:=7.1 +DIR_VERSION:=1.0 +NOSP_DIR_VERSION:=1.0 +DIR_NORM_VERSION:=1.0 PRODUCT_NAME="$(PRODUCTCORE) $(DIR_VERSION)" # When you change DIRSDK_VERSION or DIRSDK_VERSION_DLL_SUFFIX, you must # update all of the .exp and .def files by executing the following command: |