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

13 files changed, 15 insertions, 15 deletions

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" };