summaryrefslogtreecommitdiffstats
path: root/ldap/cm
diff options
context:
space:
mode:
Diffstat (limited to 'ldap/cm')
-rw-r--r--ldap/cm/Makefile51
-rw-r--r--ldap/cm/fixNSPerlInf.pl6
-rw-r--r--ldap/cm/fixPerlDAPInf.pl6
-rw-r--r--ldap/cm/fixSetupInf.pl4
-rwxr-xr-xldap/cm/newinst/ns-keygen2
-rw-r--r--ldap/cm/newinst/slapd.inf6
-rw-r--r--ldap/cm/newinst/ux-config.cc2
-rw-r--r--ldap/cm/newinst/ux-config.h12
-rw-r--r--ldap/cm/newinst/ux-dialog.cc34
-rw-r--r--ldap/cm/newinstnt/consolinst.c2
-rw-r--r--ldap/cm/newinstnt/dsinst.c2
-rw-r--r--ldap/cm/newinstnt/dsinst.rc24
-rw-r--r--ldap/cm/newinstnt/setup.inf6
-rw-r--r--ldap/cm/newinstnt/slapd.inf14
14 files changed, 88 insertions, 83 deletions
diff --git a/ldap/cm/Makefile b/ldap/cm/Makefile
index 6f3ff382..6094b34c 100644
--- a/ldap/cm/Makefile
+++ b/ldap/cm/Makefile
@@ -162,7 +162,7 @@ BUILD_DATE = $(shell date +%Y%m%d)
SHAREDIR = $(SHARETOP)/$(BUILD_DATE)/$(NC_BUILD_FLAVOR)
#ADM_VERSDIR = admserv40
#ADM_RELDATE = untested/19980119
-IMPORTADMINSRV = $(IMPORTADMINSRV_BASE)/$(NSOBJDIR_NAME_32)
+#IMPORTADMINSRV = $(IMPORTADMINSRV_BASE)/$(NSOBJDIR_NAME_32)
IMPORTADMINSRVNOTAR = $(COMPONENTS_DIR)/$(ADM_VERSDIR)/$(ADM_VERSION)/untar/$(NSOBJDIR_NAME)
# these are files and directories in the import adminsrv directory which we don't
# make a local copy of, we just import directly into the tar file or create a
@@ -425,34 +425,27 @@ ifdef BUILD_PRESENCE
endif
# docs
- if [ -d $(OBJDIR)/manual/slapd ] ; \
- then $(INSTALL) -m 644 $(OBJDIR)/manual/slapd/cli/*.* $(RELDIR)/manual/en/slapd/cli ; \
- $(INSTALL) -m 644 $(OBJDIR)/manual/slapd/ag/*.* $(RELDIR)/manual/en/slapd/ag ; \
- $(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/netscape48.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/ ; \
- $(INSTALL) -m 644 $(OBJDIR)/manual/slapd/copyright/*.* $(RELDIR)/manual/en/slapd/copyright ; \
+ -$(RM) -r $(RELDIR)/manual/en/slapd
+ -$(MKDIR) $(RELDIR)/manual/en/slapd
+ if [ -d $(DSDOC_DIR) ] ; 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/ ; \
+ cd $(RELDIR)/manual/en/slapd; \
+ unzip $(DSDOC_DIR)/$(DSDOC_COPYRIGHT); \
+ unzip $(DSDOC_DIR)/$(DSDOC_CLIENTS); \
fi
- if [ -d $(OBJDIR)/manual/slapd ] ; \
- then $(INSTALL) -m 644 $(OBJDIR)/manual/slapd/install/*.* $(RELDIR)/manual/en/slapd/install ; \
- $(INSTALL) -m 644 $(OBJDIR)/manual/slapd/deploy/*.* $(RELDIR)/manual/en/slapd/deploy ; \
- $(INSTALL) -m 644 $(OBJDIR)/manual/slapd/dsmlgw/*.* $(RELDIR)/manual/en/slapd/dsmlgw ; \
- $(INSTALL) -m 644 $(OBJDIR)/manual/slapd/gwcust/*.* $(RELDIR)/manual/en/slapd/gwcust ; \
- $(INSTALL) -m 644 $(OBJDIR)/manual/slapd/gwcust/graphics/*.* $(RELDIR)/manual/en/slapd/gwcust/graphics ; \
- $(INSTALL) -m 644 $(OBJDIR)/manual/slapd/schema/*.* $(RELDIR)/manual/en/slapd/schema ; \
- $(INSTALL) -m 644 $(OBJDIR)/manual/slapd/ag/graphics/*.* $(RELDIR)/manual/en/slapd/ag/graphics ; \
- $(INSTALL) -m 644 $(OBJDIR)/manual/slapd/cli/graphics/*.* $(RELDIR)/manual/en/slapd/cli/graphics ; \
- $(INSTALL) -m 644 $(OBJDIR)/manual/slapd/deploy/graphics/*.* $(RELDIR)/manual/en/slapd/deploy/graphics ; \
- $(INSTALL) -m 644 $(OBJDIR)/manual/slapd/install/graphics/*.* $(RELDIR)/manual/en/slapd/install/graphics ; \
- $(INSTALL) -m 644 $(OBJDIR)/manual/slapd/plugin/*.* $(RELDIR)/manual/en/slapd/plugin ; \
- $(INSTALL) -m 644 $(OBJDIR)/manual/slapd/plugin/graphics/*.* $(RELDIR)/manual/en/slapd/plugin/graphics ; \
- $(INSTALL) -m 644 $(OBJDIR)/manual/slapd/orgchart/*.* $(RELDIR)/manual/en/slapd/orgchart ; \
- $(INSTALL) -m 644 $(OBJDIR)/manual/slapd/orgchart/graphics/*.* $(RELDIR)/manual/en/slapd/orgchart/graphics ; \
+
+ifeq ($(BUILD_MODE), int)
+ if [ -d $(DSDOC_DIR) ] ; then \
+ cd $(RELDIR)/manual/en/slapd; \
+ unzip $(DSDOC_DIR)/$(DSDOC_GUIDES); \
fi
+endif
+
ifdef USE_PURIFY
-$(INSTALL) -m 755 $(DB_LIBPATH)/*.so_pure* $(RELDIR)/lib
-$(INSTALL) -m 755 $(NSCP_DISTDIR)/lib/*.so_pure* $(RELDIR)/lib
@@ -660,7 +653,9 @@ endif
$(PERL) -w $(FIX_BASE_INF) $(INSTDIR)/base/base.inf
# We must remove the JRE per Red Hat. The user will download the jre
- rm -f $(INSTDIR)/base/nsjre.zip
+ifneq ($(ARCH), Linux)
+ rm -f $(INSTDIR)/base/nsjre.zip
+endif
# Move setup binary to dssetup
mv $(INSTDIR)/setup $(INSTDIR)/dssetup
diff --git a/ldap/cm/fixNSPerlInf.pl b/ldap/cm/fixNSPerlInf.pl
index 9f72e89b..9e0fd3cf 100644
--- a/ldap/cm/fixNSPerlInf.pl
+++ b/ldap/cm/fixNSPerlInf.pl
@@ -36,10 +36,10 @@ while (<IN>) {
if ($PRINT) {
if (/^Description/) {
- s/The Sun \| Netscape Alliance/Netscape/g;
- s/iPlanet/Netscape/g;
+ s/The Sun \| Netscape Alliance/Fedora/g;
+ s/iPlanet/Fedora/g;
} elsif (/^Vendor/) {
- s/Sun \| Netscape Alliance/Netscape Communications Corp./g;
+ s/The Sun \| Netscape Alliance/Fedora/g;
}
print OUT;
if (/^RunPostInstall/) {
diff --git a/ldap/cm/fixPerlDAPInf.pl b/ldap/cm/fixPerlDAPInf.pl
index cf1f9fb7..3f1415a5 100644
--- a/ldap/cm/fixPerlDAPInf.pl
+++ b/ldap/cm/fixPerlDAPInf.pl
@@ -15,10 +15,10 @@ open(OUT, ">$outfile") or die "Error: could not write file $outfile: $!";
while (<IN>) {
if (/^Description/) {
- s/The Sun \| Netscape Alliance/Netscape/g;
- s/iPlanet/Netscape/g;
+ s/The Sun \| Netscape Alliance/Fedora/g;
+ s/iPlanet/Fedora/g;
} elsif (/^Vendor/) {
- s/Sun \| Netscape Alliance/Netscape Communications Corp./g;
+ s/The Sun \| Netscape Alliance/Fedora/g;
}
print OUT;
if (/^Archive=perldap14.zip/) {
diff --git a/ldap/cm/fixSetupInf.pl b/ldap/cm/fixSetupInf.pl
index bd10f5c6..96365ac0 100644
--- a/ldap/cm/fixSetupInf.pl
+++ b/ldap/cm/fixSetupInf.pl
@@ -11,9 +11,9 @@
$isNT = -d '\\';
if ($isNT) {
- $ServerDir = "/Brandx/Servers";
+ $ServerDir = "/Fedora/Servers";
} else {
- $ServerDir = "/usr/brandx/servers";
+ $ServerDir = "/opt/fedora/servers";
}
$ServerDirKey = "DefaultInstallDirectory";
diff --git a/ldap/cm/newinst/ns-keygen b/ldap/cm/newinst/ns-keygen
index e01d43a4..c959f402 100755
--- a/ldap/cm/newinst/ns-keygen
+++ b/ldap/cm/newinst/ns-keygen
@@ -9,7 +9,7 @@
#
# Usage ns-keygen password_file fully_qualified_hostname
# Example:
-# ./ns-keygen ../password.txt myhost.brandx.com
+# ./ns-keygen ../password.txt myhost.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.inf b/ldap/cm/newinst/slapd.inf
index 5c450f07..0c426fbe 100644
--- a/ldap/cm/newinst/slapd.inf
+++ b/ldap/cm/newinst/slapd.inf
@@ -6,7 +6,7 @@
# END COPYRIGHT BLOCK
#
[General]
-Name=Brandx Directory Suite
+Name=Fedora Directory Suite
Components=slapd, slapd-client
[slapd]
@@ -18,7 +18,7 @@ Compatible= 4.0
BuildNumber= %%%SERVER_BUILD_NUM%%%
Expires= %%%PUMPKIN_HOUR%%%
Security= %%%SECURITY%%%
-Vendor= Brandx, Inc.
+Vendor= Fedora Project
Description= %%%SERVER_NAME%%%
Dependencies= base/4.5, svrcore/4.5, nsperl561/1.13, perldap14/1.01
ProductName=Directory Server
@@ -36,7 +36,7 @@ IsLdap=True
NSPerlPostInstall=lib/nsPerl5.6.1/install
[slapd-client]
-Name= Brandx Directory Server Console
+Name= Fedora Directory Server Console
NickName= slapd-client
Version= %%%SERVER_VERSION%%%
Compatible= 4.0
diff --git a/ldap/cm/newinst/ux-config.cc b/ldap/cm/newinst/ux-config.cc
index e3fe16a5..2741d54a 100644
--- a/ldap/cm/newinst/ux-config.cc
+++ b/ldap/cm/newinst/ux-config.cc
@@ -9,7 +9,7 @@
** ux-config.cc
**
** DESCRIPTION:
-** Brandx Directory Server Pre-installation Program
+** Fedora Directory Server Pre-installation Program
**
** NOTES:
** This program is intended for UNIX only and is NOT thread-safe.
diff --git a/ldap/cm/newinst/ux-config.h b/ldap/cm/newinst/ux-config.h
index ed2c2423..03d1004d 100644
--- a/ldap/cm/newinst/ux-config.h
+++ b/ldap/cm/newinst/ux-config.h
@@ -10,12 +10,22 @@
** ux-config.h
**
** DESCRIPTION:
-** Brandx Directory Server Pre-installation Program
+** Fedora Directory Server Pre-installation Program
**
** NOTES:
**
** HISTORY:
** $Log: ux-config.h,v $
+** Revision 1.4 2005/03/25 02:09:16 nhosoi
+** [Bug 146919] Directory Server rebranding
+** 1) Brandx -> Fedora
+** 2) Pick up new internal component set (Admin SDK, Setup SDK, Admin Server)
+** 3) Use JRE from the Admin Server package
+** 4) Docs
+** a) Componentize Docs
+** b) Rebrand Docs
+** c) Drop packaging Administration Guide in the external version
+**
** Revision 1.3 2005/02/28 23:37:49 nkinder
** 149951 - Updated source code copyrights
**
diff --git a/ldap/cm/newinst/ux-dialog.cc b/ldap/cm/newinst/ux-dialog.cc
index 55cb3618..97569320 100644
--- a/ldap/cm/newinst/ux-dialog.cc
+++ b/ldap/cm/newinst/ux-dialog.cc
@@ -587,11 +587,11 @@ askSlapdServerIDNext(Dialog *me)
}
DialogInput askMCAdminID(
-"Please enter the administrator ID for the Brandx configuration\n"
+"Please enter the administrator ID for the Fedora configuration\n"
"directory server. This is the ID typically used to log in to the\n"
"console. You will also be prompted for the password.\n",
-"Brandx configuration directory server\nadministrator ID",
+"Fedora configuration directory server\nadministrator ID",
"admin",
@@ -3122,21 +3122,21 @@ askSIRTimesNext(Dialog *me)
}
DialogYesNo askUseExistingMC(
-"Brandx server information is stored in the Brandx configuration\n"
+"Fedora server information is stored in the Fedora configuration\n"
"directory server, which you may have already set up. If so, you\n"
"should configure this server to be managed by the configuration\n"
"server. To do so, the following information about the configuration\n"
"server is required: the fully qualified host name of the form\n"
"<hostname>.<domainname>(e.g. hostname.domain.com), the port number,\n"
"the suffix, and the DN and password of a user having permission to\n"
-"write the configuration information, usually the Brandx\n"
+"write the configuration information, usually the Fedora\n"
"configuration directory administrator.\n\n"
"If you want to install this software as a standalone server, or if you\n"
-"want this instance to serve as your Brandx configuration directory\n"
+"want this instance to serve as your Fedora configuration directory\n"
"server, press Enter.\n",
"Do you want to register this software with an existing\n"
-"Brandx configuration directory server?",
+"Fedora configuration directory server?",
"No",
@@ -3219,11 +3219,11 @@ askUseExistingMCNext(Dialog *me)
}
DialogInput askMCHost(
-"Enter the fully qualified domain name of the Brandx configuration\n"
+"Enter the fully qualified domain name of the Fedora configuration\n"
"directory server host in the form <hostname>.<domainname>\n"
"(e.g. hostname.domain.com).\n",
-"Brandx configuration directory server\nhost name",
+"Fedora configuration directory server\nhost name",
0,
@@ -3284,10 +3284,10 @@ askMCHostNext(Dialog *me)
}
DialogInput askMCPort(
-"Please specify the port number on which the Brandx configuration\n"
+"Please specify the port number on which the Fedora configuration\n"
"directory server listens.\n",
-"Brandx configuration directory server\nport number",
+"Fedora configuration directory server\nport number",
"389",
@@ -3355,13 +3355,13 @@ askMCPortNext(Dialog *me)
}
DialogInput askMCDN(
-"To write configuration information into the Brandx configuration\n"
+"To write configuration information into the Fedora configuration\n"
"directory, you must bind to the server as an entity with the\n"
-"appropriate permissions. Usually, the Brandx configuration\n"
+"appropriate permissions. Usually, the Fedora configuration\n"
"directory administrator is used for this purpose, although you can\n"
"give other directory accounts the proper access.\n",
-"Brandx configuration directory server\nadministrator ID",
+"Fedora configuration directory server\nadministrator ID",
0,
@@ -3528,7 +3528,7 @@ DialogYesNo askDisableSchemaChecking(
"installation, and you think you may have problems with your old\n"
"schema, you may want to turn off schema checking until after the\n"
"import. If you choose to do this, schema checking will remain off\n"
-"until you manually turn it back on. Brandx recommends that you turn\n"
+"until you manually turn it back on. Fedora recommends that you turn\n"
"it back on as soon as possible.\n",
"Do you want to disable schema checking?",
@@ -3573,7 +3573,7 @@ askDisableSchemaCheckingNext(Dialog *me)
DialogInput askMCAdminDomain(
"The Administration Domain is a part of the configuration directory\n"
-"server used to store information about Brandx software. If you are\n"
+"server used to store information about Fedora software. If you are\n"
"managing multiple software releases at the same time, or managing\n"
"information about multiple domains, you may use the Administration\n"
"Domain to keep them separate.\n\n"
@@ -3695,7 +3695,7 @@ askMCAdminDomainNext(Dialog *me)
DialogInput askAdminDomain(
"The Administration Domain is a part of the configuration directory\n"
-"server used to store information about Brandx software. If you are\n"
+"server used to store information about Fedora software. If you are\n"
"managing multiple software releases at the same time, or managing\n"
"information about multiple domains, you may use the Administration\n"
"Domain to keep them separate.\n\n"
@@ -4192,7 +4192,7 @@ askUGSuffixNext(Dialog *me)
DialogInput askReconfigMCAdminPwd(
(const char*)0,
-"Brandx configuration directory server\nadministrator ID",
+"Fedora configuration directory server\nadministrator ID",
(const char*)0,
diff --git a/ldap/cm/newinstnt/consolinst.c b/ldap/cm/newinstnt/consolinst.c
index 1dc118a4..b81263ae 100644
--- a/ldap/cm/newinstnt/consolinst.c
+++ b/ldap/cm/newinstnt/consolinst.c
@@ -4,7 +4,7 @@
* All rights reserved.
* END COPYRIGHT BLOCK **/
//////////////////////////////////////////////////////////////////////////////
-// CONSOLINST.c - Brandx Directory Server Installation Plug-In
+// CONSOLINST.c - Fedora Directory Server Installation Plug-In
//
//
#include <windows.h>
diff --git a/ldap/cm/newinstnt/dsinst.c b/ldap/cm/newinstnt/dsinst.c
index 5674604c..a771fd13 100644
--- a/ldap/cm/newinstnt/dsinst.c
+++ b/ldap/cm/newinstnt/dsinst.c
@@ -4,7 +4,7 @@
* All rights reserved.
* END COPYRIGHT BLOCK **/
///////////////////////////////////////////////////////////////////////////////
-// dsinst.c - Brandx Directory Server Installation Plug-In
+// dsinst.c - Fedora Directory Server Installation Plug-In
//
#include <windows.h>
#include <commctrl.h>
diff --git a/ldap/cm/newinstnt/dsinst.rc b/ldap/cm/newinstnt/dsinst.rc
index 83e433ed..fa1dc498 100644
--- a/ldap/cm/newinstnt/dsinst.rc
+++ b/ldap/cm/newinstnt/dsinst.rc
@@ -50,13 +50,13 @@ BEGIN
BEGIN
BLOCK "040904b0"
BEGIN
- VALUE "CompanyName", "Brandx\0"
+ VALUE "CompanyName", "Fedora\0"
VALUE "FileDescription", "Directory Server 7.1\0"
VALUE "FileVersion", "1, 0, 0, 1\0"
VALUE "InternalName", "Directory Server 7.1\0"
VALUE "LegalCopyright", "Copyright 2001 Sun Microsystems, Inc. Portions copyright 1999, 2002 Netscape Communications Corporation. All rights reserved.\0"
VALUE "OriginalFilename", "\0"
- VALUE "ProductName", "Brandx Server Products\0"
+ VALUE "ProductName", "Fedora Server Products\0"
VALUE "ProductVersion", "7, 1, 0, 0\0"
END
END
@@ -127,7 +127,7 @@ BEGIN
CONTROL "Use existing configuration directory server",
IDC_RADIO_USE_EXISTING_SERVER,"Button",
BS_AUTORADIOBUTTON,97,57,165,10
- LTEXT "Brandx server information is stored in the Brandx configuration directory server, which you may have already set up. If so, you should configure this server to be managed by the configuration server.",
+ LTEXT "Fedora server information is stored in the Fedora configuration directory server, which you may have already set up. If so, you should configure this server to be managed by the configuration server.",
IDC_STATIC_DESC,92,3,172,33
END
@@ -158,7 +158,7 @@ END
IDD_SUITESPOTID DIALOG DISCARDABLE 0, 0, 297, 163
STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
CAPTION
-"Directory Server 7.0 Brandx configuration directory server administrator "
+"Directory Server 7.0 Fedora configuration directory server administrator "
FONT 8, "MS Sans Serif"
BEGIN
@@ -174,7 +174,7 @@ BEGIN
ES_AUTOHSCROLL
GROUPBOX "Configuration Directory Server Administrator ",
IDC_STATIC_SUITESPOT_ADMIN_GROUPBOX,88,35,204,91
- LTEXT "The Brandx configuration directory administrator is the ID typically used to log in to the console.",
+ LTEXT "The Fedora configuration directory administrator is the ID typically used to log in to the console.",
IDC_STATIC_MCA_DESC,88,10,196,18
END
@@ -415,7 +415,7 @@ CAPTION "Directory Server 7.1 Administration Domain"
FONT 8, "MS Sans Serif"
BEGIN
CONTROL 102,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,0,0,85,160
- LTEXT "The Administration Domain is a part of the configuration directory server used to store information about Brandx software.",
+ LTEXT "The Administration Domain is a part of the configuration directory server used to store information about Fedora software.",
IDC_STATIC_ADMIN_DOMAIN_DESC,90,8,203,16
EDITTEXT IDC_EDIT_ADMIN_DOMAIN,157,113,118,14,ES_AUTOHSCROLL
LTEXT "Administration Domain:",IDC_STATIC_ADMIN_DOMAIN,104,113,
@@ -457,7 +457,7 @@ END
IDD_ADMIN_ID_ONLY DIALOG DISCARDABLE 0, 0, 297, 163
STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
CAPTION
-"Directory Server 7.0 Brandx configuration directory server administrator "
+"Directory Server 7.0 Fedora configuration directory server administrator "
FONT 8, "MS Sans Serif"
BEGIN
@@ -470,7 +470,7 @@ BEGIN
ES_AUTOHSCROLL
GROUPBOX "Configuration Directory Server Administrator ",
IDC_STATIC_SUITESPOT_ADMIN_GROUPBOX,88,35,204,61
- LTEXT "The Brandx configuration directory administrator is the ID typically used to log in to the console.",
+ LTEXT "The Fedora configuration directory administrator is the ID typically used to log in to the console.",
IDC_STATIC_MCA_DESC,88,10,196,18
END
@@ -615,14 +615,14 @@ BEGIN
ERR_INVALID_DN "%s is not a valid DN."
SUM_REINSTALL "Files will be updated, no configuration changes."
ERR_CANT_FIND_DS_REPL "Could not connect to ldap://%s:%d/ for bind DN %s Please check your settings. Otherwise, the remote server may be down at this time. You may need to manually start replication after installation. Would you like to continue using these settings?"
- IDS_STARTING_SERVICE "Starting Brandx Directory Server (%s)"
- IDS_STOPPING_SERVICE "Stopping Brandx Directory Server (%s)"
- IDS_WAIT_SERVICE_START "Waiting for Brandx Directory Server (%s) to start"
+ IDS_STARTING_SERVICE "Starting Fedora Directory Server (%s)"
+ IDS_STOPPING_SERVICE "Stopping Fedora Directory Server (%s)"
+ IDS_WAIT_SERVICE_START "Waiting for Fedora Directory Server (%s) to start"
END
STRINGTABLE DISCARDABLE
BEGIN
- IDS_WAIT_SERVICE_STOP "Waiting for Brandx Directory Server (%s) to stop"
+ IDS_WAIT_SERVICE_STOP "Waiting for Fedora Directory Server (%s) to stop"
ERR_ADMIN_DOMAIN_DN "A DN [%s] is not allowed here. Please enter a valid string."
ERR_CANT_FIND_ADMIN_DOMAIN
"Could not find the Admin Domain %s in ldap://%s:%d/ for bind DN %s\nPlease check your settings. You may need to install using Custom mode in order to specify the Admin domain.\nThe installation cannot proceed."
diff --git a/ldap/cm/newinstnt/setup.inf b/ldap/cm/newinstnt/setup.inf
index 389baab3..009ed898 100644
--- a/ldap/cm/newinstnt/setup.inf
+++ b/ldap/cm/newinstnt/setup.inf
@@ -13,9 +13,9 @@
# does note exist the setup program will ignore the component
[General]
-Name = Brandx Server Family
-Vendor = Brandx, Inc.
-Description = Brandx Server Family
+Name = Fedora Server Family
+Vendor = Fedora Project
+Description = Fedora Server Family
Version = %%%SERVER_VERSION%%%
Components = svrcore, base, admin, slapd, dssynch, msg, mcc
diff --git a/ldap/cm/newinstnt/slapd.inf b/ldap/cm/newinstnt/slapd.inf
index 24ed10fa..c60772ee 100644
--- a/ldap/cm/newinstnt/slapd.inf
+++ b/ldap/cm/newinstnt/slapd.inf
@@ -6,13 +6,13 @@
# END COPYRIGHT BLOCK
#
[General]
-Name=Brandx Directory Suite
+Name=Fedora Directory Suite
Components=slapd,slapd-client
Checked=TRUE
-Description=Brandx Directory Server
+Description=Fedora Directory Server
[slapd]
-Name=Brandx Directory Server
+Name=Fedora Directory Server
InstanceNamePrefix= %%%INSTANCE_NAME_PREFIX%%%
NickName=slapd
Version= %%%SERVER_VERSION%%%
@@ -20,8 +20,8 @@ Compatible= %%%SERVER_VERSION%%%
BuildNumber= %%%SERVER_BUILD_NUM%%%
Expires= %%%PUMPKIN_HOUR%%%
Security= %%%SECURITY%%%
-Vendor=Brandx, Inc.
-Description=Brandx Directory Server
+Vendor=Fedora Project
+Description=Fedora Directory Server
DefaultAcceptLanguage=en
Dependencies=admin/4.5,nsperl561/1.10,perldap14/1.01
Revision=
@@ -48,8 +48,8 @@ NSPerlPostInstall=lib\nsPerl5.6.1\install.bat
[slapd-client]
NickName=slapd-client
Dependencies=base-client/4.5
-Name=Brandx Directory Server
-Description=Brandx Directory Server
+Name=Fedora Directory Server
+Description=Fedora Directory Server
Version= %%%SERVER_VERSION%%%
Compatible= %%%SERVER_VERSION%%%
BuildNumber= %%%SERVER_BUILD_NUM%%%
generated by cgit (git 2.34.1) at 2025-01-10 06:16:40 +0000