diff options
Diffstat (limited to 'ldap/admin/src')
| -rw-r--r-- | ldap/admin/src/Makefile | 12 | ||||
| -rw-r--r-- | ldap/admin/src/configure_instance.cpp | 5 |
2 files changed, 12 insertions, 5 deletions
diff --git a/ldap/admin/src/Makefile b/ldap/admin/src/Makefile index 17d3ea11..d7c49358 100644 --- a/ldap/admin/src/Makefile +++ b/ldap/admin/src/Makefile @@ -132,9 +132,15 @@ EXTRA_LIBS += -lsocket -lnsl -lgen -lm -lposix4 -lthread OPENSOURCE_LIBS += -lsocket -lnsl -lgen -lm -lposix4 -lthread else ifeq ($(ARCH),HPUX) -ifeq ($(USE_64), 1) -EXTRALDFLAGS += +DA2.0W +DS2.0 +Z -endif + ifeq ($(NSOS_RELEASE),B.11.23) + ifeq ($(USE_64), 1) + EXTRALDFLAGS += +DD64 + endif + else + ifeq ($(USE_64), 1) + EXTRALDFLAGS += +DA2.0W +DS2.0 +Z + endif + endif else ifeq ($(ARCH),OSF1) #CC += -E diff --git a/ldap/admin/src/configure_instance.cpp b/ldap/admin/src/configure_instance.cpp index ed69bb3e..80b5b24d 100644 --- a/ldap/admin/src/configure_instance.cpp +++ b/ldap/admin/src/configure_instance.cpp @@ -133,7 +133,7 @@ extern "C" { // name of script file to generate relative to slapd instance directory #define SCRIPT_FILE_NAME "start-console" -#define DS_JAR_FILE_NAME "ds10.jar" +#define DS_JAR_FILE_NAME "fedora-ds-1.0.jar" #define DS_CONSOLE_CLASS_NAME "com.netscape.admin.dirserv.DSAdmin" #ifdef XP_WIN32 @@ -711,6 +711,7 @@ static LdapError create_sie_and_isie(LdapEntry *sieEntry, LdapEntry *appEntry, NSString& sieDN) { LdapError ldapError; // return value + const char *adminBrand = "Fedora"; // Prepare sieEntry sieEntry->clear(); @@ -758,7 +759,7 @@ create_sie_and_isie(LdapEntry *sieEntry, LdapEntry *appEntry, NSString& sieDN) LdapErrorCode code = createSIE(sieEntry, appEntry, fqdn, installInfo->get(SLAPD_KEY_SERVER_ROOT), - ssDN); + ssDN, adminBrand); delete [] fqdn; if (code != OKAY) |