[Fedora-directory-commits] ldapserver/ldap/cm/newinst setup, 1.12, 1.13
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/cm/newinst
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3786/ldapserver/ldap/cm/newinst
Modified Files:
setup
Log Message:
Bug(s) fixed: 172056
Bug Description: Fix internal component versions and formats for initial
FDS 1.0 build
Reviewed by: Noriko (Thanks!)
Fix Description: Some of the naming conventions needed to change e.g.
/s/b/c/ldapconsole10ext became /fedora/components/directoryconsole/1.0.
Made the ds onlinehelp docs available to build externally. Perldap has
no zip file anymore, just the dirs we copy over. Adminserver includes
the unzipped directories - we need to fix that eventually, but in the
meantime, I made tar skip those unzipped directories. I also merged
Noriko's fix for the assecure.txt problem in setup into Fedora DS. Noriko also pointed out an unused Makefile variable.
Platforms tested: RHEL3
Flag Day: no
Doc impact: no
Index: setup
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinst/setup,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- setup 25 Oct 2005 16:55:49 -0000 1.12
+++ setup 31 Oct 2005 15:55:35 -0000 1.13
@@ -312,38 +312,43 @@
}
SSLOn() {
- for dir in `cat dssecure.txt` ; do
- if [ -f $dir/config/dse.ldif ]; then
- security=`grep -i "^nsslapd-security:" $dir/config/dse.ldif | awk '{print $1}'`
- $dir/stop-slapd
- cat $dir/config/dse.ldif | sed -e "s/\($security\) .*/\1 on/g" > $dir/config/dse.ldif.0
- mv $dir/config/dse.ldif.0 $dir/config/dse.ldif
- echo "$dir/config/dse.ldif: SSL on ..."
- echo "Restarting Directory Server: $dir/start-slapd"
- $dir/start-slapd
- fi
- done
+ if [ -f dssecure.txt ]; then
+ for dir in `cat dssecure.txt` ; do
+ if [ -f $dir/config/dse.ldif ]; then
+ security=`grep -i "^nsslapd-security:" $dir/config/dse.ldif | awk '{print $1}'`
+ $dir/stop-slapd
+ cat $dir/config/dse.ldif | sed -e "s/\($security\) .*/\1 on/g" > $dir/config/dse.ldif.0
+ mv $dir/config/dse.ldif.0 $dir/config/dse.ldif
+ echo "$dir/config/dse.ldif: SSL on ..."
+ echo "Restarting Directory Server: $dir/start-slapd"
+ $dir/start-slapd
+ fi
+ done
+ rm -f dssecure.txt > /dev/null 2>&1
+ fi
if [ $isadminsslon -ne 0 ]; then
$sroot/stop-admin
fi
- for confline in `cat assecure.txt` ; do
- conffile=`echo $confline | awk -F= '{print $1}'`
- confparam=`echo $confline | awk -F= '{print $2}'`
- echo $conffile | grep "\.xml$" > /dev/null 2>&1
- rval=$?
- if [ $rval -eq 0 ]; then
- adminXmlSSLOn $conffile $confparam
- else
- adminSSLOn $conffile $confparam
- fi
- done
+ if [ -f assecure.txt ]; then
+ for confline in `cat assecure.txt` ; do
+ conffile=`echo $confline | awk -F= '{print $1}'`
+ confparam=`echo $confline | awk -F= '{print $2}'`
+ echo $conffile | grep "\.xml$" > /dev/null 2>&1
+ rval=$?
+ if [ $rval -eq 0 ]; then
+ adminXmlSSLOn $conffile $confparam
+ else
+ adminSSLOn $conffile $confparam
+ fi
+ done
+ rm -f assecure.txt > /dev/null 2>&1
+ fi
if [ $isadminsslon -ne 0 ]; then
echo "Restarting Administration Server: $sroot/start-admin"
$sroot/start-admin
fi
- rm -f dssecure.txt assecure.txt > /dev/null 2>&1
}
# check whether it is an in-place installation
@@ -362,7 +367,7 @@
suitespotgroup=`ls -l $sroot/$dsinst/config/dse.ldif | awk '{print $4}'`
admindomain=`echo $ldaphost | awk -F. '{print $5 ? $2 "." $3 "." $4 "." $5: $4 ? $2 "." $3 "." $4 : $3 ? $2 "." $3 : $2 ? $2 : ""}'`
if [ "$admindomain" = "" ]; then
- admindomain=`domainname`
+ admindomain=`domainname`
fi
echo "In order to reconfigure your installation, the Configuration Directory"
@@ -376,8 +381,8 @@
echo "administrator ID: $siepid"
siepasswd=""
while [ "$siepasswd" = "" ]; do
- printf "Password: "
- read siepasswd
+ printf "Password: "
+ read siepasswd
done
inffile=$sroot/setup/myinstall.inf
17 years, 7 months
[Fedora-directory-commits] ldapserver/ldap/cm Makefile,1.39,1.40
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/cm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3786/ldapserver/ldap/cm
Modified Files:
Makefile
Log Message:
Bug(s) fixed: 172056
Bug Description: Fix internal component versions and formats for initial
FDS 1.0 build
Reviewed by: Noriko (Thanks!)
Fix Description: Some of the naming conventions needed to change e.g.
/s/b/c/ldapconsole10ext became /fedora/components/directoryconsole/1.0.
Made the ds onlinehelp docs available to build externally. Perldap has
no zip file anymore, just the dirs we copy over. Adminserver includes
the unzipped directories - we need to fix that eventually, but in the
meantime, I made tar skip those unzipped directories. I also merged
Noriko's fix for the assecure.txt problem in setup into Fedora DS. Noriko also pointed out an unused Makefile variable.
Platforms tested: RHEL3
Flag Day: no
Doc impact: no
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/Makefile,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- Makefile 29 Oct 2005 02:21:51 -0000 1.39
+++ Makefile 31 Oct 2005 15:55:29 -0000 1.40
@@ -70,6 +70,8 @@
MMDD = $(shell date +%m.%d)
+TMPLIST := $(shell echo /tmp/build.$$$$)
+
# we don't want to build with warnings-as-errors for the cm/ stuff, because
# it's crappy C++ code which is LITTERED with warnings, most of which we
# can't fix because it comes from files in dist/, etc.
@@ -483,16 +485,24 @@
# docs
-$(RM) -r $(RELDIR)/manual/en/slapd
-$(MKDIR) $(RELDIR)/manual/en/slapd
- if [ "$(DSDOC_DIR)" -a -d "$(DSDOC_DIR)" ] ; then \
+# copy over the manual files built in our build tree
+ if [ -d "$(OBJDIR)/manual/slapd" ] ; then \
$(INSTALL) -m 644 $(OBJDIR)/manual/slapd/help/*.* $(RELDIR)/manual/en/slapd/help ; \
$(INSTALL) -m 644 $(OBJDIR)/manual/slapd/index.map $(RELDIR)/manual/en/slapd/ ; \
$(INSTALL) -m 644 $(OBJDIR)/manual/slapd/index.htm $(RELDIR)/manual/en/slapd/ ; \
$(INSTALL) -m 644 $(OBJDIR)/manual/slapd/pixel.gif $(RELDIR)/manual/en/slapd/ ; \
$(INSTALL) -m 644 $(OBJDIR)/manual/slapd/topicindex.htm $(RELDIR)/manual/en/slapd/ ; \
$(INSTALL) -m 644 $(OBJDIR)/manual/slapd/tokens.map $(RELDIR)/manual/en/slapd/ ; \
+ fi
+# copy the manual files from the zip files or checked out directory
+ if [ "$(DSDOC_DIR)" -a -d "$(DSDOC_DIR)" ] ; then \
cd $(RELDIR)/manual/en/slapd; \
- $(UNZIP) $(DSDOC_DIR)/$(DSDOC_COPYRIGHT); \
- $(UNZIP) $(DSDOC_DIR)/$(DSDOC_CLIENTS); \
+ if [ -f $(DSDOC_DIR)/$(DSDOC_COPYRIGHT) ] ; then \
+ $(UNZIP) $(DSDOC_DIR)/$(DSDOC_COPYRIGHT); \
+ $(UNZIP) $(DSDOC_DIR)/$(DSDOC_CLIENTS); \
+ else \
+ cp -r $(DSDOC_DIR) . ; \
+ fi ; \
fi
ifdef USE_PURIFY
@@ -651,7 +661,6 @@
for file in $(ADMINSERVER_SUBCOMPS) ; \
do rm -rf $(INSTDIR)/$$file ; \
cp -r $(ADMSERV_DIR)/$$file $(INSTDIR)/$$file ; \
- rm -rf $(INSTDIR)/$$file/unzipped ; \
done ; \
fi
@@ -685,8 +694,11 @@
# $(REMSH) "/u/svbld/bin/preRtm $(BUILD_SHIP) $(FTPNAMEGZ) svbld"
endif
else
+ echo base/unzipped > $(TMPLIST)
+ echo admin/unzipped >> $(TMPLIST)
cd $(INSTDIR); $(TAR) cvfh - setup.inf setup slapd \
- dsktune $(ADMIN_IMPORTS) | gzip -f > ../all$(NS_BUILD_FLAVOR).tar.gz
+ dsktune $(ADMIN_IMPORTS) -X $(TMPLIST) | gzip -f > ../all$(NS_BUILD_FLAVOR).tar.gz
+ rm -f $(TMPLIST)
endif # BUILD_SHIP
#cp $(INSTDIR).tar.gz $(BUILD_SHIP)
#cp $(INSTDIR)/all$(NS_BUILD_FLAVOR).tar.gz $(BUILD_SHIP)
17 years, 7 months
[Fedora-directory-commits] ldapserver buildpaths.mk, 1.8, 1.9 component_versions.mk, 1.39, 1.40 components.mk, 1.34, 1.35 internal_comp_deps.mk, 1.29, 1.30
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3786/ldapserver
Modified Files:
buildpaths.mk component_versions.mk components.mk
internal_comp_deps.mk
Log Message:
Bug(s) fixed: 172056
Bug Description: Fix internal component versions and formats for initial
FDS 1.0 build
Reviewed by: Noriko (Thanks!)
Fix Description: Some of the naming conventions needed to change e.g.
/s/b/c/ldapconsole10ext became /fedora/components/directoryconsole/1.0.
Made the ds onlinehelp docs available to build externally. Perldap has
no zip file anymore, just the dirs we copy over. Adminserver includes
the unzipped directories - we need to fix that eventually, but in the
meantime, I made tar skip those unzipped directories. I also merged
Noriko's fix for the assecure.txt problem in setup into Fedora DS. Noriko also pointed out an unused Makefile variable.
Platforms tested: RHEL3
Flag Day: no
Doc impact: no
Index: buildpaths.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/buildpaths.mk,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- buildpaths.mk 29 Oct 2005 02:21:40 -0000 1.8
+++ buildpaths.mk 31 Oct 2005 15:55:24 -0000 1.9
@@ -141,3 +141,5 @@
DSMLGWJARS_BUILD_DIR = $(BUILD_ROOT)/../dsmlgwjars
PERLDAP_SOURCE_ROOT = $(MOZILLA_SOURCE_ROOT)
+
+ONLINEHELP_SOURCE_ROOT = $(BUILD_ROOT)/../dsonlinehelp
Index: component_versions.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/component_versions.mk,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- component_versions.mk 29 Oct 2005 02:25:50 -0000 1.39
+++ component_versions.mk 31 Oct 2005 15:55:24 -0000 1.40
@@ -161,14 +161,14 @@
LDAPCONSOLE_REL=10
endif
ifndef LDAPCONSOLE_COMP
- LDAPCONSOLE_COMP = ldapconsole$(LDAPCONSOLE_REL)
+ LDAPCONSOLE_COMP = directoryconsole
endif
ifndef LDAPCONSOLE_RELDATE
- LDAPCONSOLE_RELDATE=20051028
+ LDAPCONSOLE_RELDATE=1.0/20051028
endif
ifndef PERLDAP_VERSION
- PERLDAP_VERSION=20051028
+ PERLDAP_VERSION=1.5/20051028
endif
ifndef JSS_COMP
@@ -205,7 +205,7 @@
# DOC
ifndef DSDOC_RELDATE
- DSDOC_RELDATE = 20050311
+ DSDOC_RELDATE = 20051028
endif
# WIX
Index: components.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/components.mk,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- components.mk 29 Oct 2005 02:21:40 -0000 1.34
+++ components.mk 31 Oct 2005 15:55:24 -0000 1.35
@@ -576,6 +576,29 @@
LDAPCONSOLEJAR = ds$(LDAPCONSOLE_REL).jar
LDAPCONSOLEJAR_EN = ds$(LDAPCONSOLE_REL)_en.jar
+#### online help docs ######
+ifndef ONLINEHELP_SOURCE_ROOT
+ DSDOC_DIR = $(ABS_ROOT)/../dist/dsdoc
+else
+ DSDOC_DIR = $(ONLINEHELP_SOURCE_ROOT)
+endif
+DSDOC_CLIENTS = slapd_clients.zip
+DSDOC_COPYRIGHT = slapd_copyright.zip
+
+########### PerLDAP #############
+ifdef PERLDAP_SOURCE_ROOT
+ PERLDAP_BUILT_DIR = $(PERLDAP_SOURCE_ROOT)/directory/perldap/blib
+# else set in internal_buildpaths.mk and pulled in internal_comp_deps.mk
+endif
+
+PERLDAP_ARCHLIB_DIR = $(PERLDAP_BUILT_DIR)/arch
+PERLDAP_LIB_DIR = $(PERLDAP_BUILT_DIR)/lib/Mozilla
+PERLDAP_AUTOLIB_DIR = $(PERLDAP_BUILT_DIR)/lib/auto
+# under the serverroot/lib directory, we should have a perl directory which contains arch/, auto/, and Mozilla/
+PACKAGE_SRC_DEST += $(PERLDAP_ARCHLIB_DIR) lib/perl
+PACKAGE_SRC_DEST += $(PERLDAP_LIB_DIR) lib/perl
+PACKAGE_SRC_DEST += $(PERLDAP_AUTOLIB_DIR) lib/perl
+
# must define dependencies last because they depend on the definitions above
ifeq ($(INTERNAL_BUILD), 1)
include $(BUILD_ROOT)/internal_comp_deps.mk
@@ -747,17 +770,3 @@
else
-@echo "MAVEN is not required except on Windows."
endif #WINNT
-
-########### PerLDAP #############
-ifdef PERLDAP_SOURCE_ROOT
- PERLDAP_BUILT_DIR = $(PERLDAP_SOURCE_ROOT)/directory/perldap/blib
-# else set in internal_buildpaths.mk and pulled in internal_comp_deps.mk
-endif
-
-PERLDAP_ARCHLIB_DIR = $(PERLDAP_BUILT_DIR)/arch
-PERLDAP_LIB_DIR = $(PERLDAP_BUILT_DIR)/lib/Mozilla
-PERLDAP_AUTOLIB_DIR = $(PERLDAP_BUILT_DIR)/lib/auto
-# under the serverroot/lib directory, we should have a perl directory which contains arch/, auto/, and Mozilla/
-PACKAGE_SRC_DEST += $(PERLDAP_ARCHLIB_DIR) lib/perl
-PACKAGE_SRC_DEST += $(PERLDAP_LIB_DIR) lib/perl
-PACKAGE_SRC_DEST += $(PERLDAP_AUTOLIB_DIR) lib/perl
Index: internal_comp_deps.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/internal_comp_deps.mk,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- internal_comp_deps.mk 29 Oct 2005 02:25:50 -0000 1.29
+++ internal_comp_deps.mk 31 Oct 2005 15:55:24 -0000 1.30
@@ -327,8 +327,8 @@
ADMINUTIL_IMPORT=$(COMPONENTS_DIR)/${ADMINUTIL_BASE}/$(NSOBJDIR_NAME)
# ADMINUTIL_IMPORT=$(COMPONENTS_DIR_DEV)/${ADMINUTIL_BASE}/$(NSOBJDIR_NAME)
else
- ADMINUTIL_IMPORT=$(COMPONENTS_DIR)/${ADMINUTIL_BASE}/$(NSOBJDIR_NAME)
-# ADMINUTIL_IMPORT=$(FED_COMPONENTS_DIR)/${ADMINUTIL_BASE}/$(NSOBJDIR_NAME)
+# ADMINUTIL_IMPORT=$(COMPONENTS_DIR)/${ADMINUTIL_BASE}/$(NSOBJDIR_NAME)
+ ADMINUTIL_IMPORT=$(FED_COMPONENTS_DIR)/${ADMINUTIL_BASE}/$(NSOBJDIR_NAME)
endif
ADMINUTIL_BUILD_DIR=$(NSCP_DISTDIR_FULL_RTL)/adminutil
@@ -550,8 +550,12 @@
###########################################################
#LDAPCONSOLE_RELEASE=$(COMPONENTS_DIR_DEV)
+ifeq ($(BUILD_MODE), int)
LDAPCONSOLE_RELEASE=$(COMPONENTS_DIR)
-LDAPCONSOLE_JARDIR = $(LDAPCONSOLE_RELEASE)/ldapconsole/$(LDAPCONSOLE_COMP)$(BUILD_MODE)/$(LDAPCONSOLE_RELDATE)/jars
+else
+LDAPCONSOLE_RELEASE=$(FED_COMPONENTS_DIR)
+endif
+LDAPCONSOLE_JARDIR = $(LDAPCONSOLE_RELEASE)/$(LDAPCONSOLE_COMP)/$(LDAPCONSOLE_RELDATE)/jars
LDAPCONSOLE_DEP = $(LDAPCONSOLE_DIR)/$(LDAPCONSOLEJAR)
LDAPCONSOLE_FILES=$(LDAPCONSOLEJAR),$(LDAPCONSOLEJAR_EN)
@@ -573,7 +577,11 @@
### Perldap package #######################################
#PERLDAP_COMPONENT_DIR = $(COMPONENTS_DIR_DEV)/perldap/$(PERLDAP_VERSION)/$(NSOBJDIR_NAME_32)
-PERLDAP_COMPONENT_DIR = $(COMPONENTS_DIR)/perldap/$(PERLDAP_VERSION)/$(NSOBJDIR_NAME_32)
+ifeq ($(BUILD_MODE), int)
+PERLDAP_COMPONENT_DIR = $(COMPONENTS_DIR_DEV)/perldap/$(PERLDAP_VERSION)/$(NSOBJDIR_NAME_32)
+else
+PERLDAP_COMPONENT_DIR = $(FED_COMPONENTS_DIR)/perldap/$(PERLDAP_VERSION)/$(NSOBJDIR_NAME_32)
+endif
PERLDAP_FILES=lib,arch
PERLDAP_DEP = $(PERLDAP_BUILT_DIR)/lib
@@ -584,12 +592,12 @@
$(PERLDAP_DEP):
ifdef INTERNAL_BUILD
- $(RM) $@
+ $(RM) -rf $@
$(FTP_PULL) -method $(PERLDAP_PULL_METHOD) \
-objdir $(dir $@) \
-componentdir $(PERLDAP_COMPONENT_DIR) \
-files $(PERLDAP_FILES)
- @if [ ! -f $@ ] ; \
+ @if [ ! -d $@ ] ; \
then echo "Error: could not get component PERLDAP file $@" ; \
exit 1 ; \
fi
@@ -603,12 +611,15 @@
#ADMIN_FILE = adminserver.tar.gz
ADMIN_FILE = $(subst $(SPACE),$(COMMA),$(ADMINSERVER_SUBCOMPS))
ADMIN_FILE_TAR = adminserver.tar
+ifeq ($(BUILD_MODE), int)
IMPORTADMINSRV_BASE=$(COMPONENTS_DIR_DEV)/$(ADMIN_REL)/$(ADMIN_REL_DATE)
-IMPORTADMINSRV = $(IMPORTADMINSRV_BASE)/$(NSOBJDIR_NAME_32)
+else
+IMPORTADMINSRV_BASE=$(FED_COMPONENTS_DIR)/$(ADMIN_REL)/$(ADMIN_REL_DATE)
+endif
+IMPORTADMINSRV = $(IMPORTADMINSRV_BASE)/$(NSOBJDIR_NAME)
ADMSERV_DEP = $(ADMSERV_DIR)/admin/admin.inf
ADM_VERSION = $(ADM_RELDATE)
-ADM_RELEASE = $(COMPONENTS_DIR)/$(ADM_VERSDIR)/$(ADM_VERSION)/$(NSOBJDIR_NAME)
ifndef ADMSERV_PULL_METHOD
ADMSERV_PULL_METHOD = $(COMPONENT_PULL_METHOD)
@@ -632,13 +643,14 @@
### DOCS #################################
# this is where the build looks for slapd docs
-DSDOC_DIR = $(ABS_ROOT)/../dist/dsdoc
-DSDOC_VERSDIR = $(DIR_NORM_VERSION)$(BUILD_MODE)
-#DSDOC_RELEASE = $(COMPONENTS_DIR_DEV)/ldapserverdoc/$(DSDOC_VERSDIR)/$(DSDOC_RELDATE)
-DSDOC_RELEASE = $(COMPONENTS_DIR)/ldapserverdoc/$(DSDOC_VERSDIR)/$(DSDOC_RELDATE)
+DSDOC_VERSDIR = $(DIR_NORM_VERSION)
+ifeq ($(BUILD_MODE), int)
+#DSDOC_RELEASE = $(COMPONENTS_DIR_DEV)/ldapserverdoc/$(DIR_NORM_VERSION)/$(DSDOC_RELDATE)
+DSDOC_RELEASE = $(COMPONENTS_DIR)/ldapserverdoc/$(DIR_NORM_VERSION)/$(DSDOC_RELDATE)
+else
+DSDOC_RELEASE = $(FED_COMPONENTS_DIR)/ldapserverdoc/$(DIR_NORM_VERSION)/$(DSDOC_RELDATE)
+endif
-DSDOC_CLIENTS = slapd_clients.zip
-DSDOC_COPYRIGHT = slapd_copyright.zip
DSDOC_FILES = $(DSDOC_COPYRIGHT),$(DSDOC_CLIENTS)
DSDOC_DEP := $(DSDOC_DIR)/$(DSDOC_COPYRIGHT)
17 years, 7 months
[Fedora-directory-commits] ldapserver/ldap/servers/snmp/ntagt Makefile, 1.5, 1.6 nsldapagt_nt.c, 1.7, 1.8
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/servers/snmp/ntagt
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21454/ldapserver/ldap/servers/snmp/ntagt
Modified Files:
Makefile nsldapagt_nt.c
Log Message:
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
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/snmp/ntagt/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Makefile 19 Apr 2005 22:07:43 -0000 1.5
+++ Makefile 29 Oct 2005 02:28:24 -0000 1.6
@@ -107,7 +107,7 @@
$(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
Index: nsldapagt_nt.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/snmp/ntagt/nsldapagt_nt.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- nsldapagt_nt.c 19 Apr 2005 22:07:43 -0000 1.7
+++ nsldapagt_nt.c 29 Oct 2005 02:28:24 -0000 1.8
@@ -784,7 +784,7 @@
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");
17 years, 7 months
[Fedora-directory-commits] ldapserver/ldap/servers/slapd/test-plugins README, 1.6, 1.7 testbind.c, 1.5, 1.6 testdatainterop.c, 1.5, 1.6 testentry.c, 1.5, 1.6 testextendedop.c, 1.5, 1.6 testgetip.c, 1.5, 1.6 testplugin.def, 1.6, 1.7 testpostop.c, 1.5, 1.6 testpreop.c, 1.6, 1.7 testsaslbind.c, 1.7, 1.8
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21454/ldapserver/ldap/servers/slapd/test-plugins
Modified Files:
README testbind.c testdatainterop.c testentry.c
testextendedop.c testgetip.c testplugin.def testpostop.c
testpreop.c testsaslbind.c
Log Message:
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
Index: README
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins/README,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- README 19 Apr 2005 22:07:41 -0000 1.6
+++ README 29 Oct 2005 02:28:18 -0000 1.7
@@ -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
Index: testbind.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins/testbind.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- testbind.c 9 Jun 2005 17:42:14 -0000 1.5
+++ testbind.c 29 Oct 2005 02:28:18 -0000 1.6
@@ -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;
Index: testdatainterop.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins/testdatainterop.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- testdatainterop.c 9 Jun 2005 17:42:14 -0000 1.5
+++ testdatainterop.c 29 Oct 2005 02:28:18 -0000 1.6
@@ -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;
Index: testentry.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins/testentry.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- testentry.c 9 Jun 2005 17:42:14 -0000 1.5
+++ testentry.c 29 Oct 2005 02:28:18 -0000 1.6
@@ -90,7 +90,7 @@
#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 */
Index: testextendedop.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins/testextendedop.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- testextendedop.c 9 Jun 2005 17:42:14 -0000 1.5
+++ testextendedop.c 29 Oct 2005 02:28:18 -0000 1.6
@@ -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" };
Index: testgetip.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins/testgetip.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- testgetip.c 9 Jun 2005 17:42:14 -0000 1.5
+++ testgetip.c 29 Oct 2005 02:28:18 -0000 1.6
@@ -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 );
Index: testplugin.def
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins/testplugin.def,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- testplugin.def 19 Apr 2005 22:07:41 -0000 1.6
+++ testplugin.def 29 Oct 2005 02:28:18 -0000 1.7
@@ -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
Index: testpostop.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins/testpostop.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- testpostop.c 9 Jun 2005 17:42:14 -0000 1.5
+++ testpostop.c 29 Oct 2005 02:28:18 -0000 1.6
@@ -93,7 +93,7 @@
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 );
Index: testpreop.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins/testpreop.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- testpreop.c 24 Jun 2005 01:19:40 -0000 1.6
+++ testpreop.c 29 Oct 2005 02:28:18 -0000 1.7
@@ -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 */
Index: testsaslbind.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins/testsaslbind.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- testsaslbind.c 9 Jun 2005 17:42:14 -0000 1.7
+++ testsaslbind.c 29 Oct 2005 02:28:18 -0000 1.8
@@ -80,7 +80,7 @@
#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" };
17 years, 7 months
[Fedora-directory-commits] ldapserver/ldap/servers/slapd/ntperfdll nsldapctrs.ini, 1.6, 1.7 nsldapreg.ini, 1.4, 1.5
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/ntperfdll
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21454/ldapserver/ldap/servers/slapd/ntperfdll
Modified Files:
nsldapctrs.ini nsldapreg.ini
Log Message:
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
Index: nsldapctrs.ini
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/ntperfdll/nsldapctrs.ini,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- nsldapctrs.ini 19 Apr 2005 22:07:40 -0000 1.6
+++ nsldapctrs.ini 29 Oct 2005 02:28:13 -0000 1.7
@@ -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
Index: nsldapreg.ini
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/ntperfdll/nsldapreg.ini,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nsldapreg.ini 19 Apr 2005 22:07:40 -0000 1.4
+++ nsldapreg.ini 29 Oct 2005 02:28:13 -0000 1.5
@@ -41,7 +41,7 @@
System
CurrentControlSet
Services
- slapd7
+ slapd1
Performance
Close = REG_SZ CloseNSPerformanceData
Collect = REG_SZ CollectNSPerformanceData
17 years, 7 months
[Fedora-directory-commits] ldapserver/ldap/servers/slapd libslapd.def, 1.13, 1.14
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21454/ldapserver/ldap/servers/slapd
Modified Files:
libslapd.def
Log Message:
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
Index: libslapd.def
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/libslapd.def,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libslapd.def 9 Sep 2005 00:51:52 -0000 1.13
+++ libslapd.def 29 Oct 2005 02:28:07 -0000 1.14
@@ -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
17 years, 7 months
[Fedora-directory-commits] ldapserver/ldap/servers/plugins/views views.def, 1.6, 1.7
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/views
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21454/ldapserver/ldap/servers/plugins/views
Modified Files:
views.def
Log Message:
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
Index: views.def
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/views/views.def,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- views.def 19 Apr 2005 22:07:36 -0000 1.6
+++ views.def 29 Oct 2005 02:28:02 -0000 1.7
@@ -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
17 years, 7 months
[Fedora-directory-commits] ldapserver/ldap/servers/plugins/uiduniq libuiduniq.def, 1.6, 1.7
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/uiduniq
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21454/ldapserver/ldap/servers/plugins/uiduniq
Modified Files:
libuiduniq.def
Log Message:
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
Index: libuiduniq.def
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/uiduniq/libuiduniq.def,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libuiduniq.def 19 Apr 2005 22:07:35 -0000 1.6
+++ libuiduniq.def 29 Oct 2005 02:27:56 -0000 1.7
@@ -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
17 years, 7 months
[Fedora-directory-commits] ldapserver/ldap/servers/plugins/syntaxes libsyntax.def, 1.6, 1.7
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/syntaxes
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21454/ldapserver/ldap/servers/plugins/syntaxes
Modified Files:
libsyntax.def
Log Message:
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
Index: libsyntax.def
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/syntaxes/libsyntax.def,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libsyntax.def 19 Apr 2005 22:07:35 -0000 1.6
+++ libsyntax.def 29 Oct 2005 02:27:51 -0000 1.7
@@ -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
17 years, 7 months