[Fedora-directory-commits] onlinehelp - Imported sources
by Doctor Conrad
Author: foxworth
Update of /cvs/dirsec/onlinehelp
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12315
Log Message:
Import Fedora Directory on-line help files to Fedora CVS
Status:
Vendor Tag: FedoraDSHelp
Release Tags: start
N onlinehelp/adminconsole/html/en/tokens.map
N onlinehelp/adminconsole/html/en/dochome.htm
N onlinehelp/adminconsole/html/en/sniffer.js
N onlinehelp/adminconsole/html/en/index.map
N onlinehelp/adminconsole/html/en/help/certificate_request_wizard_requestor_information.htm
N onlinehelp/adminconsole/html/en/help/install_security_module.htm
N onlinehelp/adminconsole/html/en/help/edit_aci_users_groups.htm
N onlinehelp/adminconsole/html/en/help/add_edit_manager.htm
N onlinehelp/adminconsole/html/en/help/migrate_server_configuration.htm
N onlinehelp/adminconsole/html/en/help/manage_certificates_ca_certs.htm
N onlinehelp/adminconsole/html/en/help/select_font.htm
N onlinehelp/adminconsole/html/en/help/server_group_information.htm
N onlinehelp/adminconsole/html/en/help/cipher_preference_ssl_2.0.htm
N onlinehelp/adminconsole/html/en/help/certificate_install_wizard_certificate_type.htm
N onlinehelp/adminconsole/html/en/help/create_user_administrator.htm
N onlinehelp/adminconsole/html/en/help/certificate_request_wizard_request_submission.htm
N onlinehelp/adminconsole/html/en/help/create_organizational_unit_languages_with_pronunciation.htm
N onlinehelp/adminconsole/html/en/help/certificate_install_wizard_certificate_information.htm
N onlinehelp/adminconsole/html/en/help/set_permission_dialog.htm
N onlinehelp/adminconsole/html/en/help/change_security_device_password.htm
N onlinehelp/adminconsole/html/en/help/certificate_install_wizard_certificate_location.htm
N onlinehelp/adminconsole/html/en/help/construct_ldap_url.htm
N onlinehelp/adminconsole/html/en/help/preferences_ui_permissions.htm
N onlinehelp/adminconsole/html/en/help/configure_administration_server_user_ds.htm
N onlinehelp/adminconsole/html/en/help/topics.htm
N onlinehelp/adminconsole/html/en/help/add_crl_ckl.htm
N onlinehelp/adminconsole/html/en/help/replication_monitor.html
N onlinehelp/adminconsole/html/en/help/migrate_keys_and_certificates.htm
N onlinehelp/adminconsole/html/en/help/access_permissions_help.htm
N onlinehelp/adminconsole/html/en/help/configure_administration_server_configuration_ds.htm
N onlinehelp/adminconsole/html/en/help/merge_configuration_directory_server_information.htm
N onlinehelp/adminconsole/html/en/help/edit_aci_rights.htm
N onlinehelp/adminconsole/html/en/help/edit_aci_manual_mode.htm
N onlinehelp/adminconsole/html/en/help/certificate_request_wizard_introduction.htm
N onlinehelp/adminconsole/html/en/help/certificate_information_certification_path.htm
N onlinehelp/adminconsole/html/en/help/search_users_and_groups_advanced.htm
N onlinehelp/adminconsole/html/en/help/certificate_request_install_wizard_token_password.htm
N onlinehelp/adminconsole/html/en/help/add_edit_ip_address.htm
N onlinehelp/adminconsole/html/en/help/set_security_device_password_change_security_device_password.htm
N onlinehelp/adminconsole/html/en/help/preferences_settings.htm
N onlinehelp/adminconsole/html/en/help/add_users_and_groups.htm
N onlinehelp/adminconsole/html/en/help/security_warning.htm
N onlinehelp/adminconsole/html/en/help/host_information.htm
N onlinehelp/adminconsole/html/en/help/create_group_members_static_group.htm
N onlinehelp/adminconsole/html/en/help/administration_express.htm
N onlinehelp/adminconsole/html/en/help/edit_view.htm
N onlinehelp/adminconsole/html/en/help/create_user_administrator_nt_user.htm
N onlinehelp/adminconsole/html/en/help/preferences_fonts.htm
N onlinehelp/adminconsole/html/en/help/select_server_for_migration.htm
N onlinehelp/adminconsole/html/en/help/create_organizational_unit_languages.htm
N onlinehelp/adminconsole/html/en/help/cipher_preference_ssl_3.0.htm
N onlinehelp/adminconsole/html/en/help/administration_express_server_information.htm
N onlinehelp/adminconsole/html/en/help/administration_domain_information.htm
N onlinehelp/adminconsole/html/en/help/create_user_administrator_licenses.htm
N onlinehelp/adminconsole/html/en/help/administration_express_logs.htm
N onlinehelp/adminconsole/html/en/help/add_edit_host_name.htm
N onlinehelp/adminconsole/html/en/help/users_and_groups.htm
N onlinehelp/adminconsole/html/en/help/dochome.htm
N onlinehelp/adminconsole/html/en/help/server_information.htm
N onlinehelp/adminconsole/html/en/help/configure_custom_views.htm
N onlinehelp/adminconsole/html/en/help/certificate_information_detail.htm
N onlinehelp/adminconsole/html/en/help/create_user_administrator_posix_user.htm
N onlinehelp/adminconsole/html/en/help/create_group_members_dynamic_group.htm
N onlinehelp/adminconsole/html/en/help/edit_aci_hosts.htm
N onlinehelp/adminconsole/html/en/help/create_group_languages.htm
N onlinehelp/adminconsole/html/en/help/save_font_profile.htm
N onlinehelp/adminconsole/html/en/help/certificate_install_wizard_intended_purpose.htm
N onlinehelp/adminconsole/html/en/help/add_edit_community.htm
N onlinehelp/adminconsole/html/en/help/logging_options.htm
N onlinehelp/adminconsole/html/en/help/create_new_administration_domain.htm
N onlinehelp/adminconsole/html/en/help/configure_administration_server_network.htm
N onlinehelp/adminconsole/html/en/help/import_keys_and_certificates_source_location.htm
N onlinehelp/adminconsole/html/en/help/server_list.htm
N onlinehelp/adminconsole/html/en/help/new_view.htm
N onlinehelp/adminconsole/html/en/help/add_pre4.0_server.htm
N onlinehelp/adminconsole/html/en/help/license_tracking.htm
N onlinehelp/adminconsole/html/en/help/contents.htm
N onlinehelp/adminconsole/html/en/help/construct_and_test_ldap_url.htm
N onlinehelp/adminconsole/html/en/help/select_organizational_unit.htm
N onlinehelp/adminconsole/html/en/help/certificates_group.htm
N onlinehelp/adminconsole/html/en/help/import_keys_and_certificates_confirmation.htm
N onlinehelp/adminconsole/html/en/help/manage_certificates_server_certs.htm
N onlinehelp/adminconsole/html/en/help/add_host_filter.htm
N onlinehelp/adminconsole/html/en/help/configure_administration_server_encryption.htm
N onlinehelp/adminconsole/html/en/help/change_directory.htm
N onlinehelp/adminconsole/html/en/help/manage_certificates_revoked_certs.htm
N onlinehelp/adminconsole/html/en/help/edit_aci_times.htm
N onlinehelp/adminconsole/html/en/help/create_group_members_certificates_group.htm
N onlinehelp/adminconsole/html/en/help/certificate_information_general.htm
N onlinehelp/adminconsole/html/en/help/create_user_administrator_languages.htm
N onlinehelp/adminconsole/html/en/help/import_keys_and_certificates_alias_selection.htm
N onlinehelp/adminconsole/html/en/help/configure_administration_server_access.htm
N onlinehelp/adminconsole/html/en/help/sniffer.js
N onlinehelp/adminconsole/html/en/help/create_organizational_unit.htm
N onlinehelp/adminconsole/html/en/help/browse_directory.htm
N onlinehelp/adminconsole/html/en/help/cipher_preference_tls.htm
N onlinehelp/adminconsole/html/en/help/configure_security_modules.htm
N onlinehelp/adminconsole/html/en/help/set_security_device_password.htm
N onlinehelp/adminconsole/html/en/help/select_target_servers_for_cloning.htm
N onlinehelp/adminconsole/html/en/help/manage_access_control.htm
N onlinehelp/adminconsole/html/en/help/ssl_token_password.htm
N onlinehelp/adminconsole/html/en/help/edit_aci_targets.htm
N onlinehelp/adminconsole/html/en/help/create_group_general.htm
N onlinehelp/adminconsole/html/en/help/search_users_and_groups.htm
N onlinehelp/console/html/en/help/login.htm
N onlinehelp/console/html/en/help/security_warning.htm
No conflicts created by this import
18 years, 7 months
[Fedora-directory-commits] ldapserver internal_comp_deps.mk, 1.27, 1.28
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8631
Modified Files:
internal_comp_deps.mk
Log Message:
fixed internal build failure...
Index: internal_comp_deps.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/internal_comp_deps.mk,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- internal_comp_deps.mk 3 Oct 2005 19:53:40 -0000 1.27
+++ internal_comp_deps.mk 5 Oct 2005 01:29:14 -0000 1.28
@@ -432,7 +432,7 @@
$(FTP_PULL) -method $(COMPONENT_PULL_METHOD) \
-objdir $(CLASS_DEST) -componentdir $(AXIS_DIR) \
-files $(AXIS_FILES) -unzip $(CLASS_DEST)
-endifldap/
+endif
-@if [ ! -f $@ ] ; \
then echo "Error: could not get component AXIS files $@" ; \
fi
18 years, 7 months
[Fedora-directory-commits] ldapserver/ldap/cm/newinst setup, 1.10, 1.11
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/cm/newinst
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26789/newinst
Modified Files:
setup
Log Message:
[167982] Service Pack framework
Ported the patch making code from Directory71RtmBranch to the trunk.
Index: setup
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinst/setup,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- setup 2 Sep 2005 23:33:48 -0000 1.10
+++ setup 4 Oct 2005 17:03:47 -0000 1.11
@@ -130,6 +130,13 @@
echo $maxhost
}
+getValFromAdminConf() {
+ cattr=$1
+ cfile=$2
+ rval=`grep -i $cattr $sroot/admin-serv/config/$cfile | awk '{print $2}'`
+ echo $rval
+}
+
logfile=`doMktmp log`
myargs=
silent=
@@ -188,6 +195,61 @@
askYN "Continue?"
fi
+# check whether it is an in-place installation
+if [ -f $sroot/admin-serv/config/adm.conf ]; then
+ dsinst=`getValFromAdminConf "ldapStart:" "adm.conf" | awk -F/ '{print $1}'`
+ if [ -f $sroot/$dsinst/config/dse.ldif ]; then
+ # it is an in=place installation
+ ldaphost=`getValFromAdminConf "ldapHost:" "adm.conf"`
+ ldapport=`getValFromAdminConf "ldapPort:" "adm.conf"`
+ adminport=`getValFromAdminConf "\<port:" "adm.conf"`
+ siepid=`getValFromAdminConf "siepid:" "adm.conf"`
+ sysuser=`getValFromAdminConf "nsSuiteSpotUser:" "local.conf"`
+ suitespotuser=`ls -l $sroot/$dsinst/config/dse.ldif | awk '{print $3}'`
+ 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`
+ fi
+
+ echo "In order to reconfigure your installation, the Configuration Directory"
+ echo "Administrator password is required. Here is your current information:"
+ echo ""
+ echo "Configuration Directory: ldap://$ldaphost:$ldapport/o=NetscapeRoot"
+ echo "Configuration Administrator ID: $siepid"
+ echo ""
+ echo "At the prompt, please enter the password for the Configuration Administrator."
+ echo ""
+ echo "administrator ID: $siepid"
+ siepasswd=""
+ while [ "$siepasswd" = "" ]; do
+ printf "Password: "
+ read siepasswd
+ done
+
+ inffile=$sroot/setup/myinstall.inf
+ echo "[General]" > $inffile
+ echo "FullMachineName= $ldaphost" >> $inffile
+ echo "SuiteSpotUserID= $suitespotuser" >> $inffile
+ echo "SuitespotGroup= $suitespotgroup" >> $inffile
+ echo "ServerRoot= $sroot" >> $inffile
+ echo "ConfigDirectoryLdapURL= ldap://$ldaphost:$ldapport/o=NetscapeRoot" >> $inffile
+ echo "ConfigDirectoryAdminID= $siepid" >> $inffile
+ echo "AdminDomain= $admindomain" >> $inffile
+ echo "ConfigDirectoryAdminPwd= $siepasswd" >> $inffile
+ echo "" >> $inffile
+ echo "[admin]" >> $inffile
+ echo "ServerAdminID= $siepid" >> $inffile
+ echo "ServerAdminPwd= $siepasswd" >> $inffile
+ echo "SysUser= $sysuser" >> $inffile
+ echo "Port= $adminport" >> $inffile
+ echo "ServerIpAddress=" >> $inffile
+
+ # set silent mode
+ silent=1
+ fi
+fi
+
# dsktune
if ! [ $silent ]; then
bin/slapd/server/dsktune | tee -a $logfile
@@ -251,13 +313,10 @@
# check if ds instance directory exists or not
# if it does, run ns-config with the reconfigure option
doreconfig=""
- for x in `ls -d slapd-*`
- do
- if [ -d $x ]; then
- doreconfig="-r"
- break
- fi
- done
+ ls -d slapd-* > /dev/null 2>&1
+ if [ $? -eq 0 ]; then
+ doreconfig="-r"
+ fi
# first, run ds
cd bin/slapd/admin/bin
@@ -266,7 +325,7 @@
# next, run admin
cd bin/admin
- ./ns-config -f $inffile -l $logfile -m $installmode || doExit
+ ./ns-config -f $inffile -l $logfile -m $installmode $doreconfig || doExit
cd ../..
fi
@@ -278,7 +337,7 @@
`pwd`/bin/slapd/admin/bin/ns-update $silentarg $myargs -f $inffile | tee -a $logfile || doExit
-`pwd`/bin/admin/ns-update $silentarg $myargs -f $inffile | tee -a $logfile || doExit
+`pwd`/bin/admin/ns-update $doreconfig $silentarg $myargs -f $inffile | tee -a $logfile || doExit
echo "INFO Finished with setup, logfile is setup/setup.log" | tee -a $logfile
if [ -f setup/setup.log ] ; then
18 years, 7 months
[Fedora-directory-commits] ldapserver/ldap/cm Makefile, 1.34, 1.35 fedora-patch.inf, 1.2, 1.3 redhat-patch.inf, 1.2, 1.3
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/cm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26789
Modified Files:
Makefile fedora-patch.inf redhat-patch.inf
Log Message:
[167982] Service Pack framework
Ported the patch making code from Directory71RtmBranch to the trunk.
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/Makefile,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- Makefile 3 Oct 2005 19:53:54 -0000 1.34
+++ Makefile 4 Oct 2005 17:03:43 -0000 1.35
@@ -749,15 +749,18 @@
ifdef BUILD_PATCH
mkdir -p $(PATCHINSTDIR)/$(SLAPDSP)
+ cp $(INSTDIR)/setup $(PATCHINSTDIR)/dssetup
+ cp $(INSTDIR)/unzip_wrapper.pl $(PATCHINSTDIR)
cp $(INSTDIR)/LICENSE.txt $(PATCHINSTDIR)
cp $(INSTDIR)/README.txt $(PATCHINSTDIR)
+ cp $(BUILD_ROOT)/ldap/cm/newinst/setup.patch $(PATCHINSTDIR)/setup
# prepare the main inf file: setup.inf pointing inf file $(SLAPDS)/$(SLAPD).inf
sed -e "s/Components.*=/Components = $(SLAPDSP)/" $(INSTDIR)/setup.inf > $(PATCHINSTDIR)/setup.inf
echo "" >> $(PATCHINSTDIR)/setup.inf
echo "[$(SLAPDSP)]" >> $(PATCHINSTDIR)/setup.inf
echo "ComponentInfoFile = $(SLAPDSP)/$(SLAPDSP).inf" >> $(PATCHINSTDIR)/setup.inf
# create a zip file based upon the $(PATCHINF) file
- cd $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR); zip -r $(PATCHINSTDIR)/$(SLAPDSP)/ns$(SLAPDSP).zip `egrep file: $(PATCHINF) | awk -F: '{print $$3}'`
+ cd $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR); zip -r $(PATCHINSTDIR)/$(SLAPDSP)/ns$(SLAPDSP).zip `egrep "^file:" $(PATCHINF) | awk -F: '{print $$3}'`
# put ns-config and needed libs in the $(PATCHINSTDIR)/$(SLAPDSP) directory
$(INSTALL) -m 755 $(RELDIR_32)/bin/slapd/admin/bin/ns-config $(PATCHINSTDIR)/$(SLAPDSP)
-@for file in $(PACKAGE_SETUP_LIBS_32) ; \
@@ -767,7 +770,7 @@
done
# create patch inf file: $(SLAPD).inf
cp $(OBJDIR)/slapd-patch.inf $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf
- cd $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR); ls `egrep file: $(PATCHINF) | egrep -v "setup/setup" | awk -F: '{print $$3}'` > $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf.tmp
+ cd $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR); ls `egrep "^file:" $(PATCHINF) | egrep -v "setup/setup" | awk -F: '{print $$3}'` > $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf.tmp
echo `cat $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf.tmp` | sed -e "s/ /,/g" > $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf.tmp2
echo "BackupFiles="`cat $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf.tmp2`>> $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf
rm -f $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf.tmp $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf.tmp2
Index: fedora-patch.inf
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/fedora-patch.inf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fedora-patch.inf 22 Sep 2005 16:48:16 -0000 1.2
+++ fedora-patch.inf 4 Oct 2005 17:03:43 -0000 1.3
@@ -43,5 +43,5 @@
base: /share/dev4/fedora-ds/fds71/ships/20050526.1
file: 000001: README.txt
-file: 000002: COPYRIGHT.txt
+file: 000002: lib/libback-ldbm.*
Index: redhat-patch.inf
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/redhat-patch.inf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- redhat-patch.inf 22 Sep 2005 16:48:16 -0000 1.2
+++ redhat-patch.inf 4 Oct 2005 17:03:43 -0000 1.3
@@ -43,5 +43,4 @@
base: /share/dev4/fedora-ds/fds71/ships/20050526.1
file: 000001: README.txt
-file: 000002: COPYRIGHT.txt
-
+file: 000002: lib/libback-ldbm.*
18 years, 7 months
[Fedora-directory-commits] ldapserver/lib/libadmin Makefile, 1.9, 1.10
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/lib/libadmin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22035/ldapserver/lib/libadmin
Modified Files:
Makefile
Log Message:
Bug(s) fixed: 169663
Bug Description: Build Cleanup - open source AS, other components;
remove Fortezza; etc.
Reviewed by: Noriko, Nathan, Rob C. (Thanks!)
Fix Description: This allows us to build DS entirely outside of the
firewall with entirely open source components, including setuputil,
adminutil, adminserver, and java components. I still need to address
some issues around nsperl, perldap, dsmlgw, xmltools, and general ease
of build. This also gets rid of the crufty Fortezza build stuff and
addresses some other minor build issues.
Platforms tested: RHEL4
Flag Day: yes, but the internal builds should not be affected
Doc impact: wiki
QA impact: should be covered by regular nightly and manual testing
New Tests integrated into TET: none
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/lib/libadmin/Makefile,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Makefile 19 Apr 2005 22:07:53 -0000 1.9
+++ Makefile 3 Oct 2005 19:54:01 -0000 1.10
@@ -44,10 +44,10 @@
MODULE=LibAdmin
MODULE_CFLAGS=-DENCRYPT_PASSWORDS -DUSE_ADMSERV
-include $(BUILD_ROOT)/nsdefs.mk
-
OBJDEST=$(OBJDIR)/lib/libadmin
+include $(BUILD_ROOT)/nsconfig.mk
+
ifeq ($(ARCH), WINNT)
LIBS=$(OBJDIR)/lib/libadmin.lib
else
@@ -69,8 +69,6 @@
#$(LIBS): $(addprefix $(BUILD_ROOT)/include/libadmin/, \
# hadm_msgs.i la_msgs.i)
-include $(BUILD_ROOT)/nsconfig.mk
-
MCC_INCLUDE += $(ADMINUTIL_INCLUDE)
#ifeq ($(ARCH), HPUX)
18 years, 7 months
[Fedora-directory-commits] ldapserver/lib/libsi18n Makefile, 1.6, 1.7
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/lib/libsi18n
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22035/ldapserver/lib/libsi18n
Modified Files:
Makefile
Log Message:
Bug(s) fixed: 169663
Bug Description: Build Cleanup - open source AS, other components;
remove Fortezza; etc.
Reviewed by: Noriko, Nathan, Rob C. (Thanks!)
Fix Description: This allows us to build DS entirely outside of the
firewall with entirely open source components, including setuputil,
adminutil, adminserver, and java components. I still need to address
some issues around nsperl, perldap, dsmlgw, xmltools, and general ease
of build. This also gets rid of the crufty Fortezza build stuff and
addresses some other minor build issues.
Platforms tested: RHEL4
Flag Day: yes, but the internal builds should not be affected
Doc impact: wiki
QA impact: should be covered by regular nightly and manual testing
New Tests integrated into TET: none
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/lib/libsi18n/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Makefile 19 Apr 2005 22:07:54 -0000 1.6
+++ Makefile 3 Oct 2005 19:54:06 -0000 1.7
@@ -42,11 +42,11 @@
BUILD_ROOT=../..
MODULE=LibsI18N
-include $(BUILD_ROOT)/nsdefs.mk
+OBJDEST=$(OBJDIR)/lib/libsi18n
-NSDEFS_PRODUCT = $(NS_PRODUCT)
+include $(BUILD_ROOT)/nsconfig.mk
-OBJDEST=$(OBJDIR)/lib/libsi18n
+NSDEFS_PRODUCT = $(NS_PRODUCT)
L10NDIR = $(BUILD_ROOT)/l10n
@@ -92,8 +92,6 @@
gsslapd.h
endif
-include $(BUILD_ROOT)/nsconfig.mk
-
MCC_INCLUDE += $(ADMINUTIL_INCLUDE)
all: $(OBJDEST) $(LIBS) $(BSCS) $(OBJDEST)/$(StringDatabase)
18 years, 7 months
[Fedora-directory-commits] ldapserver/lib/base Makefile,1.6,1.7
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/lib/base
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22035/ldapserver/lib/base
Modified Files:
Makefile
Log Message:
Bug(s) fixed: 169663
Bug Description: Build Cleanup - open source AS, other components;
remove Fortezza; etc.
Reviewed by: Noriko, Nathan, Rob C. (Thanks!)
Fix Description: This allows us to build DS entirely outside of the
firewall with entirely open source components, including setuputil,
adminutil, adminserver, and java components. I still need to address
some issues around nsperl, perldap, dsmlgw, xmltools, and general ease
of build. This also gets rid of the crufty Fortezza build stuff and
addresses some other minor build issues.
Platforms tested: RHEL4
Flag Day: yes, but the internal builds should not be affected
Doc impact: wiki
QA impact: should be covered by regular nightly and manual testing
New Tests integrated into TET: none
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/lib/base/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Makefile 19 Apr 2005 22:07:45 -0000 1.6
+++ Makefile 3 Oct 2005 19:54:00 -0000 1.7
@@ -45,10 +45,10 @@
BUILD_ROOT=../..
MODULE=LibBase
-include $(BUILD_ROOT)/nsdefs.mk
-
OBJDEST=$(OBJDIR)/lib/base
+include $(BUILD_ROOT)/nsconfig.mk
+
ifeq ($(ARCH), WINNT)
LIBS=$(OBJDIR)/lib/libbase.lib
ifeq ($(BSCINFO), yes)
@@ -58,8 +58,6 @@
LIBS=$(OBJDIR)/lib/libbase.a
endif
-include $(BUILD_ROOT)/nsconfig.mk
-
MCC_INCLUDE += $(ADMINUTIL_INCLUDE)
LOCAL_DEPS = $(NSPR_DEP) $(ADMINUTIL_DEP) $(SECURITY_DEP) $(DBM_DEP)
18 years, 7 months
[Fedora-directory-commits] ldapserver/ldap/include proto-ntutil.h, 1.4, 1.5
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/include
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22035/ldapserver/ldap/include
Modified Files:
proto-ntutil.h
Log Message:
Bug(s) fixed: 169663
Bug Description: Build Cleanup - open source AS, other components;
remove Fortezza; etc.
Reviewed by: Noriko, Nathan, Rob C. (Thanks!)
Fix Description: This allows us to build DS entirely outside of the
firewall with entirely open source components, including setuputil,
adminutil, adminserver, and java components. I still need to address
some issues around nsperl, perldap, dsmlgw, xmltools, and general ease
of build. This also gets rid of the crufty Fortezza build stuff and
addresses some other minor build issues.
Platforms tested: RHEL4
Flag Day: yes, but the internal builds should not be affected
Doc impact: wiki
QA impact: should be covered by regular nightly and manual testing
New Tests integrated into TET: none
Index: proto-ntutil.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/include/proto-ntutil.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- proto-ntutil.h 19 Apr 2005 22:07:25 -0000 1.4
+++ proto-ntutil.h 3 Oct 2005 19:53:55 -0000 1.5
@@ -96,9 +96,6 @@
*/
#ifdef NET_SSL
extern char *Slapd_GetPassword();
-#ifdef FORTEZZA
-extern char *Slapd_GetFortezzaPIN();
-#endif
extern void CenterDialog(HWND hwndParent, HWND hwndDialog);
#endif /* NET_SSL */
18 years, 7 months