summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rw-r--r--include/version.h4
-rw-r--r--ldap/docs/README.txt2
-rw-r--r--ldap/servers/slapd/test-plugins/testbind.c2
-rw-r--r--ldap/servers/slapd/test-plugins/testdatainterop.c2
-rw-r--r--ldap/servers/slapd/test-plugins/testentry.c2
-rw-r--r--ldap/servers/slapd/test-plugins/testextendedop.c2
-rw-r--r--ldap/servers/slapd/test-plugins/testgetip.c2
-rw-r--r--ldap/servers/slapd/test-plugins/testpostop.c2
-rw-r--r--ldap/servers/slapd/test-plugins/testpreop.c2
-rw-r--r--ldap/servers/slapd/test-plugins/testsaslbind.c2
-rw-r--r--nsdefs.mk4
12 files changed, 14 insertions, 14 deletions
diff --git a/Makefile b/Makefile
index 55552774..ec9118fa 100644
--- a/Makefile
+++ b/Makefile
@@ -360,7 +360,7 @@ fedora-ds.spec: ldapserver.spec.tmpl
-e 's/@COMPANY-PRODUCT-NAME@/Fedora Directory Server/g' \
-e 's/@LCASE-COMPANY-NAME-NOSP@/fedora/g' \
-e 's/@GEN-VERSION@/1.0/g' \
- -e 's/@NOSP-VERSION@/1.0.3/g' \
+ -e 's/@NOSP-VERSION@/1.0.4/g' \
-e 's+@COMPANY-URL@+http://directory.fedora.redhat.com/+g' \
ldapserver.spec.tmpl > $@
mv $@ $(OBJDIR)
diff --git a/include/version.h b/include/version.h
index 73ccc7a2..80237258 100644
--- a/include/version.h
+++ b/include/version.h
@@ -44,9 +44,9 @@
exist, the PRODUCT_VERSION define has _DEF appended.
*/
-#define DIRECTORY_VERSION_DEF "1.0.3"
+#define DIRECTORY_VERSION_DEF "1.0.4"
#define DIRECTORY_COMPATIBLE "3.0"
-#define DIRECTORY_VERSION_STRING "Fedora-DirServer/1.0.3"
+#define DIRECTORY_VERSION_STRING "Fedora-DirServer/1.0.4"
#define DS_VERSION_DEF DIRECTORY_VERSION_DEF
#define DS_VERSION_STRING DIRECTORY_VERSION_STRING
diff --git a/ldap/docs/README.txt b/ldap/docs/README.txt
index ceffd251..f5c2bda2 100644
--- a/ldap/docs/README.txt
+++ b/ldap/docs/README.txt
@@ -1,5 +1,5 @@
=======================================================================
- Fedora Directory Server 1.0.3
+ Fedora Directory Server 1.0.4
=======================================================================
The Fedora Directory Server is subject to the terms detailed in the
diff --git a/ldap/servers/slapd/test-plugins/testbind.c b/ldap/servers/slapd/test-plugins/testbind.c
index 1b2bed98..3419a66e 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", "1.0.3",
+Slapi_PluginDesc bindpdesc = { "test-bind", "Fedora Project", "1.0.4",
"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 f855c47d..4f7e64f9 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", "1.0.3",
+static Slapi_PluginDesc plugindesc = { PLUGIN_NAME, "Fedora Project", "1.0.4",
"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 c8aa0373..87a0b0a3 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", "1.0.3",
+Slapi_PluginDesc entrypdesc = { "test-entry", "Fedora Project", "1.0.4",
"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 f4d11137..38574c5b 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", "1.0.3",
+Slapi_PluginDesc expdesc = { "test-extendedop", "Fedora Project", "1.0.4",
"sample extended operation plugin" };
diff --git a/ldap/servers/slapd/test-plugins/testgetip.c b/ldap/servers/slapd/test-plugins/testgetip.c
index 432fb127..724d96b7 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", "1.0.3",
+Slapi_PluginDesc getippdesc = { "test-getip", "Fedora Project", "1.0.4",
"sample pre-operation plugin" };
static char *netaddr2str( PRNetAddr *addrp, char *buf, size_t buflen );
diff --git a/ldap/servers/slapd/test-plugins/testpostop.c b/ldap/servers/slapd/test-plugins/testpostop.c
index 0a4cda37..cb035e7f 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", "1.0.3",
+Slapi_PluginDesc postoppdesc = { "test-postop", "Fedora Project", "1.0.4",
"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 03cf46b9..e8fb8836 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", "1.0.3",
+Slapi_PluginDesc preoppdesc = { "test-preop", "Fedora Project", "1.0.4",
"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 13ebd272..b68965a4 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", "1.0.3",
+Slapi_PluginDesc saslpdesc = { "test-saslbind", "Fedora Project", "1.0.4",
"sample SASL bind pre-operation plugin" };
diff --git a/nsdefs.mk b/nsdefs.mk
index 04835286..09de1e09 100644
--- a/nsdefs.mk
+++ b/nsdefs.mk
@@ -227,8 +227,8 @@ COMMON_OBJDIR_32= $(subst $(NS64TAG),,$(COMMON_OBJDIR))
OBJDIR=$(COMMON_OBJDIR)
OBJDIR_32=$(COMMON_OBJDIR_32)
DO_SEARCH=no
-DIR_VERSION:=1.0.3
-NOSP_DIR_VERSION:=1.0.3
+DIR_VERSION:=1.0.4
+NOSP_DIR_VERSION:=1.0.4
DIR_NORM_VERSION:=1.0
PRODUCT_NAME="$(PRODUCTCORE) $(DIR_VERSION)"
# When you change DIRSDK_VERSION or DIRSDK_VERSION_DLL_SUFFIX, you must