From fedora-directory-commits at redhat.com Mon Oct 3 14:59:28 2005
From: fedora-directory-commits at redhat.com (Robert Crittenden (rcritten))
Date: Mon, 3 Oct 2005 10:59:28 -0400
Subject: [Fedora-directory-commits] mod_nss nss_engine_rand.c, NONE,
1.1 Makefile.am, 1.6, 1.7 Makefile.in, 1.9, 1.10 mod_nss.c,
1.8, 1.9 mod_nss.h, 1.7, 1.8 nss.conf.in, 1.6,
1.7 nss_engine_config.c, 1.8, 1.9 nss_engine_init.c, 1.13, 1.14
Message-ID: <200510031459.j93ExSrg011496@cvs-int.fedora.redhat.com>
Author: rcritten
Update of /cvs/dirsec/mod_nss
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11437
Modified Files:
Makefile.am Makefile.in mod_nss.c mod_nss.h nss.conf.in
nss_engine_config.c nss_engine_init.c
Added Files:
nss_engine_rand.c
Log Message:
Add support for seeding the NSS Random Number Generator. This adds
a new directive, NSSRandomSeed based on the mod_ssl SSLRandomSeed
directive.
--- NEW FILE nss_engine_rand.c ---
/* Copyright 2001-2005 The Apache Software Foundation or its licensors, as
* applicable.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include "mod_nss.h"
/* _________________________________________________________________
**
** Support for better seeding of SSL library's RNG
** _________________________________________________________________
*/
static int nss_rand_choosenum(int, int);
static int nss_rand_feedfp(apr_pool_t *, apr_file_t *, int);
int nss_rand_seed(server_rec *s, apr_pool_t *p, ssl_rsctx_t nCtx, char *prefix)
{
SSLModConfigRec *mc;
apr_array_header_t *apRandSeed;
ssl_randseed_t *pRandSeeds;
ssl_randseed_t *pRandSeed;
unsigned char stackdata[256];
int nReq, nDone;
apr_file_t *fp;
int i, n, l;
mc = myModConfig(s);
nReq = 0;
nDone = 0;
apRandSeed = mc->aRandSeed;
pRandSeeds = (ssl_randseed_t *)apRandSeed->elts;
for (i = 0; i < apRandSeed->nelts; i++) {
pRandSeed = &pRandSeeds[i];
if (pRandSeed->nCtx == nCtx) {
nReq += pRandSeed->nBytes;
if (pRandSeed->nSrc == SSL_RSSRC_FILE) {
/*
* seed in contents of an external file
*/
if (apr_file_open(&fp, pRandSeed->cpPath,
APR_READ, APR_OS_DEFAULT, p) != APR_SUCCESS)
continue;
nDone += nss_rand_feedfp(p, fp, pRandSeed->nBytes);
apr_file_close(fp);
}
else if (pRandSeed->nSrc == SSL_RSSRC_EXEC) {
const char *cmd = pRandSeed->cpPath;
const char **argv = apr_palloc(p, sizeof(char *) * 3);
/*
* seed in contents generated by an external program
*/
argv[0] = cmd;
argv[1] = apr_itoa(p, pRandSeed->nBytes);
argv[2] = NULL;
if ((fp = nss_util_ppopen(s, p, cmd, argv)) == NULL)
continue;
nDone += nss_rand_feedfp(p, fp, pRandSeed->nBytes);
nss_util_ppclose(s, p, fp);
}
else if (pRandSeed->nSrc == SSL_RSSRC_BUILTIN) {
struct {
time_t t;
pid_t pid;
} my_seed;
/*
* seed in the current time (usually just 4 bytes)
*/
my_seed.t = time(NULL);
/*
* seed in the current process id (usually just 4 bytes)
*/
my_seed.pid = mc->pid;
l = sizeof(my_seed);
PK11_RandomUpdate((unsigned char *)&my_seed, l);
nDone += l;
/*
* seed in some current state of the run-time stack (128 bytes)
*/
n = nss_rand_choosenum(0, sizeof(stackdata)-128-1);
PK11_RandomUpdate(stackdata+n, 128);
nDone += 128;
}
}
}
if (nDone > 0)
ap_log_error(APLOG_MARK, APLOG_INFO, 0, s,
"%sSeeding PRNG with %d bytes of entropy", prefix, nDone);
return nDone;
}
#define BUFSIZE 8192
static int nss_rand_feedfp(apr_pool_t *p, apr_file_t *fp, int nReq)
{
apr_size_t nDone;
unsigned char caBuf[BUFSIZE];
apr_size_t nBuf;
apr_size_t nRead;
apr_size_t nTodo;
nDone = 0;
nRead = BUFSIZE;
nTodo = nReq;
while (1) {
if (nReq > 0)
nRead = (nTodo < BUFSIZE ? nTodo : BUFSIZE);
nBuf = nRead;
if (apr_file_read(fp, caBuf, &nBuf) != APR_SUCCESS)
break;
PK11_RandomUpdate(caBuf, nBuf);
nDone += nBuf;
if (nReq > 0) {
nTodo -= nBuf;
if (nTodo <= 0)
break;
}
}
return nDone;
}
static int nss_rand_choosenum(int l, int h)
{
int i;
char buf[50];
apr_snprintf(buf, sizeof(buf), "%.0f",
(((double)(rand()%RAND_MAX)/RAND_MAX)*(h-l)));
i = atoi(buf)+1;
if (i < l) i = l;
if (i > h) i = h;
return i;
}
Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/mod_nss/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Makefile.am 13 Sep 2005 19:34:39 -0000 1.6
+++ Makefile.am 3 Oct 2005 14:59:26 -0000 1.7
@@ -6,7 +6,7 @@
nss_pcache_SOURCES = nss_pcache.c
## Define the source file for the module
-libmodnss_la_SOURCES = mod_nss.c nss_engine_config.c nss_engine_init.c nss_engine_io.c nss_engine_kernel.c nss_engine_log.c nss_engine_pphrase.c nss_engine_vars.c nss_expr.c nss_expr_eval.c nss_expr_parse.y nss_expr_scan.l nss_util.c
+libmodnss_la_SOURCES = mod_nss.c nss_engine_config.c nss_engine_init.c nss_engine_io.c nss_engine_kernel.c nss_engine_log.c nss_engine_pphrase.c nss_engine_vars.c nss_expr.c nss_expr_eval.c nss_expr_parse.y nss_expr_scan.l nss_util.c nss_engine_rand.c
## Set the includes and libraries needed
INCLUDES = -I at apache_inc@ @nspr_inc@ @nss_inc@ @apr_inc@
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/mod_nss/Makefile.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Makefile.in 26 Sep 2005 20:01:24 -0000 1.9
+++ Makefile.in 3 Oct 2005 14:59:26 -0000 1.10
@@ -107,7 +107,7 @@
nss_pcache_SOURCES = nss_pcache.c
-libmodnss_la_SOURCES = mod_nss.c nss_engine_config.c nss_engine_init.c nss_engine_io.c nss_engine_kernel.c nss_engine_log.c nss_engine_pphrase.c nss_engine_vars.c nss_expr.c nss_expr_eval.c nss_expr_parse.y nss_expr_scan.l nss_util.c
+libmodnss_la_SOURCES = mod_nss.c nss_engine_config.c nss_engine_init.c nss_engine_io.c nss_engine_kernel.c nss_engine_log.c nss_engine_pphrase.c nss_engine_vars.c nss_expr.c nss_expr_eval.c nss_expr_parse.y nss_expr_scan.l nss_util.c nss_engine_rand.c
INCLUDES = -I at apache_inc@ @nspr_inc@ @nss_inc@ @apr_inc@
LIBS = @nspr_lib@ @nss_lib@ -lssl3 -lsmime3 -lnss3 -lsoftokn3 -lplc4 -lplds4 -lnspr4
@@ -133,7 +133,7 @@
nss_engine_init.lo nss_engine_io.lo nss_engine_kernel.lo \
nss_engine_log.lo nss_engine_pphrase.lo nss_engine_vars.lo \
nss_expr.lo nss_expr_eval.lo nss_expr_parse.lo nss_expr_scan.lo \
- nss_util.lo
+ nss_util.lo nss_engine_rand.lo
libmodnss_la_OBJECTS = $(am_libmodnss_la_OBJECTS)
bin_PROGRAMS = nss_pcache$(EXEEXT)
PROGRAMS = $(bin_PROGRAMS)
@@ -157,6 +157,7 @@
@AMDEP_TRUE@ ./$(DEPDIR)/nss_engine_kernel.Plo \
@AMDEP_TRUE@ ./$(DEPDIR)/nss_engine_log.Plo \
@AMDEP_TRUE@ ./$(DEPDIR)/nss_engine_pphrase.Plo \
+ at AMDEP_TRUE@ ./$(DEPDIR)/nss_engine_rand.Plo \
@AMDEP_TRUE@ ./$(DEPDIR)/nss_engine_vars.Plo \
@AMDEP_TRUE@ ./$(DEPDIR)/nss_expr.Plo \
@AMDEP_TRUE@ ./$(DEPDIR)/nss_expr_eval.Plo \
@@ -256,6 +257,7 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/nss_engine_kernel.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/nss_engine_log.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/nss_engine_pphrase.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/nss_engine_rand.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/nss_engine_vars.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/nss_expr.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/nss_expr_eval.Plo at am__quote@
Index: mod_nss.c
===================================================================
RCS file: /cvs/dirsec/mod_nss/mod_nss.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mod_nss.c 29 Sep 2005 19:35:43 -0000 1.8
+++ mod_nss.c 3 Oct 2005 14:59:26 -0000 1.9
@@ -63,6 +63,9 @@
SSL_CMD_SRV(OCSP, FLAG,
"OCSP (Online Certificate Status Protocol)"
"(`on', `off')")
+ SSL_CMD_SRV(RandomSeed, TAKE23,
+ "SSL Pseudo Random Number Generator (PRNG) seeding source "
+ "(`startup builtin|file:/path|exec:/path [bytes]')")
/*
* Per-server context configuration directives
Index: mod_nss.h
===================================================================
RCS file: /cvs/dirsec/mod_nss/mod_nss.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mod_nss.h 29 Sep 2005 19:35:43 -0000 1.7
+++ mod_nss.h 3 Oct 2005 14:59:26 -0000 1.8
@@ -163,6 +163,26 @@
} nss_require_t;
/*
+ * Define the SSL random number generator seeding source. The CONNECT
+ * method is not currently used.
+ */
+typedef enum {
+ SSL_RSCTX_STARTUP = 1,
+ SSL_RSCTX_CONNECT = 2
+} ssl_rsctx_t;
+typedef enum {
+ SSL_RSSRC_BUILTIN = 1,
+ SSL_RSSRC_FILE = 2,
+ SSL_RSSRC_EXEC = 3
+} ssl_rssrc_t;
+typedef struct {
+ ssl_rsctx_t nCtx;
+ ssl_rssrc_t nSrc;
+ char *cpPath;
+ int nBytes;
+} ssl_randseed_t;
+
+/*
* Define the SSL verify levels
*/
typedef enum {
@@ -217,6 +237,8 @@
apr_proc_t proc;
apr_procattr_t *procattr;
+ apr_array_header_t *aRandSeed;
+
struct {
void *pV1, *pV2, *pV3, *pV4, *pV5, *pV6, *pV7, *pV8, *pV9, *pV10;
} rCtx;
@@ -328,6 +350,7 @@
const char *nss_cmd_NSSSessionCacheSize(cmd_parms *cmd, void *dcfg, const char *arg);
const char *nss_cmd_NSSPassPhraseDialog(cmd_parms *cmd, void *dcfg, const char *arg);
const char *nss_cmd_NSSPassPhraseHelper(cmd_parms *cmd, void *dcfg, const char *arg);
+const char *nss_cmd_NSSRandomSeed(cmd_parms *, void *, const char *, const char *, const char *);
const char *nss_cmd_NSSUserName(cmd_parms *cmd, void *dcfg, const char *arg);
const char *nss_cmd_NSSOptions(cmd_parms *, void *, const char *);
const char *nss_cmd_NSSRequireSSL(cmd_parms *cmd, void *dcfg);
Index: nss.conf.in
===================================================================
RCS file: /cvs/dirsec/mod_nss/nss.conf.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- nss.conf.in 13 Sep 2005 19:34:39 -0000 1.6
+++ nss.conf.in 3 Oct 2005 14:59:26 -0000 1.7
@@ -50,6 +50,20 @@
NSSSessionCacheTimeout 100
NSSSession3CacheTimeout 86400
+#
+# Pseudo Random Number Generator (PRNG):
+# Configure one or more sources to seed the PRNG of the SSL library.
+# The seed data should be of good random quality.
+# WARNING! On some platforms /dev/random blocks if not enough entropy
+# is available. Those platforms usually also provide a non-blocking
+# device, /dev/urandom, which may be used instead.
+#
+# This does not support seeding the RNG with each connection.
+
+NSSRandomSeed startup builtin
+#NSSRandomSeed startup file:/dev/random 512
+#NSSRandomSeed startup file:/dev/urandom 512
+
##
## SSL Virtual Host Context
##
Index: nss_engine_config.c
===================================================================
RCS file: /cvs/dirsec/mod_nss/nss_engine_config.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- nss_engine_config.c 29 Sep 2005 19:35:43 -0000 1.8
+++ nss_engine_config.c 3 Oct 2005 14:59:26 -0000 1.9
@@ -51,6 +51,8 @@
mc->ssl3_session_cache_timeout = UNSET;
mc->pphrase_dialog_helper = NULL;
mc->pphrase_dialog_path = NULL;
+ mc->aRandSeed = apr_array_make(pool, 4,
+ sizeof(ssl_randseed_t));
apr_pool_userdata_set(mc, SSL_MOD_CONFIG_KEY,
apr_pool_cleanup_null,
@@ -561,6 +563,93 @@
return NULL;
}
+const char *nss_cmd_NSSRandomSeed(cmd_parms *cmd,
+ void *dcfg,
+ const char *arg1,
+ const char *arg2,
+ const char *arg3)
+{
+ SSLModConfigRec *mc = myModConfig(cmd->server);
+ const char *err;
+ ssl_randseed_t *seed;
+ int arg2len = strlen(arg2);
+
+ if ((err = ap_check_cmd_context(cmd, GLOBAL_ONLY))) {
+ return err;
+ }
+
+ /* Only run through this once. Otherwise the random seed sources are
+ * pushed into the array for each server start (and we are guaranteed 2) */
+ if (mc->nInitCount >= 1) {
+ return NULL;
+ }
+
+ seed = apr_array_push(mc->aRandSeed);
+
+ if (strcEQ(arg1, "startup")) {
+ seed->nCtx = SSL_RSCTX_STARTUP;
+ }
+ else if (strcEQ(arg1, "connect")) {
+ return apr_pstrcat(cmd->pool, "NSSRandomSeed: "
+ "mod_nss doesn't do per-connection random seeding",
+ NULL);
+ }
+ else {
+ return apr_pstrcat(cmd->pool, "NSSRandomSeed: "
+ "invalid context: `", arg1, "'",
+ NULL);
+ }
+
+ if ((arg2len > 5) && strEQn(arg2, "file:", 5)) {
+ seed->nSrc = SSL_RSSRC_FILE;
+ seed->cpPath = ap_server_root_relative(mc->pPool, arg2+5);
+ }
+ else if ((arg2len > 5) && strEQn(arg2, "exec:", 5)) {
+ seed->nSrc = SSL_RSSRC_EXEC;
+ seed->cpPath = ap_server_root_relative(mc->pPool, arg2+5);
+ }
+ else if (strcEQ(arg2, "builtin")) {
+ seed->nSrc = SSL_RSSRC_BUILTIN;
+ seed->cpPath = NULL;
+ }
+ else {
+ seed->nSrc = SSL_RSSRC_FILE;
+ seed->cpPath = ap_server_root_relative(mc->pPool, arg2);
+ }
+
+ if (seed->nSrc != SSL_RSSRC_BUILTIN) {
+ apr_finfo_t finfo;
+ if (!seed->cpPath) {
+ return apr_pstrcat(cmd->pool,
+ "Invalid NSSRandomSeed path ",
+ arg2, NULL);
+ }
+ if (apr_stat(&finfo, seed->cpPath, APR_FINFO_TYPE|APR_FINFO_SIZE, cmd->pool) != 0) {
+ return apr_pstrcat(cmd->pool,
+ "NSSRandomSeed: source path '",
+ seed->cpPath, "' does not exist", NULL);
+ }
+ }
+
+ if (!arg3) {
+ seed->nBytes = 0; /* read whole file */
+ }
+ else {
+ if (seed->nSrc == SSL_RSSRC_BUILTIN) {
+ return "NSSRandomSeed: byte specification not "
+ "allowed for builtin seed source";
+ }
+
+ seed->nBytes = atoi(arg3);
+
+ if (seed->nBytes < 0) {
+ return "NSSRandomSeed: invalid number of bytes specified";
+ }
+ }
+
+ return NULL;
+}
+
const char *nss_cmd_NSSUserName(cmd_parms *cmd, void *dcfg,
const char *arg)
{
Index: nss_engine_init.c
===================================================================
RCS file: /cvs/dirsec/mod_nss/nss_engine_init.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- nss_engine_init.c 29 Sep 2005 19:35:43 -0000 1.13
+++ nss_engine_init.c 3 Oct 2005 14:59:26 -0000 1.14
@@ -348,8 +348,14 @@
/* Load our layer */
nss_io_layer_init();
- ap_log_error(APLOG_MARK, APLOG_INFO, 0, s,
- "done layer");
+
+ /*
+ * Seed the Pseudo Random Number Generator (PRNG)
+ * only need ptemp here; nothing inside allocated from the pool
+ * needs to live once we return from nss_rand_seed().
+ */
+ if (mc->nInitCount > 1)
+ nss_rand_seed(base_server, ptemp, SSL_RSCTX_STARTUP, "Init: ");
/*
* initialize servers
From fedora-directory-commits at redhat.com Mon Oct 3 14:59:29 2005
From: fedora-directory-commits at redhat.com (Robert Crittenden (rcritten))
Date: Mon, 3 Oct 2005 10:59:29 -0400
Subject: [Fedora-directory-commits] mod_nss/docs mod_nss.html,1.9,1.10
Message-ID: <200510031459.j93ExTqZ011508@cvs-int.fedora.redhat.com>
Author: rcritten
Update of /cvs/dirsec/mod_nss/docs
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11437/docs
Modified Files:
mod_nss.html
Log Message:
Add support for seeding the NSS Random Number Generator. This adds
a new directive, NSSRandomSeed based on the mod_ssl SSLRandomSeed
directive.
Index: mod_nss.html
===================================================================
RCS file: /cvs/dirsec/mod_nss/docs/mod_nss.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mod_nss.html 29 Sep 2005 19:35:44 -0000 1.9
+++ mod_nss.html 3 Oct 2005 14:59:26 -0000 1.10
@@ -249,7 +249,6 @@
Configuration Directives
The following mod_ssl Directives are not applicable to mod_nss:
- SSLRandomSeed
SSLSessionCache
SSLMutex
SSLCertificateChainFile
@@ -371,6 +370,35 @@
NSSSession3CacheTimeout 86400
+NSSRandomSeed
+
+Configures sources to seed the NSS Random Number Generator (RNG) at
+startup. Currently this only supports seeding the RNG at startup.
+
+
+The following sources are available:
+
+ builtin:
Combines the current system time, the
+current process id
+and a randomly choosen 128-byte extract of the process stack. This is
+not a particularly strong source of entropy.
+ file:/path/to/source:
Reads from the specified file.
+If the number of bytes to read is specified it just reads that amount.
+Be aware that some operating systems block on /dev/random if not enough
+entropy is available. This means that the server will wait until that
+data is available to continue startup. These systems generally offer a
+non-blocking device as well, /dev/urandom.
+ exec:/path/to/program: Executes the given program and takes
+the stdout of it as the entryop. If the bytes argument is included it
+reads that many bytes, otherwise it reads until the program exits.
+
+
+Example
+
+NSSRandomSeed startup builtin
+NSSRandomSeed startup /dev/urandom 512
+NSSRandomSeed startup /usr/bin/makerandom
+
NSSEngine
Enables or disables the SSL protocol. This is usually used within a
From fedora-directory-commits at redhat.com Mon Oct 3 19:54:08 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Mon, 3 Oct 2005 15:54:08 -0400
Subject: [Fedora-directory-commits] ldapserver/lib/libadmin Makefile, 1.9,
1.10
Message-ID: <200510031954.j93Js8KM022261@cvs-int.fedora.redhat.com>
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)
From fedora-directory-commits at redhat.com Mon Oct 3 19:54:08 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Mon, 3 Oct 2005 15:54:08 -0400
Subject: [Fedora-directory-commits] ldapserver/lib/libsi18n Makefile, 1.6,
1.7
Message-ID: <200510031954.j93Js8ae022267@cvs-int.fedora.redhat.com>
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)
From fedora-directory-commits at redhat.com Mon Oct 3 19:53:42 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Mon, 3 Oct 2005 15:53:42 -0400
Subject: [Fedora-directory-commits] ldapserver buildpaths.mk, 1.4,
1.5 component_versions.mk, 1.37, 1.38 components.mk, 1.31,
1.32 internal_buildpaths.mk, 1.5, 1.6 internal_comp_deps.mk,
1.26, 1.27 modules.awk, 1.6, 1.7 nsconfig.mk, 1.15,
1.16 nsdefs.mk, 1.13, 1.14
Message-ID: <200510031954.j93JsDnS022271@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22035/ldapserver
Modified Files:
buildpaths.mk component_versions.mk components.mk
internal_buildpaths.mk internal_comp_deps.mk modules.awk
nsconfig.mk nsdefs.mk
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: buildpaths.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/buildpaths.mk,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- buildpaths.mk 19 Apr 2005 22:06:41 -0000 1.4
+++ buildpaths.mk 3 Oct 2005 19:53:40 -0000 1.5
@@ -115,3 +115,23 @@
NETSNMP_SOURCE_ROOT = $(BUILD_ROOT)/../net-snmp-5.2.1
#NETSNMP_BUILD_DIR = $(BUILD_ROOT)/../net-snmp
+
+ADMINUTIL_SOURCE_ROOT = $(BUILD_ROOT)/../adminutil
+#ADMINUTIL_BUILD_DIR = $(NSCP_DISTDIR_FULL_RTL)/adminutil
+
+SETUPUTIL_SOURCE_ROOT = $(BUILD_ROOT)/../setuputil
+#SETUPUTIL_BUILD_DIR = $(NSCP_DISTDIR_FULL_RTL)/setuputil
+
+LDAPJDK_SOURCE_DIR = $(MOZILLA_SOURCE_ROOT)
+
+ADMINSERVER_SOURCE_ROOT = $(BUILD_ROOT)/../adminserver
+
+LDAPCONSOLE_SOURCE_ROOT = $(BUILD_ROOT)/../directoryconsole
+
+# these are the files needed to build the java components - xmltools and dsmlgw -
+# and where to get them
+# Axis - axis.jar - http://ws.apache.org/axis/index.html - also jaxrpc.jar,saaj.jar
+# Xerces-J - xercesImpl.jar, xml-apis.jar http://xml.apache.org/xerces2-j/download.cgi
+# JAF - activation.jar - http://java.sun.com/products/javabeans/glasgow/jaf.html
+# JWSDP - jaxrpc-api.jar,jaxrpc.jar,saaj.jar - http://java.sun.com/webservices/downloads/webservicespack.html
+# Crimson - crimson.jar - http://xml.apache.org/crimson/
Index: component_versions.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/component_versions.mk,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- component_versions.mk 14 Sep 2005 01:06:59 -0000 1.37
+++ component_versions.mk 3 Oct 2005 19:53:40 -0000 1.38
@@ -103,14 +103,6 @@
ANT_COMP = ant
endif
-# Servlet SDK
-ifndef SERVLET_VERSION
- SERVLET_VERSION = 2.3
-endif
-ifndef SERVLET_COMP
- SERVLET_COMP = javax/servlet
-endif
-
# LDAP JDK
ifndef LDAPJDK_RELDATE
LDAPJDK_RELDATE = v4.17
@@ -208,14 +200,6 @@
AXIS_VERSION=1.2rc3
endif
-# JSP compiler jasper
-ifndef JSPC_VERSION
- JSPC_VERSION = 4.0.3
-endif
-ifndef JSPC_COMP
- JSPC_COMP = javax/jasper
-endif
-
# ICU
ifndef ICU_VERSDIR
ICU_VERSDIR=libicu_2_4
Index: components.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/components.mk,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- components.mk 2 Sep 2005 20:40:46 -0000 1.31
+++ components.mk 3 Oct 2005 19:53:40 -0000 1.32
@@ -483,6 +483,92 @@
### DB component (Berkeley DB) ############################
+
+###########################################
+# SETUPUTIL
+##########################################
+
+ifdef SETUPUTIL_SOURCE_ROOT
+ SETUPUTIL_LIBPATH = $(SETUPUTIL_SOURCE_ROOT)/built/package/$(COMPONENT_OBJDIR)/lib
+ SETUPUTIL_INCDIR = $(SETUPUTIL_SOURCE_ROOT)/built/package/$(COMPONENT_OBJDIR)/include
+ SETUPUTIL_BINPATH = $(SETUPUTIL_SOURCE_ROOT)/built/package/$(COMPONENT_OBJDIR)/bin
+else
+ SETUPUTIL_LIBPATH = $(SETUPUTIL_BUILD_DIR)/lib
+ SETUPUTIL_INCDIR = $(SETUPUTIL_BUILD_DIR)/include
+ SETUPUTIL_BINPATH = $(SETUPUTIL_BUILD_DIR)/bin
+endif
+SETUPUTIL_INCLUDE = -I$(SETUPUTIL_INCDIR)
+
+ifeq ($(ARCH), WINNT)
+SETUPUTILLINK = /LIBPATH:$(SETUPUTIL_LIBPATH) nssetup32.$(LIB_SUFFIX)
+SETUPUTIL_S_LINK = /LIBPATH:$(SETUPUTIL_LIBPATH) nssetup32_s.$(LIB_SUFFIX)
+else
+SETUPUTILLINK = -L$(SETUPUTIL_LIBPATH) -linstall
+SETUPUTIL_S_LINK = $(SETUPUTILLINK)
+endif
+
+# this is the base directory under which the component's files will be found
+# during the build process
+ifdef ADMINUTIL_SOURCE_ROOT
+ ADMINUTIL_LIBPATH = $(ADMINUTIL_SOURCE_ROOT)/built/adminutil/$(COMPONENT_OBJDIR)/lib
+ ADMINUTIL_INCPATH = $(ADMINUTIL_SOURCE_ROOT)/built/adminutil/$(COMPONENT_OBJDIR)/include
+else
+ ADMINUTIL_LIBPATH = $(ADMINUTIL_BUILD_DIR)/lib
+ ADMINUTIL_INCPATH = $(ADMINUTIL_BUILD_DIR)/include
+endif
+
+PACKAGE_SRC_DEST += $(ADMINUTIL_LIBPATH)/property bin/slapd/lib
+LIBS_TO_PKG += $(wildcard $(ADMINUTIL_LIBPATH)/*.$(DLL_SUFFIX))
+LIBS_TO_PKG_CLIENTS += $(wildcard $(ADMINUTIL_LIBPATH)/*.$(DLL_SUFFIX))
+
+ifeq ($(ARCH),WINNT)
+ADMINUTIL_LINK = /LIBPATH:$(ADMINUTIL_LIBPATH) libadminutil$(ADMINUTIL_VER).$(LIB_SUFFIX)
+ADMINUTIL_S_LINK = /LIBPATH:$(ADMINUTIL_LIBPATH) libadminutil_s$(ADMINUTIL_VER).$(LIB_SUFFIX)
+LIBADMINUTILDLL_NAMES = $(ADMINUTIL_LIBPATH)/libadminutil$(ADMINUTIL_VER).$(DLL_SUFFIX)
+else
+ADMINUTIL_LINK=-L$(ADMINUTIL_LIBPATH) -ladminutil$(ADMINUTIL_VER)
+endif
+ADMINUTIL_INCLUDE=-I$(ADMINUTIL_INCPATH) -I$(ADMINUTIL_INCPATH)/libadminutil \
+ -I$(ADMINUTIL_INCPATH)/libadmsslutil
+
+#########################################
+# LDAPJDK
+#########################################
+
+LDAPJDK = ldapjdk.jar
+ifdef LDAPJDK_SOURCE_DIR
+ LDAPJDK_DIR = $(LDAPJDK_SOURCE_DIR)/directory/java-sdk/dist/packages
+else
+ LDAPJDK_DIR = $(CLASS_DEST)
+endif
+LDAPJARFILE=$(LDAPJDK_DIR)/ldapjdk.jar
+
+AXIS = axis-$(AXIS_VERSION).zip
+AXIS_FILES = $(AXIS)
+AXIS_FILE = $(CLASS_DEST)/$(AXIS)
+
+DSMLJAR = activation.jar,jaxrpc-api.jar,jaxrpc.jar,saaj.jar,xercesImpl.jar,xml-apis.jar
+DSMLJAR_FILE = $(CLASS_DEST)
+
+CRIMSON_LICENSE = LICENSE.crimson
+CRIMSONJAR = crimson.jar
+CRIMSONJAR_FILE = $(CLASS_DEST)/$(CRIMSONJAR)
+
+ifdef ADMINSERVER_SOURCE_ROOT
+ ADMSERV_DIR = $(ADMINSERVER_SOURCE_ROOT)/built/package/$(COMPONENT_OBJDIR)
+# else set in internal_buildpaths.mk
+endif
+# these are the only two subcomponents we use from the adminserver package
+ADMINSERVER_SUBCOMPS=admin base
+
+ifdef LDAPCONSOLE_SOURCE_ROOT
+ LDAPCONSOLE_DIR = $(LDAPCONSOLE_SOURCE_ROOT)/built/package
+else
+ LDAPCONSOLE_DIR = $(CLASS_DEST)
+endif
+LDAPCONSOLEJAR = ds$(LDAPCONSOLE_REL).jar
+LDAPCONSOLEJAR_EN = ds$(LDAPCONSOLE_REL)_en.jar
+
# must define dependencies last because they depend on the definitions above
ifeq ($(INTERNAL_BUILD), 1)
include $(BUILD_ROOT)/internal_comp_deps.mk
Index: internal_buildpaths.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/internal_buildpaths.mk,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- internal_buildpaths.mk 19 Apr 2005 22:06:41 -0000 1.5
+++ internal_buildpaths.mk 3 Oct 2005 19:53:40 -0000 1.6
@@ -125,3 +125,17 @@
db_component_name=$(DB_MAJOR_MINOR)
db_path_config :=$(NSCP_DISTDIR)/$(db_component_name)
endif # DB_SOURCE_ROOT
+
+#ADMINUTIL_SOURCE_ROOT = $(BUILD_ROOT)/../adminutil
+ifndef ADMINUTIL_SOURCE_ROOT
+ADMINUTIL_BUILD_DIR = $(NSCP_DISTDIR_FULL_RTL)/adminutil
+endif # ADMINUTIL_SOURCE_ROOT
+
+#SETUPUTIL_SOURCE_ROOT = $(BUILD_ROOT)/../setuputil
+ifndef SETUPUTIL_SOURCE_ROOT
+SETUPUTIL_BUILD_DIR = $(NSCP_DISTDIR_FULL_RTL)/setuputil
+endif # SETUPUTIL_SOURCE_ROOT
+
+ifndef ADMINSERVER_SOURCE_ROOT
+ADMSERV_DIR=$(ABS_ROOT_PARENT)/dist/$(NSOBJDIR_NAME)/adminserver
+endif
Index: internal_comp_deps.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/internal_comp_deps.mk,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- internal_comp_deps.mk 6 Sep 2005 17:30:03 -0000 1.26
+++ internal_comp_deps.mk 3 Oct 2005 19:53:40 -0000 1.27
@@ -330,30 +330,12 @@
ADMINUTIL_IMPORT=$(COMPONENTS_DIR)/${ADMINUTIL_BASE}/$(NSOBJDIR_NAME)
# ADMINUTIL_IMPORT=$(FED_COMPONENTS_DIR)/${ADMINUTIL_BASE}/$(NSOBJDIR_NAME)
endif
-# this is the base directory under which the component's files will be found
-# during the build process
ADMINUTIL_BUILD_DIR=$(NSCP_DISTDIR_FULL_RTL)/adminutil
-ADMINUTIL_LIBPATH=$(ADMINUTIL_BUILD_DIR)/lib
-ADMINUTIL_INCPATH=$(ADMINUTIL_BUILD_DIR)/include
-
-PACKAGE_SRC_DEST += $(ADMINUTIL_LIBPATH)/property bin/slapd/lib
-LIBS_TO_PKG += $(wildcard $(ADMINUTIL_LIBPATH)/*.$(DLL_SUFFIX))
-LIBS_TO_PKG_CLIENTS += $(wildcard $(ADMINUTIL_LIBPATH)/*.$(DLL_SUFFIX))
#
# Libadminutil
#
ADMINUTIL_DEP = $(ADMINUTIL_LIBPATH)/libadminutil$(ADMINUTIL_VER).$(DLL_SUFFIX)
-ifeq ($(ARCH), WINNT)
-ADMINUTIL_LINK = /LIBPATH:$(ADMINUTIL_LIBPATH) libadminutil$(ADMINUTIL_VER).$(LIB_SUFFIX)
-ADMINUTIL_S_LINK = /LIBPATH:$(ADMINUTIL_LIBPATH) libadminutil_s$(ADMINUTIL_VER).$(LIB_SUFFIX)
-LIBADMINUTILDLL_NAMES = $(ADMINUTIL_LIBPATH)/libadminutil$(ADMINUTIL_VER).$(DLL_SUFFIX)
-else
-ADMINUTIL_LINK=-L$(ADMINUTIL_LIBPATH) -ladminutil$(ADMINUTIL_VER)
-endif
-ADMINUTIL_INCLUDE=-I$(ADMINUTIL_INCPATH) \
- -I$(ADMINUTIL_INCPATH)/libadminutil \
- -I$(ADMINUTIL_INCPATH)/libadmsslutil
ifndef ADMINUTIL_PULL_METHOD
ADMINUTIL_PULL_METHOD = $(COMPONENT_PULL_METHOD)
@@ -406,21 +388,13 @@
else
SETUPUTIL_RELEASE = $(FED_COMPONENTS_DIR)/$(SETUPUTIL_VERSDIR)/$(SETUPUTIL_VERSION)/$(NSOBJDIR_NAME)
endif
-SETUPUTIL_LIBPATH = $(SETUPUTIL_BUILD_DIR)/lib
-SETUPUTIL_INCDIR = $(SETUPUTIL_BUILD_DIR)/include
-SETUPUTIL_BINPATH = $(SETUPUTIL_BUILD_DIR)/bin
-SETUPUTIL_INCLUDE = -I$(SETUPUTIL_INCDIR)
ifeq ($(ARCH), WINNT)
SETUPUTIL_FILES = setuputil.tar.gz -unzip $(NSCP_DISTDIR)/setuputil
SETUPUTIL_DEP = $(SETUPUTIL_LIBPATH)/nssetup32.$(LIB_SUFFIX)
-SETUPUTILLINK = /LIBPATH:$(SETUPUTIL_LIBPATH) nssetup32.$(LIB_SUFFIX)
-SETUPUTIL_S_LINK = /LIBPATH:$(SETUPUTIL_LIBPATH) nssetup32_s.$(LIB_SUFFIX)
else
SETUPUTIL_FILES = bin,lib,include
SETUPUTIL_DEP = $(SETUPUTIL_LIBPATH)/libinstall.$(LIB_SUFFIX)
-SETUPUTILLINK = -L$(SETUPUTIL_LIBPATH) -linstall
-SETUPUTIL_S_LINK = $(SETUPUTILLINK)
endif
ifndef SETUPUTIL_PULL_METHOD
@@ -436,17 +410,14 @@
- at if [ ! -f $@ ] ; \
then echo "Error: could not get component SETUPUTIL file $@" ; \
fi
+
# apache-axis java classes #######################################
-AXIS = axis-$(AXIS_VERSION).zip
-AXIS_FILES = $(AXIS)
AXIS_RELEASE = $(COMPONENTS_DIR)/axis
#AXISJAR_DIR = $(AXISJAR_RELEASE)/$(AXISJAR_COMP)/$(AXISJAR_VERSION)
AXIS_DIR = $(AXIS_RELEASE)/$(AXIS_VERSION)
-AXIS_FILE = $(CLASS_DEST)/$(AXIS)
AXIS_DEP = $(AXIS_FILE)
AXIS_REL_DIR=$(subst -bin,,$(subst .zip,,$(AXIS)))
-
# This is java, so there is only one real platform subdirectory
#PACKAGE_UNDER_JAVA += $(AXIS_FILE)
@@ -461,21 +432,18 @@
$(FTP_PULL) -method $(COMPONENT_PULL_METHOD) \
-objdir $(CLASS_DEST) -componentdir $(AXIS_DIR) \
-files $(AXIS_FILES) -unzip $(CLASS_DEST)
-endif
+endifldap/
- at if [ ! -f $@ ] ; \
then echo "Error: could not get component AXIS files $@" ; \
fi
###########################################################
-
# other dsml java classes #######################################
-DSMLJAR = activation.jar,jaxrpc-api.jar,jaxrpc.jar,saaj.jar,xercesImpl.jar,xml-apis.jar
DSMLJAR_FILES = $(DSMLJAR)
DSMLJAR_RELEASE = $(COMPONENTS_DIR)
#DSMLJARJAR_DIR = $(DSMLJARJAR_RELEASE)/$(DSMLJARJAR_COMP)/$(DSMLJARJAR_VERSION)
DSMLJAR_DIR = $(DSMLJAR_RELEASE)/dsmljars
-DSMLJAR_FILE = $(CLASS_DEST)
DSMLJAR_DEP = $(CLASS_DEST)/activation.jar $(CLASS_DEST)/jaxrpc-api.jar $(CLASS_DEST)/jaxrpc.jar $(CLASS_DEST)/saaj.jar $(CLASS_DEST)/xercesImpl.jar $(CLASS_DEST)/xml-apis.jar
ifndef DSMLJAR_PULL_METHOD
@@ -497,15 +465,11 @@
###########################################################
# XMLTOOLS java classes #######################################
-CRIMSONJAR = crimson.jar
-CRIMSON_LICENSE = LICENSE.crimson
CRIMSONJAR_FILES = $(CRIMSONJAR),$(CRIMSON_LICENSE)
CRIMSONJAR_RELEASE = $(COMPONENTS_DIR)
CRIMSONJAR_DIR = $(CRIMSONJAR_RELEASE)/$(CRIMSONJAR_COMP)/$(CRIMSONJAR_VERSION)
-CRIMSONJAR_FILE = $(CLASS_DEST)/$(CRIMSONJAR)
CRIMSONJAR_DEP = $(CRIMSONJAR_FILE) $(CLASS_DEST)/$(CRIMSON_LICENSE)
-
# This is java, so there is only one real platform subdirectory
PACKAGE_UNDER_JAVA += $(CRIMSONJAR_FILE)
@@ -516,7 +480,6 @@
$(CRIMSONJAR_DEP): $(CLASS_DEST)
ifdef COMPONENT_DEPS
- echo "Inside ftppull"
$(FTP_PULL) -method $(COMPONENT_PULL_METHOD) \
-objdir $(CLASS_DEST) -componentdir $(CRIMSONJAR_DIR) \
-files $(CRIMSONJAR_FILES)
@@ -529,6 +492,7 @@
# ANT java classes #######################################
ifeq ($(BUILD_JAVA_CODE),1)
+ifndef GET_ANT_FROM_PATH
# (we use ant for building some Java code)
ANTJAR = ant.jar
JAXPJAR = jaxp.jar
@@ -555,42 +519,14 @@
then echo "Error: could not get component ant files $@" ; \
fi
endif
-###########################################################
-
-# Servlet SDK classes #######################################
-SERVLETJAR = servlet.jar
-SERVLET_FILES = $(SERVLETJAR)
-SERVLET_RELEASE = $(COMPONENTS_DIR)
-SERVLET_DIR = $(SERVLET_RELEASE)/$(SERVLET_COMP)/$(SERVLET_VERSION)
-SERVLET_DEP = $(addprefix $(CLASS_DEST)/, $(SERVLET_FILES))
-SERVLET_CP = $(subst $(SPACE),$(PATH_SEP),$(SERVLET_DEP))
-SERVLET_PULL = $(subst $(SPACE),$(COMMA),$(SERVLET_FILES))
-
-ifndef SERVLET_PULL_METHOD
-SERVLET_PULL_METHOD = $(COMPONENT_PULL_METHOD)
-endif
-
-$(SERVLET_DEP): $(CLASS_DEST)
-ifdef COMPONENT_DEPS
- echo "Inside ftppull"
- $(FTP_PULL) -method $(COMPONENT_PULL_METHOD) \
- -objdir $(CLASS_DEST) -componentdir $(SERVLET_DIR) \
- -files $(SERVLET_PULL)
-endif
- - at if [ ! -f $@ ] ; \
- then echo "Error: could not get component servlet SDK files $@" ; \
- fi
-
+endif # GET_ANT_FROM_PATH
###########################################################
# LDAP java classes #######################################
-LDAPJDK = ldapjdk.jar
LDAPJDK_VERSION = $(LDAPJDK_RELDATE)
LDAPJDK_RELEASE = $(COMPONENTS_DIR)
-LDAPJDK_DIR = $(LDAPJDK_RELEASE)
LDAPJDK_IMPORT = $(LDAPJDK_RELEASE)/$(LDAPJDK_COMP)/$(LDAPJDK_VERSION)/$(NSOBJDIR_NAME)
# This is java, so there is only one real platform subdirectory
-LDAPJARFILE=$(CLASS_DEST)/ldapjdk.jar
LDAPJDK_DEP=$(LDAPJARFILE)
#PACKAGE_UNDER_JAVA += $(LDAPJARFILE)
@@ -612,23 +548,21 @@
###########################################################
# LDAP Console java classes
###########################################################
-LDAPCONSOLEJAR = ds$(LDAPCONSOLE_REL).jar
-LDAPCONSOLEJAR_EN = ds$(LDAPCONSOLE_REL)_en.jar
#LDAPCONSOLE_RELEASE=$(COMPONENTS_DIR_DEV)
LDAPCONSOLE_RELEASE=$(COMPONENTS_DIR)
LDAPCONSOLE_JARDIR = $(LDAPCONSOLE_RELEASE)/ldapconsole/$(LDAPCONSOLE_COMP)$(BUILD_MODE)/$(LDAPCONSOLE_RELDATE)/jars
-LDAPCONSOLE_DEP = $(CLASS_DEST)/$(LDAPCONSOLEJAR)
+LDAPCONSOLE_DEP = $(LDAPCONSOLE_DIR)/$(LDAPCONSOLEJAR)
LDAPCONSOLE_FILES=$(LDAPCONSOLEJAR),$(LDAPCONSOLEJAR_EN)
ifndef LDAPCONSOLE_PULL_METHOD
LDAPCONSOLE_PULL_METHOD = $(COMPONENT_PULL_METHOD)
endif
-$(LDAPCONSOLE_DEP): $(CLASS_DEST)
+$(LDAPCONSOLE_DEP): $(LDAPCONSOLE_DIR)
ifdef COMPONENT_DEPS
$(FTP_PULL) -method $(LDAPCONSOLE_PULL_METHOD) \
- -objdir $(CLASS_DEST) -componentdir $(LDAPCONSOLE_JARDIR) \
+ -objdir $(LDAPCONSOLE_DIR) -componentdir $(LDAPCONSOLE_JARDIR) \
-files $(LDAPCONSOLE_FILES)
endif
- at if [ ! -f $@ ] ; \
@@ -643,79 +577,15 @@
PERLDAP_ZIP_FILE = perldap14.zip
###########################################################
-
-# JSS classes - for the Mission Control Console ######
-JSSJAR = jss$(JSS_JAR_VERSION).jar
-JSSJARFILE = $(CLASS_DEST)/$(JSSJAR)
-JSS_RELEASE = $(COMPONENTS_DIR)/$(JSS_COMP)/$(JSS_VERSION)
-JSS_DEP = $(JSSJARFILE)
-
-#PACKAGE_UNDER_JAVA += $(JSSJARFILE)
-
-ifndef JSS_PULL_METHOD
-JSS_PULL_METHOD = $(COMPONENT_PULL_METHOD)
-endif
-
-$(JSS_DEP): $(CLASS_DEST)
-ifdef COMPONENT_DEPS
-ifdef VSFTPD_HACK
-# work around vsftpd -L problem
- $(FTP_PULL) -method $(JSS_PULL_METHOD) \
- -objdir $(CLASS_DEST)/jss -componentdir $(JSS_RELEASE) \
- -files xpclass.jar
- mv $(CLASS_DEST)/jss/xpclass.jar $(CLASS_DEST)/$(JSSJAR)
- rm -rf $(CLASS_DEST)/jss
-else
- $(FTP_PULL) -method $(JSS_PULL_METHOD) \
- -objdir $(CLASS_DEST) -componentdir $(JSS_RELEASE) \
- -files $(JSSJAR)
-endif
-endif
- - at if [ ! -f $@ ] ; \
- then echo "Error: could not get component JSS file $@" ; \
- fi
-
-###########################################################
-
-### JSP compiler package ##################################
-
-JSPC_REL = $(JSPC_VERSDIR)
-JSPC_REL_DATE = $(JSPC_VERSION)
-JSPC_FILES = jasper-compiler.jar jasper-runtime.jar
-JSPC_RELEASE = $(COMPONENTS_DIR)
-JSPC_DIR = $(JSPC_RELEASE)/$(JSPC_COMP)/$(JSPC_VERSION)
-JSPC_DEP = $(addprefix $(CLASS_DEST)/, $(JSPC_FILES))
-JSPC_CP = $(subst $(SPACE),$(PATH_SEP),$(JSPC_DEP))
-JSPC_PULL = $(subst $(SPACE),$(COMMA),$(JSPC_FILES))
-
-ifndef JSPC_PULL_METHOD
-JSPC_PULL_METHOD = $(COMPONENT_PULL_METHOD)
-endif
-
-$(JSPC_DEP): $(CLASS_DEST)
-ifdef COMPONENT_DEPS
- echo "Inside ftppull"
- $(FTP_PULL) -method $(COMPONENT_PULL_METHOD) \
- -objdir $(CLASS_DEST) -componentdir $(JSPC_DIR) \
- -files $(JSPC_PULL)
-endif
- - at if [ ! -f $@ ] ; \
- then echo "Error: could not get component jspc files $@" ; \
- fi
-
-###########################################################
-
-###########################################################
### Admin Server package ##################################
ADMIN_REL = $(ADM_VERSDIR)
ADMIN_REL_DATE = $(ADM_VERSION)
#ADMIN_FILE = adminserver.tar.gz
-ADMIN_FILE = admin,base
+ADMIN_FILE = $(subst $(SPACE),$(COMMA),$(ADMINSERVER_SUBCOMPS))
ADMIN_FILE_TAR = adminserver.tar
IMPORTADMINSRV_BASE=$(COMPONENTS_DIR_DEV)/$(ADMIN_REL)/$(ADMIN_REL_DATE)
IMPORTADMINSRV = $(IMPORTADMINSRV_BASE)/$(NSOBJDIR_NAME_32)
-ADMSERV_DIR=$(ABS_ROOT_PARENT)/dist/$(NSOBJDIR_NAME)/adminserver
ADMSERV_DEP = $(ADMSERV_DIR)/admin/admin.inf
ADM_VERSION = $(ADM_RELDATE)
@@ -728,8 +598,7 @@
ifndef ADMSERV_DEPS
ADMSERV_DEPS = $(COMPONENT_DEPS)
endif
-#IMPORTADMINSRV = /share/builds/sbsrel1/admsvr/admsvr62/ships/20030702.2/spd04_Solaris8/SunOS5.8-domestic-optimize-normal
-#ADM_RELEASE = /share/builds/sbsrel1/admsvr/admsvr62/ships/20030702.2/spd04_Solaris8/SunOS5.8-domestic-optimize-normal
+
$(ADMSERV_DEP): $(ABS_ROOT_PARENT)/dist/$(NSOBJDIR_NAME)
ifdef ADMSERV_DEPS
$(FTP_PULL) -method $(ADMSERV_PULL_METHOD) \
@@ -768,7 +637,6 @@
fi
### DOCS END #############################
-
# Windows sync component for Active Directory
ADSYNC = PassSync.msi
ADSYNC_DEST = $(NSCP_DISTDIR_FULL_RTL)/winsync
Index: modules.awk
===================================================================
RCS file: /cvs/dirsec/ldapserver/modules.awk,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- modules.awk 19 Apr 2005 22:06:42 -0000 1.6
+++ modules.awk 3 Oct 2005 19:53:40 -0000 1.7
@@ -254,15 +254,6 @@
#DISTLIB libsec-$(WHICHA) $(MCOM_LIBDIR)/libsec libnspr libdbm libxp
#endif
-ifdef FORTEZZA
-ifeq ($(ARCH), WINNT)
-LIBSEC += $(MCOM_LIBDIR)/../dist/$(NSOBJDIR_NAME)/lib/tssp32.lib
-else
-FORTEZZA_DRIVER = $(MCOM_LIBDIR)/../dist/$(NSOBJDIR_NAME)/lib/libci.a
-endif
-LIBSEC += $(FORTEZZA_DRIVER)
-endif
-
ifneq ($(MODULE), LibNet)
LIBNET=$(MCOM_LIBDIR)/libnet/$(NSOBJDIR_NAME)/libnet.$(LIB_SUFFIX)
DISTLIB libnet.$(LIB_SUFFIX) $(MCOM_LIBDIR)/libnet
Index: nsconfig.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/nsconfig.mk,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- nsconfig.mk 2 Sep 2005 20:40:46 -0000 1.15
+++ nsconfig.mk 3 Oct 2005 19:53:40 -0000 1.16
@@ -67,22 +67,23 @@
USE_DSGW:=1
USE_JAVATOOLS:=1
USE_SETUPUTIL:=1
+else
+ USE_ADMINSERVER:=1
+ USE_CONSOLE:=1
+ USE_DSMLGW:=1
+ USE_ORGCHART:=1
+ USE_DSGW:=1
+ USE_JAVATOOLS:=1
+ USE_SETUPUTIL:=1
endif
include $(BUILD_ROOT)/nsdefs.mk
include $(BUILD_ROOT)/component_versions.mk
-# SEC_SUFFIX is the suffix to be applied to the reldate macro which specifies
-# the security of the specified release, either E for export, D for domestic,
-# or F for Fortezza
-ifdef FORTEZZA
- SEC_SUFFIX = F
+ifeq ($(SECURITY), domestic)
+ SEC_SUFFIX = D
else
- ifeq ($(SECURITY), domestic)
- SEC_SUFFIX = D
- else
- SEC_SUFFIX = E
- endif
+ SEC_SUFFIX = E
endif
PRETTY_ARCH := $(shell uname -s)
@@ -410,10 +411,6 @@
endif
endif
-ifdef FORTEZZA
- MCC_SERVER += -DFORTEZZA -DCLIENT_AUTH
-endif
-
MCC_SERVER += -DSPAPI20 -DBUILD_NUM=$(GET_BUILD_NUM)
# ----------- Default Flags, may be overridden below ------------
@@ -1360,22 +1357,10 @@
# XXXrobm The Sun MD stuff #includes stuff in the nspr dir without a prefix
# Otherwise the second NSCP_DISTDIR/include/nspr would not be necessary
-ifdef NSPR20
MCC_INCLUDE=-I$(BUILD_ROOT)/include \
- -I$(BUILD_ROOT)/include \
+ -I$(BUILD_ROOT)/include \
$(NSPR_INCLUDE) $(DBM_INCLUDE) $(SECURITY_INCLUDE) \
- $(SVRCORE_INCLUDE) \
- -I$(BUILD_ROOT)/nspr20/lib
-
-# $(SVRCORE_INCLUDE) $(NLS_INCLUDE) \
-
-else
-MCC_INCLUDE=-I$(BUILD_ROOT)/include \
- -I$(NSCP_DISTDIR)/include -I$(NSCP_DISTDIR)/include/nspr
-endif
-
-MCC_INCLUDE += -I$(LDAP_INCLUDE)
-MCC_INCLUDE += -I$(SASL_INCLUDE)
+ $(SVRCORE_INCLUDE) -I$(LDAP_INCLUDE) -I$(SASL_INCLUDE)
ifeq ($(ARCH), WINNT)
XP_FLAG=-DXP_WIN32 -DXP_WIN -D_WINDOWS -DXP_PC -DXP_WINNT
Index: nsdefs.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/nsdefs.mk,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- nsdefs.mk 22 Sep 2005 16:48:10 -0000 1.13
+++ nsdefs.mk 3 Oct 2005 19:53:40 -0000 1.14
@@ -44,7 +44,7 @@
#
# BUILD_BOMB=[-DPUMPKIN_HOUR=xxxxxxx or just leave it empty]
# BUILD_DEBUG=[full, optimize, purify, quantify]
-# BUILD_MODULE=[HTTP_ADMIN, HTTP_PERSONAL, HTTP_ENTERPRISE, ...]
+# BUILD_MODULE=[HTTP_ADMIN, ...]
# BUILD_SECURITY=[none, export, domestic]
TMP_ARCH := $(shell uname -s)
@@ -125,22 +125,7 @@
NSPR_SUF=20
LDAP_SUF=50
-# We can't have lite fortezza ( I don't think it makes sense ).
-ifdef FORTEZZA
-BUILD_FORTEZZA=fortezza
-else
-ifdef LITE
-BUILD_FORTEZZA=lite
-else
-BUILD_FORTEZZA=normal
-endif
-endif
-
-ifdef LITE
-IS_DIR_LITE=true
-else
IS_DIR_LITE=false
-endif
# Foreign language support
WEBSERVER_LANGS = ja fr de
@@ -185,7 +170,6 @@
echo BUILD_MODULE=$(BUILD_MODULE)
echo BUILD_SECURITY=$(BUILD_SECURITY)
echo BUILD_DEBUG=$(BUILD_DEBUG)
-echo BUILD_FORTEZZA=$(BUILD_FORTEZZA)
echo BUILD_NSPR_THREADS=$(BUILD_NSPR_THREADS)
echo BUILD_BOMB=$(BUILD_BOMB)
echo BUILD_DLL_VERSION=$(BUILD_DLL_VERSION)
@@ -205,7 +189,6 @@
endif
SECURITY=$(BUILD_SECURITY)
DEBUG=$(BUILD_DEBUG)
-B_FORTEZZA=$(BUILD_FORTEZZA)
BOMB=$(BUILD_BOMB)
NSPR_THREADS=$(BUILD_NSPR_THREADS)
BUILD_DLL=$(BUILD_DLL_VERSION)
@@ -225,13 +208,8 @@
endif
endif
endif
-BASIC_OBJDIR=$(BUILD_ROOT)/built/$(ARCH)$(NSOS_TEST1_TAG)$(NS64TAG)-$(SECURITY)-$(DEBUG)$(RTSUFFIX)-$(B_FORTEZZA)
+BASIC_OBJDIR=$(BUILD_ROOT)/built/$(FULL_RTL_OBJDIR)
-#
-# -- Directory Server Section -----------------------------------------------
-#
-
-ifeq ($(BUILD_MODULE), DIRECTORY)
ifdef NSPR20
NSPR_DIR=nspr20
else
@@ -244,24 +222,13 @@
INSTANCE_NAME_PREFIX="Directory Server"
DIR=slapd
NS_PRODUCT=DIRECTORY_SERVER
-ARCHPROCESSOR=$(ARCH)
ifdef INCLUDE_SSL
SSL_PREFIX=-ssl
endif
-ifeq ($(findstring RHEL, $(BUILD_ARCH)), RHEL)
- NS_BUILD_FLAVOR = $(BUILD_ARCH)$(NS64TAG)-$(SECURITY)$(SSL_PREFIX)-$(DEBUG)$(RTSUFFIX)-$(BUILD_FORTEZZA)$(BUILD_PTHREADS)-$(DIR)
- ARCHPROCESSOR = $(BUILD_ARCH)
-else
- NS_BUILD_FLAVOR = $(ARCH)$(NSOS_TEST1_TAG)$(NS64TAG)-$(SECURITY)$(SSL_PREFIX)-$(DEBUG)$(RTSUFFIX)-$(BUILD_FORTEZZA)$(BUILD_PTHREADS)-$(DIR)
-endif
-NC_BUILD_FLAVOR = $(NSCONFIG)$(NSOBJDIR_TAG).OBJ
-ifeq ($(ARCH), WINNT)
-ifeq ($(PROCESSOR), ALPHA)
-ARCHPROCESSOR=$(ARCH)$(PROCESSOR)
-endif
-endif
-COMMON_OBJDIR=$(BUILD_ROOT)/built/$(ARCHPROCESSOR)$(NSOS_TEST1_TAG)$(NS64TAG)-$(SECURITY)$(SSL_PREFIX)-$(DEBUG)$(RTSUFFIX)-$(BUILD_FORTEZZA)$(BUILD_PTHREADS)-$(DIR)
-COMMON_OBJDIR_32=$(BUILD_ROOT)/built/$(ARCHPROCESSOR)-$(SECURITY)$(SSL_PREFIX)-$(DEBUG)$(RTSUFFIX)-$(BUILD_FORTEZZA)$(BUILD_PTHREADS)-$(DIR)
+NS_BUILD_FLAVOR = $(FULL_RTL_OBJDIR)
+NC_BUILD_FLAVOR = $(FULL_RTL_OBJDIR)
+COMMON_OBJDIR=$(BUILD_ROOT)/built/$(FULL_RTL_OBJDIR)
+COMMON_OBJDIR_32= $(subst $(NS64TAG),,$(COMMON_OBJDIR))
OBJDIR=$(COMMON_OBJDIR)
OBJDIR_32=$(COMMON_OBJDIR_32)
DO_SEARCH=no
@@ -281,36 +248,6 @@
DIRVERDIR=$(COMMON_OBJDIR)/include
DIRVER_H=$(DIRVERDIR)/dirver.h
SDKVER_H=$(DIRVERDIR)/sdkver.h
-endif
-
-#
-# -- Default Section --------------------------------------------------------
-#
-# Some of the _OBJDIR is maintained for backward compatibility until they
-# are all cleaned up. Most of them heavily dependent on value of $(DIR)
-#
-
-ifndef AMDSERV_OBJDIR
-ADMSERV_OBJDIR=$(BASIC_OBJDIR)-admin
-endif
-
-ifndef COMMON_OBJDIR
-COMMON_OBJDIR=$(BASIC_OBJDIR)-$(DIR)
-endif
-
-ifndef HTTPD_OBJDIR
-HTTPD_OBJDIR=$(BASIC_OBJDIR)-$(DIR)
-endif
-
-ifndef MC_ICONS_OBJDIR
-MC_ICONS_OBJDIR=$(BASIC_OBJDIR)-$(DIR)
-endif
-
-ifndef OBJDIR
-OBJDIR=$(BASIC_OBJDIR)-$(DIR)
-endif
-
-ifndef PLUGINS_OBJDIR
-PLUGINS_OBJDIR=$(BASIC_OBJDIR)-$(DIR)/plugins
-endif
+# this is the one that adminutil, setuputil, and adminserver uses
+COMPONENT_OBJDIR=$(FULL_RTL_OBJDIR)
From fedora-directory-commits at redhat.com Mon Oct 3 19:53:43 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Mon, 3 Oct 2005 15:53:43 -0400
Subject: [Fedora-directory-commits] ldapserver/config config.mk,1.7,1.8
Message-ID: <200510031954.j93JsDNL022276@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/config
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22035/ldapserver/config
Modified Files:
config.mk
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: config.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/config/config.mk,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- config.mk 19 Apr 2005 22:06:42 -0000 1.7
+++ config.mk 3 Oct 2005 19:53:40 -0000 1.8
@@ -422,10 +422,6 @@
DEFINES += -DJAVA
endif
-ifdef FORTEZZA
-DEFINES += -DFORTEZZA
-endif
-
######################################################################
GARBAGE = $(DEPENDENCIES) core
From fedora-directory-commits at redhat.com Mon Oct 3 19:53:49 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Mon, 3 Oct 2005 15:53:49 -0400
Subject: [Fedora-directory-commits] ldapserver/ldap javarules.mk, 1.5,
1.6 nsldap.mk, 1.9, 1.10
Message-ID: <200510031954.j93JsJgF022287@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22035/ldapserver/ldap
Modified Files:
javarules.mk nsldap.mk
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: javarules.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/javarules.mk,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- javarules.mk 19 Apr 2005 22:06:52 -0000 1.5
+++ javarules.mk 3 Oct 2005 19:53:46 -0000 1.6
@@ -116,10 +116,7 @@
endif
endif
-CLASSPATH := $(JAVA_SRC_DIR)$(PATH_SEP)$(NMCLFJARFILE)$(PATH_SEP)$(LDAPJARFILE)$(PATH_SEP)$(MCCJARFILE)$(PATH_SEP)$(JAVASSLJARFILE)$(PATH_SEP)$(BASEJARFILE)$(PATH_SEP)$(JSSJARFILE)
-#CLASSPATH := $(JAVA_SRC_DIR)$(PATH_SEP)$(SWINGJARFILE)$(PATH_SEP)$(NMCLFJARFILE)$(PATH_SEP)$(LDAPJARFILE)$(PATH_SEP)$(MCCJARFILE)$(PATH_SEP)$(JAVASSLJARFILE)$(PATH_SEP)$(BASEJARFILE)
-
-RUNCLASSPATH:=$(JAVA_BUILD_DIR) $(PACKAGE_UNDER_JAVA)
+CLASSPATH := $(JAVA_SRC_DIR)$(PATH_SEP)$(LDAPJARFILE)
ifndef JAVA
ifdef JAVABINDIR
@@ -145,6 +142,10 @@
endif
# How to run ant (the Java "make" system)
+ifdef GET_ANT_FROM_PATH
+ANT = ant
+else
ANT = $(JAVA) -Dant.home=$(ANT_HOME) -classpath "$(ANT_CP)$(PATH_SEP)$(JDKLIB)" org.apache.tools.ant.Main
+endif
##########################################################
Index: nsldap.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/nsldap.mk,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- nsldap.mk 10 May 2005 23:17:04 -0000 1.9
+++ nsldap.mk 3 Oct 2005 19:53:46 -0000 1.10
@@ -68,9 +68,9 @@
OBJDIR_BASE = $(notdir $(OBJDIR))
OBJDIR_BASE_32 = $(notdir $(OBJDIR_32))
# Release directory for Directory Server
-RELDIR = $(BUILD_DRIVE)$(RELTOP)/$(DIR)/$(OBJDIR_BASE)
-RELDIR_32 = $(BUILD_DRIVE)$(RELTOP)/$(DIR)/$(OBJDIR_BASE_32)
-RELDIR_UNSTRIP = $(BUILD_DRIVE)$(RELTOP)/$(DIR)/$(ARCHPROCESSOR)$(NS64TAG)-$(SECURITY)$(SSL_PREFIX)-$(DEBUG)$(RTSUFFIX)-unstripped-$(BUILD_FORTEZZA)$(BUILD_PTHREADS)-$(DIR)
+RELDIR = $(BUILD_DRIVE)$(RELTOP)/$(OBJDIR_BASE)
+RELDIR_32 = $(BUILD_DRIVE)$(RELTOP)/$(OBJDIR_BASE_32)
+RELDIR_UNSTRIP = $(RELDIR)-unstripped
# this is the place libraries and plugins go which are used by other
# components i.e. not specific to slapd and its programs
@@ -384,9 +384,6 @@
#
LIBSEC_DEP = $(NSCP_DISTDIR)/lib/libsec-$(SECURITY_EXTN).$(LIB_SUFFIX)
LIBSEC = $(NSCP_DISTDIR)/lib/libsec-$(SECURITY_EXTN).$(LIB_SUFFIX)
-ifdef FORTEZZA
-LIBSEC += $(FORTEZZA_DRIVER)
-endif
#
# Libdb
From fedora-directory-commits at redhat.com Mon Oct 3 19:53:55 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Mon, 3 Oct 2005 15:53:55 -0400
Subject: [Fedora-directory-commits]
ldapserver/ldap/admin/src Makefile, 1.12, 1.13
Message-ID: <200510031954.j93JsP7H022290@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/admin/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22035/ldapserver/ldap/admin/src
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/ldap/admin/src/Makefile,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Makefile 2 Sep 2005 20:40:48 -0000 1.12
+++ Makefile 3 Oct 2005 19:53:52 -0000 1.13
@@ -132,12 +132,6 @@
OPENSOURCE_LIBS += -lsocket -lnsl -lgen -lm -lposix4 -lthread
else
ifeq ($(ARCH),HPUX)
-ifdef FORTEZZA
-# link with libci.a for FORTEZZA builds. On other platforms, libci.a is
-# linked into libds_admin.so, but not on HPUX
-EXTRA_LIBS_DEP += $(FORTEZZA_DRIVER)
-EXTRA_LIBS += $(FORTEZZA_DRIVER)
-endif
ifeq ($(USE_64), 1)
EXTRALDFLAGS += +DA2.0W +DS2.0 +Z
endif
@@ -349,11 +343,7 @@
$(LDAP_SERVER_RELDIR)/latest_file.exe: $(OBJDEST)/latest_file.o
$(LINK_EXE_NOLIBSOBJS) $^
-installPerlFiles: $(BINDIR) $(BINDIR)/Install.pl
-
-$(BINDIR)/Install.pl: CreateInstall.pl $(PERL_SCRIPTS_DEST)
- -@$(RM) $@
- $(CP) $< $@
+installPerlFiles: $(BINDIR) $(PERL_SCRIPTS_DEST)
$(BINDIR)/%: %
-@$(RM) $@
From fedora-directory-commits at redhat.com Mon Oct 3 19:53:48 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Mon, 3 Oct 2005 15:53:48 -0400
Subject: [Fedora-directory-commits] ldapserver/httpd/src unixso.mk,1.7,1.8
Message-ID: <200510031954.j93JsJLj022283@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/httpd/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22035/ldapserver/httpd/src
Modified Files:
unixso.mk
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: unixso.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/httpd/src/unixso.mk,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- unixso.mk 10 May 2005 23:17:04 -0000 1.7
+++ unixso.mk 3 Oct 2005 19:53:41 -0000 1.8
@@ -107,9 +107,6 @@
#NSPRLINK = -L. -lnspr$(DLL_PRESUF)
#NSPRLINK = -L. -ldsnspr$(DLL_PRESUF)
ADM_EXTRA := -L. -L../../lib $(LDAPLINK) $(NSPRLINK) $(EXTRA_LIBS)
-ifdef FORTEZZA
-ADM_EXTRA += $(NSCP_DISTDIR)/lib/libci.$(LIB_SUFFIX)
-endif
DEF_LIBPATH := .:../../lib:$(DEF_LIBPATH)
endif
@@ -160,22 +157,10 @@
LIBSEC1=$(LIBSECOBJS)
endif
-ifdef PRODUCT_IS_DIRECTORY_SERVER
- DAEMONLIB=
-else
- DAEMONLIB=$(OBJDIR)/lib/libhttpdaemon.a
-endif
-
-DEPLIBS = ${DAEMONLIB} $(OBJDIR)/lib/libsi18n.a $(ADMLIB) $(LDAPSDK_DEP)
+DEPLIBS = $(OBJDIR)/lib/libsi18n.a $(ADMLIB) $(LDAPSDK_DEP)
-ifdef FORTEZZA
-LIBSEC1 += $(NSCP_DISTDIR)/lib/libci.$(LIB_SUFFIX)
-endif
-
-DEPLINK = ${DAEMONLIB} $(OBJDIR)/lib/libsi18n.a
-ifneq ($(BUILD_MODULE), HTTP_PERSONAL)
+DEPLINK = $(OBJDIR)/lib/libsi18n.a
DEPLINK += $(OBJDIR)/lib/libmsgdisp.a
-endif
DEPLINK += $(SOLINK) $(LDAPLINK) $(NSPRLINK) $(SOLINK2)
# Relative to the directory that contains the .so
From fedora-directory-commits at redhat.com Mon Oct 3 19:53:54 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Mon, 3 Oct 2005 15:53:54 -0400
Subject: [Fedora-directory-commits] ldapserver/ldap/admin/lib Makefile, 1.7,
1.8
Message-ID: <200510031954.j93JsP6o022291@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/admin/lib
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22035/ldapserver/ldap/admin/lib
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/ldap/admin/lib/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Makefile 19 Apr 2005 22:06:54 -0000 1.7
+++ Makefile 3 Oct 2005 19:53:47 -0000 1.8
@@ -64,9 +64,6 @@
OBJS = $(addprefix $(OBJDEST)/, $(subst .c,.o,$(SRCS)))
INCLUDES += -I$(LDAP_SRC)/admin/include
-ifdef FORTEZZA
-INCLUDES += -I$(BUILD_ROOT)/lib
-endif
EXTRA_LIBS += $(LDAP_COMMON_LIBS) $(SECURITYLINK) $(NSPRLINK)
@@ -77,15 +74,6 @@
EXTRA_LIBS_DEP += $(LDAP_COMMON_LIBS_DEP) $(LDAP_LIBLDIF_DEP)
#EXTRA_LIBS += $(LDAP_COMMON_LIBS) $(LDAP_LIBLDIF) $(LDAP_SDK_LIBLDAP_DLL) \
# $(ADMINUTIL_LINK) $(SECURITYLINK) $(NSPRLINK)
-else # WINNT
-ifdef FORTEZZA
-# libci.a needs to be recompiled with the -Z option on HPUX, until then,
-# we'll link libci.a with the executables which need it -atom
-ifneq ($(ARCH), HPUX)
-EXTRA_LIBS_DEP += $(FORTEZZA_DRIVER)
-EXTRA_LIBS += $(FORTEZZA_DRIVER)
-endif # !HPUX
-endif # FORTEZZA
endif # WINNT
ifeq ($(ARCH), Linux)
From fedora-directory-commits at redhat.com Mon Oct 3 19:53:55 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Mon, 3 Oct 2005 15:53:55 -0400
Subject: [Fedora-directory-commits] ldapserver/ldap/clients/dsgw secglue.c,
1.4, 1.5
Message-ID: <200510031954.j93JsPxc022294@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/clients/dsgw
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22035/ldapserver/ldap/clients/dsgw
Modified Files:
secglue.c
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: secglue.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsgw/secglue.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- secglue.c 19 Apr 2005 22:07:02 -0000 1.4
+++ secglue.c 3 Oct 2005 19:53:53 -0000 1.5
@@ -147,13 +147,6 @@
FUNC(CERT_IsExportVersion)
FUNC(CERT_PublicModulusLen)
-#ifdef FORTEZZA
-FUNC(SSL_EnableGroup)
-FUNC(SEC_OpenVolatileCertDB)
-FUNC(FortezzaConfigureServer)
-FUNC(SSL_IsEnabledGroup)
-#endif /* FORTEZZA */
-
/* DSGW pkennedy added, for HCL integration */
FUNC(BTOA_DataToAscii)
FUNC(ATOB_AsciiToData)
@@ -162,7 +155,6 @@
FUNC(PK11_GetTokenName)
FUNC(PK11_SetPasswordFunc)
FUNC(PK11_FindCertFromNickname)
-FUNC(PK11_FortezzaHasKEA)
FUNC(PK11_ConfigurePKCS11)
FUNC(SSL_SetPolicy)
FUNC(CERT_VerifyCertNow)
From fedora-directory-commits at redhat.com Mon Oct 3 19:53:56 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Mon, 3 Oct 2005 15:53:56 -0400
Subject: [Fedora-directory-commits] ldapserver/ldap/clients/dsmlgw Makefile,
1.7, 1.8
Message-ID: <200510031954.j93JsQZc022297@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/clients/dsmlgw
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22035/ldapserver/ldap/clients/dsmlgw
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/ldap/clients/dsmlgw/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Makefile 19 Apr 2005 22:07:19 -0000 1.7
+++ Makefile 3 Oct 2005 19:53:53 -0000 1.8
@@ -46,7 +46,9 @@
include $(BUILD_ROOT)/ldap/javarules.mk
all: $(ANT_DEP) $(LDAPJDK_DEP)
- cp $(CLASS_DEST)/$(AXIS_REL_DIR)/lib/axis.jar $(CLASS_DEST)
+ @if [ ! -f $(CLASS_DEST)/axis.jar ]; then \
+ cp $(CLASS_DEST)/$(AXIS_REL_DIR)/lib/axis.jar $(CLASS_DEST) ; \
+ fi
$(ANT)
clean:
From fedora-directory-commits at redhat.com Mon Oct 3 19:53:57 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Mon, 3 Oct 2005 15:53:57 -0400
Subject: [Fedora-directory-commits]
ldapserver/ldap/cm/newinst ns-update, 1.6, 1.7
Message-ID: <200510031954.j93JsRnY022301@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/cm/newinst
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22035/ldapserver/ldap/cm/newinst
Modified Files:
ns-update
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: ns-update
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinst/ns-update,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ns-update 19 Apr 2005 22:07:20 -0000 1.6
+++ ns-update 3 Oct 2005 19:53:54 -0000 1.7
@@ -63,11 +63,13 @@
install_nsperl()
{
# the current version of nsPerl to use is defined in the slapd.inf
- nsperlinst=`grep '^NSPerlPostInstall' setup/slapd/slapd.inf | cut -f2 -d=`
- # run the nsperl installer
- $nsperlinst > setup/nsperl/install.log
- # use nsperl as our local copy of perl
- cp `dirname $nsperlinst`/nsperl $PERL
+ nsperlinst=`grep '^NSPerlPostInstall' setup/slapd/slapd.inf | cut -f2 -d= 2> /dev/null`
+ if [ "$nsperlinst" ]; then
+ # run the nsperl installer
+ $nsperlinst > setup/nsperl/install.log
+ # use nsperl as our local copy of perl
+ cp `dirname $nsperlinst`/nsperl $PERL
+ fi
}
wrap_security_tools()
@@ -176,13 +178,8 @@
cd `dirname $0`
rc=0
-if [ "$iDSISolaris" = "" ]; then
- ./ds_create $* $extraflags
- rc=$?
-else
- $PERL -w Install.pl $* $extraflags
- rc=$?
-fi
+./ds_create $* $extraflags
+rc=$?
if [ -f fix_secmod_db_64 ]; then
./fix_secmod_db_64 $sroot/alias $sroot/shared32/bin
From fedora-directory-commits at redhat.com Mon Oct 3 19:54:02 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Mon, 3 Oct 2005 15:54:02 -0400
Subject: [Fedora-directory-commits] ldapserver/ldap/include proto-ntutil.h,
1.4, 1.5
Message-ID: <200510031954.j93JsWFo022313@cvs-int.fedora.redhat.com>
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 */
From fedora-directory-commits at redhat.com Mon Oct 3 19:53:56 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Mon, 3 Oct 2005 15:53:56 -0400
Subject: [Fedora-directory-commits] ldapserver/ldap/cm Makefile,1.33,1.34
Message-ID: <200510031954.j93JsRr9022300@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/cm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22035/ldapserver/ldap/cm
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/ldap/cm/Makefile,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- Makefile 22 Sep 2005 16:48:16 -0000 1.33
+++ Makefile 3 Oct 2005 19:53:54 -0000 1.34
@@ -134,9 +134,6 @@
ifeq ($(BUILD_SECURITY), domestic)
SEC=-sec domestic
-ifdef FORTEZZA
-SEC=-sec fortezza
-endif
else
SEC=-sec export
endif
@@ -188,24 +185,13 @@
PACKAGE_STAGE_DIR=$(OBJDIR)/package
endif
-SHARETOP = $(COMPONENTS_DIR)/ldapsdk
-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)
-IMPORTADMINSRVNOTARBASE = $(COMPONENTS_DIR_DEV)/$(ADM_VERSDIR)/$(ADM_VERSION)/$(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
# symlink to
-ADMIN_IMPORTS=base admin
+ADMIN_IMPORTS=$(ADMINSERVER_SUBCOMPS)
ADMIN_SERVER_TARGZ=adminserver.tar.gz
ADMIN_IMPORTS_TARGZ=$(ADMIN_SERVER_TARGZ)
-# Release directory for ldapsdk
-RELSDK = $(BUILD_DRIVE)$(RELTOP)/ldapsdk/$(OBJDIR_BASE)
-RELJDK = $(BUILD_DRIVE)$(RELTOP)/ldapjdk
-
# these are files we need to put in the command line/console only package
#LDAPSDK_IMPORTS=ldapsearch ldapdelete ldapmodify
@@ -290,8 +276,6 @@
endif
endif
-# Borland libraries are build on NT only
-
dummy:
- at echo SITEHACK = $(SITEHACK)
- at echo PACKAGE_SRC_DEST = $(PACKAGE_SRC_DEST)
@@ -350,17 +334,23 @@
# install the DSMLGW into the client directory
ifeq ($(USE_DSMLGW), 1)
$(MKDIR) $(RELDIR)/clients/dsmlgw
- $(CP) -R $(NSDIST)/classes/$(AXIS_REL_DIR)/webapps/axis/* $(RELDIR)/clients/dsmlgw/
+ if [ -d $(NSDIST)/classes/$(AXIS_REL_DIR)/webapps/axis ] ; then \
+ $(CP) -R $(NSDIST)/classes/$(AXIS_REL_DIR)/webapps/axis/* $(RELDIR)/clients/dsmlgw/ ; \
+ fi
$(INSTALL) -m 644 $(NSDIST)/dsmlgw/dsmlgw.jar $(RELDIR)/clients/dsmlgw/WEB-INF/lib
$(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/clients/dsmlgw/misc/server-config.wsdd $(RELDIR)/clients/dsmlgw/WEB-INF
$(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/clients/dsmlgw/misc/web-app_2_3.dtd $(RELDIR)/clients/dsmlgw/
-
# now time to move the necessary jars in place
$(INSTALL) -m 644 $(NSDIST)/classes/ldapjdk.jar $(RELDIR)/clients/dsmlgw/WEB-INF/lib
$(INSTALL) -m 644 $(NSDIST)/classes/activation.jar $(RELDIR)/clients/dsmlgw/WEB-INF/lib
- $(INSTALL) -m 644 $(NSDIST)/classes/jaxrpc-api.jar $(RELDIR)/clients/dsmlgw/WEB-INF/lib
+# if you use the jaxrpc.jar from the axis distribution, you don't need the api file
+# or perhaps you need the jaxrpc.jar for building, and jaxrpc-api.jar at runtime, or vice versa
+# if so, I'm not sure where to get the implementation
+ if [ -f $(NSDIST)/classes/jaxrpc-api.jar ] ; then \
+ $(INSTALL) -m 644 $(NSDIST)/classes/jaxrpc-api.jar $(RELDIR)/clients/dsmlgw/WEB-INF/lib ; \
+ fi
$(INSTALL) -m 644 $(NSDIST)/classes/jaxrpc.jar $(RELDIR)/clients/dsmlgw/WEB-INF/lib
$(INSTALL) -m 644 $(NSDIST)/classes/saaj.jar $(RELDIR)/clients/dsmlgw/WEB-INF/lib
$(INSTALL) -m 644 $(NSDIST)/classes/xercesImpl.jar $(RELDIR)/clients/dsmlgw/WEB-INF/lib
@@ -472,13 +462,15 @@
# install the ds jar file in the /$(DS_JAR_DEST_PATH) directory
# also install the other jar files we use
ifeq ($(USE_CONSOLE), 1)
- $(INSTALL) -m 644 $(NSDIST)/classes/$(LDAPCONSOLEJAR) $(RELDIR)/$(DS_JAR_DEST_PATH)
- $(INSTALL) -m 644 $(NSDIST)/classes/$(LDAPCONSOLEJAR_EN) $(RELDIR)/$(DS_JAR_DEST_PATH)
+ $(INSTALL) -m 644 $(LDAPCONSOLE_DIR)/$(LDAPCONSOLEJAR) $(RELDIR)/$(DS_JAR_DEST_PATH)
+ $(INSTALL) -m 644 $(LDAPCONSOLE_DIR)/$(LDAPCONSOLEJAR_EN) $(RELDIR)/$(DS_JAR_DEST_PATH)
endif
ifeq ($(USE_JAVATOOLS), 1)
$(INSTALL) -m 644 $(DS_JAR_SRC_PATH)/$(XMLTOOLS_JAR_FILE) $(RELDIR)/$(DS_JAR_DEST_PATH)
$(INSTALL) -m 644 $(NSDIST)/classes/$(CRIMSONJAR) $(RELDIR)/$(DS_JAR_DEST_PATH)
- $(INSTALL) -m 644 $(NSDIST)/classes/$(CRIMSON_LICENSE) $(RELDIR)/$(DS_JAR_DEST_PATH)
+ if [ -f $(NSDIST)/classes/$(CRIMSON_LICENSE) ] ; then \
+ $(INSTALL) -m 644 $(NSDIST)/classes/$(CRIMSON_LICENSE) $(RELDIR)/$(DS_JAR_DEST_PATH) ; \
+ fi
endif
# Images for IM Presence plugin
@@ -513,8 +505,8 @@
endif
# Copy db tools
- $(INSTALL) -m 755 $(DB_BINPATH)/db_printlog* $(RELDIR)/bin/slapd/server
- $(INSTALL) -m 755 $(DB_BINPATH)/db_verify* $(RELDIR)/bin/slapd/server
+ $(INSTALL) -m 755 $(DB_BINPATH)/db_printlog$(EXE_SUFFIX) $(RELDIR)/bin/slapd/server
+ $(INSTALL) -m 755 $(DB_BINPATH)/db_verify$(EXE_SUFFIX) $(RELDIR)/bin/slapd/server
$(INSTALL) -m 755 $(OBJDIR)/lib/libsi18n/ns-slapd.properties $(RELDIR)/bin/slapd/property;
@@ -554,28 +546,13 @@
# For security reason, it's readable only by the owner
chmod 700 $(RELDIR)/bin/slapd/server
-# this is the rule to pull the Infozip utilities
-ifndef INFOZIP_PULL_METHOD
-INFOZIP_PULL_METHOD = FTP
-endif
-
-$(INSTDIR)/tools/infozip.zip:
- $(RM) $@
- $(FTP_PULL) -method $(INFOZIP_PULL_METHOD) \
- -objdir $(dir $@) \
- -componentdir $(COMPONENTS_DIR)/infozip/$(INFOZIP_RELDATE)/$(NSOBJDIR_NAME_32) \
- -files infozip.zip
- @if [ ! -f $@ ] ; \
- then echo "Error: could not get component INFOZIP file $@" ; \
- exit 1 ; \
- fi
-
# this is the rule to pull PerLDAP
ifndef PERLDAP_PULL_METHOD
PERLDAP_PULL_METHOD = FTP
endif
$(INSTDIR)/perldap/$(PERLDAP_ZIP_FILE):
+ifdef INTERNAL_BUILD
$(RM) $@
$(FTP_PULL) -method $(PERLDAP_PULL_METHOD) \
-objdir $(dir $@) \
@@ -586,6 +563,7 @@
exit 1 ; \
fi
$(PERL) -w fixPerlDAPInf.pl $(dir $@)/perldap.inf
+endif
# this is the rule to pull nsPerl
ifndef NSPERL_PULL_METHOD
@@ -593,6 +571,7 @@
endif
$(INSTDIR)/nsperl/$(NSPERL_ZIP_FILE):
+ifdef INTERNAL_BUILD
$(RM) $@
$(FTP_PULL) -method $(NSPERL_PULL_METHOD) \
-objdir $(dir $@) \
@@ -607,6 +586,7 @@
# conflicts with the one in perldap - bug 600138
# SITEHACK is defined in nsperl.mk
# $(ZIP) -d $(dir $@)/$(NSPERL_ZIP_FILE) lib/nsPerl5.6.1/$(SITEHACK)/Mozilla/LDAP/LDIF.pm
+endif
$(INSTDIR)/slapd:
$(MKDIR) -p $@
@@ -619,7 +599,6 @@
packageDirectory: $(INSTDIR)/slapd \
$(INSTDIR)/nsperl/$(NSPERL_ZIP_FILE) \
$(INSTDIR)/perldap/$(PERLDAP_ZIP_FILE) \
- $(INSTDIR)/tools/infozip.zip \
$(ADMSERV_DEP)
ifdef BUILD_PATCH
@@ -657,6 +636,7 @@
endif
endif
endif
+ifeq ($(USE_CONSOLE),1)
# create the slapd-client.zip file, which only has the ds jar file for the console and
# the ldap client utility programs
rm -f $(INSTDIR)/slapd/slapd-client.zip
@@ -668,7 +648,7 @@
# Normal way to ZIP the bits
cd $(RELDIR); $(ZIP) $(ZIP_FLAGS) $(ABS_INSTDIR)/slapd/slapd-client.zip ./java
endif
-
+endif # USE_CONSOLE
#; for file in $(LDAPSDK_IMPORTS) ; \
# do $(ZIP) $(ZIP_FLAGS) -g $(INSTDIR)/slapd/slapd-client.zip bin/slapd/server/$$file$(DOTEXE) ; \
# done
@@ -698,16 +678,14 @@
# if the untar directory is there, hooray; otherwise, we will have to unpack the
# binaries ourselves . . .
- curdir=`pwd`; cd $(INSTDIR) ; \
- if [ ! -d $(IMPORTADMINSRVNOTARBASE)/admin ] ; \
- then for file in $(ADMIN_IMPORTS_TARGZ) ; \
- do rm -rf $$file ; \
- $(GUNZIP) -c $(ADMSERV_DIR)/$$file | $(TAR) xvf - ; \
- done ; \
+ if [ ! -d $(ADMSERV_DIR)/admin ] ; \
+ then \
+ rm -rf $(addprefix $(INSTDIR)/,$(ADMINSERVER_SUBCOMPS)) ; \
+ $(GUNZIP) -c $(ADMSERV_DIR)/$(ADMIN_SERVER_TARGZ) | (cd $(INSTDIR) ; $(TAR) xvf - $(ADMINSERVER_SUBCOMPS)) ; \
else \
- for file in $(ADMIN_IMPORTS) ; \
- do rm -rf $$file ; \
- cp -r $(IMPORTADMINSRVNOTARBASE)/$$file $$file ; \
+ for file in $(ADMINSERVER_SUBCOMPS) ; \
+ do rm -rf $(INSTDIR)/$$file ; \
+ cp -r $(ADMSERV_DIR)/$$file $(INSTDIR)/$$file ; \
done ; \
fi
@@ -715,7 +693,7 @@
rm -f $(INSTDIR)/base/nsbase.zip
# we also need to remove the Archive directive from the [base] section of the
# base.inf file
- $(PERL) -w $(FIX_BASE_INF) $(INSTDIR)/base/base.inf
+# $(PERL) -w $(FIX_BASE_INF) $(INSTDIR)/base/base.inf
# Install LDAP Readme and License files at root of Installation (dated pre-packaging) directory.
# And, replace the License.txt file that is packaged in nssvrcore.zip.
@@ -735,14 +713,14 @@
ifdef BUILD_SHIP
ifndef BUILD_PATCH
cd $(INSTDIR); $(TAR) cvfh - setup.inf setup slapd nsperl \
- perldap dsktune tools $(ADMIN_IMPORTS) | gzip -f > $(BUILD_SHIP)/$(FTPNAMEGZ)
+ perldap dsktune $(ADMIN_IMPORTS) | gzip -f > $(BUILD_SHIP)/$(FTPNAMEGZ)
endif
ifeq ($(DEBUG), optimize)
# $(REMSH) "/u/svbld/bin/preRtm $(BUILD_SHIP) $(FTPNAMEGZ) svbld"
endif
else
cd $(INSTDIR); $(TAR) cvfh - setup.inf setup slapd nsperl \
- perldap dsktune tools $(ADMIN_IMPORTS) | gzip -f > ../all$(NS_BUILD_FLAVOR).tar.gz
+ perldap dsktune $(ADMIN_IMPORTS) | gzip -f > ../all$(NS_BUILD_FLAVOR).tar.gz
endif # BUILD_SHIP
#cp $(INSTDIR).tar.gz $(BUILD_SHIP)
#cp $(INSTDIR)/all$(NS_BUILD_FLAVOR).tar.gz $(BUILD_SHIP)
@@ -941,8 +919,8 @@
$(INSTDIR)/$(SLAPD_DIR)/slapd.z \
$(INSTDIR)/$(SLAPD_DIR)/dsjars.z
-$(INSTDIR)/$(SLAPD_DIR)/dsjars.z: $(CLASS_DEST)/$(LDAPCONSOLEJAR) \
- $(CLASS_DEST)/$(LDAPCONSOLEJAR_EN) $(DS_JAR_SRC_PATH)/$(XMLTOOLS_JAR_FILE)
+$(INSTDIR)/$(SLAPD_DIR)/dsjars.z: $(LDAPCONSOLE_DIR)/$(LDAPCONSOLEJAR) \
+ $(LDAPCONSOLE_DIR)/$(LDAPCONSOLEJAR_EN) $(DS_JAR_SRC_PATH)/$(XMLTOOLS_JAR_FILE)
rm -f $(DSJARS_ZIPFILE); cd $(RELDIR); zip -r $(DSJARS_ZIPFILE) java
$(INSTDIR)/$(SLAPD_DIR)/slapd.z:
@@ -974,7 +952,7 @@
_setup_files: $(INSTDIR)/$(SLAPD_DIR)/dsinst.dll \
$(INSTDIR)/$(SLAPD_DIR)/slapd.inf \
$(INSTDIR)/admin $(INSTDIR)/base \
- $(INSTDIR)/svrcore $(INSTDIR)/tools
+ $(INSTDIR)/svrcore
# see components.mk for a description of PACKAGE_SETUP_LIBS
- at for file in $(PACKAGE_SETUP_LIBS) ; \
do if [ -f $$file ] ; \
@@ -1004,20 +982,6 @@
$(INSTDIR)/svrcore: $(ADMSERV_DIR)/svrcore
cp -R $< $@
-$(INSTDIR)/tools: $(INSTDIR)/tools/infozip.zip
- $(UNZIP) -j $(INSTDIR)/nsperl/$(NSPERL_ZIP_FILE) \
- lib/nsPerl5.6.1/bin/perl$(DOTEXE) -d $@
- $(UNZIP) -j $(INSTDIR)/nsperl/$(NSPERL_ZIP_FILE) \
- lib/nsPerl5.6.1/bin/perl56.dll -d $@
-# We need to pull out the perl lib directory for perl to work
- mkdir $@/tmp
- $(UNZIP) $(INSTDIR)/nsperl/$(NSPERL_ZIP_FILE) \
- lib/nsPerl5.6.1/lib/\* -d $@/tmp
- cp -R $@/tmp/lib/nsPerl5.6.1/lib $@
- rm -rf $@/tmp
- $(UNZIP) -j $< -d $@
- rm -f $<
-
endif
$(OBJDIR)/lib/libsi18n/ns-slapd.properties:
From fedora-directory-commits at redhat.com Mon Oct 3 19:54:03 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Mon, 3 Oct 2005 15:54:03 -0400
Subject: [Fedora-directory-commits] ldapserver/lib/base Makefile,1.6,1.7
Message-ID: <200510031954.j93JsXrP022316@cvs-int.fedora.redhat.com>
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)
From fedora-directory-commits at redhat.com Tue Oct 4 17:03:49 2005
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Tue, 4 Oct 2005 13:03:49 -0400
Subject: [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
Message-ID: <200510041703.j94H3ofj026851@cvs-int.fedora.redhat.com>
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)
- at 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.*
From fedora-directory-commits at redhat.com Tue Oct 4 17:04:09 2005
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Tue, 4 Oct 2005 13:04:09 -0400
Subject: [Fedora-directory-commits] ldapserver/ldap/cm/newinst setup, 1.10,
1.11
Message-ID: <200510041704.j94H4976026860@cvs-int.fedora.redhat.com>
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 "\ $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
From fedora-directory-commits at redhat.com Wed Oct 5 01:29:16 2005
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Tue, 4 Oct 2005 21:29:16 -0400
Subject: [Fedora-directory-commits] ldapserver internal_comp_deps.mk, 1.27,
1.28
Message-ID: <200510050129.j951TGaW008654@cvs-int.fedora.redhat.com>
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
- at if [ ! -f $@ ] ; \
then echo "Error: could not get component AXIS files $@" ; \
fi
From fedora-directory-commits at redhat.com Wed Oct 5 22:09:22 2005
From: fedora-directory-commits at redhat.com (Anthony Foxworth (foxworth))
Date: Wed, 5 Oct 2005 18:09:22 -0400
Subject: [Fedora-directory-commits] onlinehelp - Imported sources
Message-ID: <200510052209.j95M9MRw012339@cvs-int.fedora.redhat.com>
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
From fedora-directory-commits at redhat.com Wed Oct 5 22:17:07 2005
From: fedora-directory-commits at redhat.com (Anthony Foxworth (foxworth))
Date: Wed, 5 Oct 2005 18:17:07 -0400
Subject: [Fedora-directory-commits]
onlinehelp/console/html/en/help/graphics - New directory
Message-ID: <200510052217.j95MH7HA012376@cvs-int.fedora.redhat.com>
Author: foxworth
Update of /cvs/dirsec/onlinehelp/console/html/en/help/graphics
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12362/graphics
Log Message:
Directory /cvs/dirsec/onlinehelp/console/html/en/help/graphics added to the repository
From fedora-directory-commits at redhat.com Wed Oct 5 22:20:42 2005
From: fedora-directory-commits at redhat.com (Anthony Foxworth (foxworth))
Date: Wed, 5 Oct 2005 18:20:42 -0400
Subject: [Fedora-directory-commits]
onlinehelp/console/html/en/help/graphics login.gif, NONE, 1.1
Message-ID: <200510052220.j95MKgr8012415@cvs-int.fedora.redhat.com>
Author: foxworth
Update of /cvs/dirsec/onlinehelp/console/html/en/help/graphics
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12398
Added Files:
login.gif
Log Message:
Import Fedora Directory on-line help files to Fedora CVS
From fedora-directory-commits at redhat.com Wed Oct 5 22:22:21 2005
From: fedora-directory-commits at redhat.com (Anthony Foxworth (foxworth))
Date: Wed, 5 Oct 2005 18:22:21 -0400
Subject: [Fedora-directory-commits] onlinehelp/adminconsole/html/en/help
pixel.gif, NONE, 1.1
Message-ID: <200510052222.j95MMLB9012451@cvs-int.fedora.redhat.com>
Author: foxworth
Update of /cvs/dirsec/onlinehelp/adminconsole/html/en/help
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12436
Added Files:
pixel.gif
Log Message:
Import Fedora Directory on-line help files to Fedora CVS
From fedora-directory-commits at redhat.com Wed Oct 5 22:23:08 2005
From: fedora-directory-commits at redhat.com (Anthony Foxworth (foxworth))
Date: Wed, 5 Oct 2005 18:23:08 -0400
Subject: [Fedora-directory-commits]
onlinehelp/adminconsole/html/en/help/images - New directory
Message-ID: <200510052223.j95MN86B012471@cvs-int.fedora.redhat.com>
Author: foxworth
Update of /cvs/dirsec/onlinehelp/adminconsole/html/en/help/images
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12457/images
Log Message:
Directory /cvs/dirsec/onlinehelp/adminconsole/html/en/help/images added to the repository
From fedora-directory-commits at redhat.com Wed Oct 5 22:24:04 2005
From: fedora-directory-commits at redhat.com (Anthony Foxworth (foxworth))
Date: Wed, 5 Oct 2005 18:24:04 -0400
Subject: [Fedora-directory-commits]
onlinehelp/adminconsole/html/en/help/images login.gif, NONE,
1.1 adminex.jpg, NONE, 1.1
Message-ID: <200510052224.j95MO485012507@cvs-int.fedora.redhat.com>
Author: foxworth
Update of /cvs/dirsec/onlinehelp/adminconsole/html/en/help/images
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12491
Added Files:
login.gif adminex.jpg
Log Message:
Import Fedora Directory on-line help files to Fedora CVS
From fedora-directory-commits at redhat.com Wed Oct 5 22:28:17 2005
From: fedora-directory-commits at redhat.com (Anthony Foxworth (foxworth))
Date: Wed, 5 Oct 2005 18:28:17 -0400
Subject: [Fedora-directory-commits] onlinehelp/directoryconsole - New
directory
Message-ID: <200510052228.j95MSHuA012533@cvs-int.fedora.redhat.com>
Author: foxworth
Update of /cvs/dirsec/onlinehelp/directoryconsole
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12519/directoryconsole
Log Message:
Directory /cvs/dirsec/onlinehelp/directoryconsole added to the repository
From fedora-directory-commits at redhat.com Wed Oct 5 22:28:42 2005
From: fedora-directory-commits at redhat.com (Anthony Foxworth (foxworth))
Date: Wed, 5 Oct 2005 18:28:42 -0400
Subject: [Fedora-directory-commits] onlinehelp/directoryconsole/html - New
directory
Message-ID: <200510052228.j95MSgGo012553@cvs-int.fedora.redhat.com>
Author: foxworth
Update of /cvs/dirsec/onlinehelp/directoryconsole/html
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12539/html
Log Message:
Directory /cvs/dirsec/onlinehelp/directoryconsole/html added to the repository
From fedora-directory-commits at redhat.com Thu Oct 6 17:36:23 2005
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Thu, 6 Oct 2005 13:36:23 -0400
Subject: [Fedora-directory-commits]
ldapserver/ldap/servers/plugins/replication
windows_connection.c, 1.8, 1.8.2.1
Message-ID: <200510061736.j96HaN0e014540@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/replication
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14524
Modified Files:
Tag: Directory71RtmBranch
windows_connection.c
Log Message:
169954 - Winsync initialization would hang with certain entries. Fixed improper use of ldap_get_next.
Index: windows_connection.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/windows_connection.c,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -r1.8 -r1.8.2.1
--- windows_connection.c 9 May 2005 20:34:31 -0000 1.8
+++ windows_connection.c 6 Oct 2005 17:36:20 -0000 1.8.2.1
@@ -553,6 +553,9 @@
int ldap_rc = 0;
LDAPMessage *res = NULL;
int not_unique = 0;
+ int nummessages = 0;
+ int numentries = 0;
+ int numreferences = 0;
LDAPDebug( LDAP_DEBUG_TRACE, "=> windows_search_entry\n", 0, 0, 0 );
@@ -566,8 +569,14 @@
&conn->timeout, 0 /* sizelimit */, &res);
if (LDAP_SUCCESS == ldap_rc)
{
+ if (slapi_is_loglevel_set(SLAPI_LOG_REPL)) {
+ nummessages = ldap_count_messages(conn->ld, res);
+ numentries = ldap_count_entries(conn->ld, res);
+ numreferences = ldap_count_references(conn->ld, res);
+ LDAPDebug( LDAP_DEBUG_REPL, "windows_search_entry: recieved %d messages, %d entries, %d references\n",
+ nummessages, numentries, numreferences );
+ }
LDAPMessage *message = ldap_first_entry(conn->ld, res);
- LDAPMessage *next_entry = NULL;
if (NULL != entry)
{
*entry = windows_LDAPMessage2Entry(conn->ld,message,0);
@@ -575,7 +584,7 @@
/* See if there are any more entries : if so then that's an error
* but we still need to get them to avoid gumming up the connection
*/
- while (NULL != ( next_entry = ldap_next_entry(conn->ld,res)))
+ while (NULL != ( message = ldap_next_entry(conn->ld,message)))
{
not_unique = 1;
}
From fedora-directory-commits at redhat.com Thu Oct 6 17:41:47 2005
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Thu, 6 Oct 2005 13:41:47 -0400
Subject: [Fedora-directory-commits]
ldapserver/ldap/servers/plugins/replication
windows_connection.c, 1.8, 1.9
Message-ID: <200510061741.j96HflLl014601@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/replication
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14585
Modified Files:
windows_connection.c
Log Message:
169954 - Winsync initialization would hang with certain entries. Fixed improper use of ldap_get_next.
Index: windows_connection.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/windows_connection.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- windows_connection.c 9 May 2005 20:34:31 -0000 1.8
+++ windows_connection.c 6 Oct 2005 17:41:44 -0000 1.9
@@ -553,6 +553,9 @@
int ldap_rc = 0;
LDAPMessage *res = NULL;
int not_unique = 0;
+ int nummessages = 0;
+ int numentries = 0;
+ int numreferences = 0;
LDAPDebug( LDAP_DEBUG_TRACE, "=> windows_search_entry\n", 0, 0, 0 );
@@ -566,8 +569,14 @@
&conn->timeout, 0 /* sizelimit */, &res);
if (LDAP_SUCCESS == ldap_rc)
{
+ if (slapi_is_loglevel_set(SLAPI_LOG_REPL)) {
+ nummessages = ldap_count_messages(conn->ld, res);
+ numentries = ldap_count_entries(conn->ld, res);
+ numreferences = ldap_count_references(conn->ld, res);
+ LDAPDebug( LDAP_DEBUG_REPL, "windows_search_entry: recieved %d messages, %d entries, %d references\n",
+ nummessages, numentries, numreferences );
+ }
LDAPMessage *message = ldap_first_entry(conn->ld, res);
- LDAPMessage *next_entry = NULL;
if (NULL != entry)
{
*entry = windows_LDAPMessage2Entry(conn->ld,message,0);
@@ -575,7 +584,7 @@
/* See if there are any more entries : if so then that's an error
* but we still need to get them to avoid gumming up the connection
*/
- while (NULL != ( next_entry = ldap_next_entry(conn->ld,res)))
+ while (NULL != ( message = ldap_next_entry(conn->ld,message)))
{
not_unique = 1;
}
From fedora-directory-commits at redhat.com Thu Oct 6 18:15:38 2005
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Thu, 6 Oct 2005 14:15:38 -0400
Subject: [Fedora-directory-commits]
ldapserver/ldap/servers/plugins/replication
windows_connection.c, 1.8.2.1, 1.8.2.2
Message-ID: <200510061815.j96IFc6V016247@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/replication
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16228
Modified Files:
Tag: Directory71RtmBranch
windows_connection.c
Log Message:
169954 - Moved illegal declaration to the top of code block
Index: windows_connection.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/windows_connection.c,v
retrieving revision 1.8.2.1
retrieving revision 1.8.2.2
diff -u -r1.8.2.1 -r1.8.2.2
--- windows_connection.c 6 Oct 2005 17:36:20 -0000 1.8.2.1
+++ windows_connection.c 6 Oct 2005 18:15:35 -0000 1.8.2.2
@@ -569,6 +569,8 @@
&conn->timeout, 0 /* sizelimit */, &res);
if (LDAP_SUCCESS == ldap_rc)
{
+ LDAPMessage *message = ldap_first_entry(conn->ld, res);
+
if (slapi_is_loglevel_set(SLAPI_LOG_REPL)) {
nummessages = ldap_count_messages(conn->ld, res);
numentries = ldap_count_entries(conn->ld, res);
@@ -576,7 +578,7 @@
LDAPDebug( LDAP_DEBUG_REPL, "windows_search_entry: recieved %d messages, %d entries, %d references\n",
nummessages, numentries, numreferences );
}
- LDAPMessage *message = ldap_first_entry(conn->ld, res);
+
if (NULL != entry)
{
*entry = windows_LDAPMessage2Entry(conn->ld,message,0);
From fedora-directory-commits at redhat.com Thu Oct 6 18:23:12 2005
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Thu, 6 Oct 2005 14:23:12 -0400
Subject: [Fedora-directory-commits]
ldapserver/ldap/servers/plugins/replication
windows_connection.c, 1.9, 1.10
Message-ID: <200510061823.j96INCE8016472@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/replication
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16456
Modified Files:
windows_connection.c
Log Message:
169954 - Moved illegal declaration to the top of code block
Index: windows_connection.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/windows_connection.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- windows_connection.c 6 Oct 2005 17:41:44 -0000 1.9
+++ windows_connection.c 6 Oct 2005 18:23:10 -0000 1.10
@@ -569,6 +569,8 @@
&conn->timeout, 0 /* sizelimit */, &res);
if (LDAP_SUCCESS == ldap_rc)
{
+ LDAPMessage *message = ldap_first_entry(conn->ld, res);
+
if (slapi_is_loglevel_set(SLAPI_LOG_REPL)) {
nummessages = ldap_count_messages(conn->ld, res);
numentries = ldap_count_entries(conn->ld, res);
@@ -576,7 +578,7 @@
LDAPDebug( LDAP_DEBUG_REPL, "windows_search_entry: recieved %d messages, %d entries, %d references\n",
nummessages, numentries, numreferences );
}
- LDAPMessage *message = ldap_first_entry(conn->ld, res);
+
if (NULL != entry)
{
*entry = windows_LDAPMessage2Entry(conn->ld,message,0);
From fedora-directory-commits at redhat.com Fri Oct 7 01:32:59 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Thu, 6 Oct 2005 21:32:59 -0400
Subject: [Fedora-directory-commits]
adminserver/admserv/console/src/com/netscape/management/admserv/images
admin.gif, 1.3, 1.4
Message-ID: <200510070132.j971Wxll031222@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/adminserver/admserv/console/src/com/netscape/management/admserv/images
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31207
Modified Files:
admin.gif
Log Message:
replace the incorrect one with the correct fedora branded graphic
From fedora-directory-commits at redhat.com Fri Oct 7 21:00:52 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Fri, 7 Oct 2005 17:00:52 -0400
Subject: [Fedora-directory-commits] mod_admserv README,1.2,1.3
Message-ID: <200510072100.j97L0qY2000801@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/mod_admserv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv785
Modified Files:
README
Log Message:
updated README
Index: README
===================================================================
RCS file: /cvs/dirsec/mod_admserv/README,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- README 27 Jun 2005 20:48:46 -0000 1.2
+++ README 7 Oct 2005 21:00:49 -0000 1.3
@@ -1,13 +1,7 @@
-To build and have it work you need to:
+mod_admserv - http://directory.fedora.redhat.com/wiki/mod_admserv
-export LD_LIBRARY_PATH=/opt/fedora-ds/bin/https/lib
-export NETSITE_ROOT=/opt/fedora-ds
+mod_admserv provides the HTTP functionality associated with the Fedora Administration Server http://directory.fedora.redhat.com/wiki/AdminServer. It is a standard Apache module and uses standard Apache build tools and configure. In addition, you will also need NSPR, NSS, and the LDAP C SDK from Mozilla, as well as the AdminUtil component provided as part of the Fedora DS - http://directory.fedora.redhat.com/wiki/AdminUtil.
-(or use redhat-ds)
+An example configure command is below, for use with Fedora Core 2 and Red Hat Enterprise Linux 3. For Fedora Core 3 and RHEL4, substitute Linux2.6 for Linux2.4 and RHEL4 for RHEL3 in the configure command.
-I configure it with:
-./configure --with-apr-config --with-apxs=/home/rcrit/redhat/apache/bin/apxs
-
-Internal LDAPSDK support is no longer needed.
-
-See httpd.conf.tmpl for extra configuration needed.
+./configure --with-apr-config --with-apxs=/usr/sbin/apxs --with-nspr-inc=../mozilla/dist/Linux2.4_x86_glibc_PTH_DBG.OBJ/include/ --with-nspr-lib=../mozilla/dist/Linux2.4_x86_glibc_PTH_DBG.OBJ/lib --with-nss-inc=../mozilla/dist/public/nss --with-nss-lib=../mozilla//dist/Linux2.4_x86_glibc_PTH_DBG.OBJ/lib/ --with-ldapsdk-inc=../mozilla/dist/public/ldap --with-ldapsdk-lib=../mozilla/dist/lib --with-adminutil=../adminutil/built/adminutil/RHEL3_x86_gcc3_DBG.OBJ/
From fedora-directory-commits at redhat.com Fri Oct 7 21:49:31 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Fri, 7 Oct 2005 17:49:31 -0400
Subject: [Fedora-directory-commits] adminserver buildpaths.mk, 1.2,
1.3 nsconfig.mk, 1.15, 1.16
Message-ID: <200510072149.j97LnVt2002281@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/adminserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2263/adminserver
Modified Files:
buildpaths.mk nsconfig.mk
Log Message:
by default, use the console ldapjdk.jar and JSS for building and packaging admin server
Index: buildpaths.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/buildpaths.mk,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- buildpaths.mk 6 Oct 2005 03:12:57 -0000 1.2
+++ buildpaths.mk 7 Oct 2005 21:49:29 -0000 1.3
@@ -90,10 +90,12 @@
MOD_ADMSERV_SOURCE_DIR = $(BUILD_ROOT)/../mod_admserv
#MOD_ADMSERV_BUILD_DIR = $(NSCP_COMPDIR)/mod_admserv/$(NSOBJDIR_NAME)
-LDAPJDK_SOURCE_DIR = $(MOZILLA_SOURCE_ROOT)
+CONSOLE_SOURCE_DIR = $(BUILD_ROOT)/../console
-JSS_SOURCE_DIR = $(MOZILLA_SOURCE_ROOT)
+#LDAPJDK_SOURCE_DIR = $(MOZILLA_SOURCE_ROOT)
+LDAPJDK_BUILD_DIR = $(CONSOLE_SOURCE_DIR)/imports/ldapjdk
-CONSOLE_SOURCE_DIR = $(BUILD_ROOT)/../console
+#JSS_SOURCE_DIR = $(MOZILLA_SOURCE_ROOT)
+JSS_BUILD_DIR = $(CONSOLE_SOURCE_DIR)/imports/jss
ONLINEHELP_SOURCE_DIR = $(BUILD_ROOT)/../onlinehelp
Index: nsconfig.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/nsconfig.mk,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- nsconfig.mk 6 Oct 2005 03:12:57 -0000 1.15
+++ nsconfig.mk 7 Oct 2005 21:49:29 -0000 1.16
@@ -873,8 +873,12 @@
ifdef LDAPJDK_SOURCE_DIR
LDAPJDK_DIR = $(LDAPJDK_SOURCE_DIR)/directory/java-sdk/dist/packages
else
+ifdef LDAPJDK_BUILD_DIR
+ LDAPJDK_DIR = $(LDAPJDK_BUILD_DIR)
+else
LDAPJDK_DIR = $(CLASS_DEST)
endif
+endif
#########################################
# JSS - jar and shared library
@@ -888,7 +892,11 @@
endif
JSS_LIBPATH = $(JSS_SOURCE_DIR)/dist/$(MOZ_OBJDIR_NAME)/lib
else
+ifdef INTERNAL_BUILD
JSS_JAR_DIR = $(CLASS_DEST)
+else
+ JSS_JAR_DIR = $(JSS_BUILD_DIR)
+endif
JSS_LIBPATH = $(JSS_BUILD_DIR)/lib
JSS_JAR_NAME = xpclass.jar
endif
From fedora-directory-commits at redhat.com Tue Oct 11 15:01:58 2005
From: fedora-directory-commits at redhat.com (Robert Crittenden (rcritten))
Date: Tue, 11 Oct 2005 11:01:58 -0400
Subject: [Fedora-directory-commits] mod_nss nss_engine_init.c,1.14,1.15
Message-ID: <200510111501.j9BF1x3r024127@cvs-int.fedora.redhat.com>
Author: rcritten
Update of /cvs/dirsec/mod_nss
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22735
Modified Files:
nss_engine_init.c
Log Message:
Close the proxy model socket so NSS can be shutdown gracefully. Also
correct an error where the PKCS#11 slot isn't closed unless a the
certificate key is obtained. This also affected NSS_Shutdown().
Index: nss_engine_init.c
===================================================================
RCS file: /cvs/dirsec/mod_nss/nss_engine_init.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- nss_engine_init.c 3 Oct 2005 14:59:26 -0000 1.14
+++ nss_engine_init.c 11 Oct 2005 15:01:34 -0000 1.15
@@ -756,11 +756,11 @@
nss_die();
}
- if (mctx->nickname != NULL)
+ if (mctx->nickname != NULL) {
ap_log_error(APLOG_MARK, APLOG_INFO, 0, s,
"Using nickname %s.", mctx->nickname);
-
- mctx->servercert = FindServerCertFromNickname(mctx->nickname);
+ mctx->servercert = FindServerCertFromNickname(mctx->nickname);
+ }
/* Verify the certificate chain. */
if (mctx->servercert != NULL && mctx->as_server) {
@@ -812,8 +812,8 @@
if (mctx->servercert) {
mctx->serverkey = PK11_FindPrivateKeyFromCert(slot, mctx->servercert, NULL);
- PK11_FreeSlot(slot);
}
+ PK11_FreeSlot(slot);
if (mctx->as_server && mctx->serverkey == NULL) {
ap_log_error(APLOG_MARK, APLOG_INFO, 0, s,
@@ -952,6 +952,16 @@
shutdowncache = 1;
}
+ if (sc->proxy_enabled) {
+ if (sc->proxy->servercert != NULL) {
+ CERT_DestroyCertificate(sc->proxy->servercert);
+ SECKEY_DestroyPrivateKey(sc->proxy->serverkey);
+ }
+
+ /* Closing this implicitly cleans up the copy of the certificates
+ * and keys associated with any SSL socket */
+ PR_Close(sc->proxy->model);
+ }
}
if (shutdowncache)
From fedora-directory-commits at redhat.com Tue Oct 11 15:40:42 2005
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Tue, 11 Oct 2005 11:40:42 -0400
Subject: [Fedora-directory-commits]
ldapserver/ldap/synctools/passwordsync/passsync dssynch.h, 1.5, 1.6
Message-ID: <200510111540.j9BFegs3024558@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/ldapserver/ldap/synctools/passwordsync/passsync
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24517/synctools/passwordsync/passsync
Modified Files:
dssynch.h
Log Message:
170321 - Increase winsync version to 1.0.1
Index: dssynch.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/synctools/passwordsync/passsync/dssynch.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dssynch.h 19 Apr 2005 22:07:44 -0000 1.5
+++ dssynch.h 11 Oct 2005 15:40:35 -0000 1.6
@@ -65,6 +65,6 @@
#define DS_SERVICE_NAME_UNI L"Netscape Directory Synchronization Service"
#define DS_EVENT_NAME TEXT("Netscape DirSynch")
#define DSS_TERM_EVENT TEXT("NS_DSSYNCH")
-#define SYNCH_VERSION "5.0"
+#define SYNCH_VERSION "1.0.1"
#endif // _DSSYNCH_H_
From fedora-directory-commits at redhat.com Tue Oct 11 15:40:43 2005
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Tue, 11 Oct 2005 11:40:43 -0400
Subject: [Fedora-directory-commits]
ldapserver/ldap/synctools/passwordsync/wix PassSync.wxs, 1.8, 1.9
Message-ID: <200510111540.j9BFehp0024564@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/ldapserver/ldap/synctools/passwordsync/wix
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24517/synctools/passwordsync/wix
Modified Files:
PassSync.wxs
Log Message:
170321 - Increase winsync version to 1.0.1
Index: PassSync.wxs
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/synctools/passwordsync/wix/PassSync.wxs,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- PassSync.wxs 4 May 2005 23:45:07 -0000 1.8
+++ PassSync.wxs 11 Oct 2005 15:40:40 -0000 1.9
@@ -38,11 +38,11 @@
+ Version='1.0.1' Manufacturer='Fedora Project'>
From fedora-directory-commits at redhat.com Tue Oct 11 15:40:37 2005
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Tue, 11 Oct 2005 11:40:37 -0400
Subject: [Fedora-directory-commits]
ldapserver/ldap/servers/ntds/wrapper/wix ntds.wxs, 1.5, 1.6
Message-ID: <200510111541.j9BFf7uh024567@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/ldapserver/ldap/servers/ntds/wrapper/wix
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24517/servers/ntds/wrapper/wix
Modified Files:
ntds.wxs
Log Message:
170321 - Increase winsync version to 1.0.1
Index: ntds.wxs
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/ntds/wrapper/wix/ntds.wxs,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ntds.wxs 13 May 2005 03:20:20 -0000 1.5
+++ ntds.wxs 11 Oct 2005 15:40:35 -0000 1.6
@@ -38,11 +38,11 @@
+ Version='1.0.1' Manufacturer='Fedora Project'>
From fedora-directory-commits at redhat.com Tue Oct 11 15:56:03 2005
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Tue, 11 Oct 2005 11:56:03 -0400
Subject: [Fedora-directory-commits]
ldapserver/ldap/servers/ntds/wrapper/wix ntds.wxs, 1.5.2.1, 1.5.2.2
Message-ID: <200510111556.j9BFu3jZ024775@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/ldapserver/ldap/servers/ntds/wrapper/wix
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24737/servers/ntds/wrapper/wix
Modified Files:
Tag: Directory71RtmBranch
ntds.wxs
Log Message:
170321 - Increase winsync version to 1.0.1
Index: ntds.wxs
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/ntds/wrapper/wix/ntds.wxs,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -r1.5.2.1 -r1.5.2.2
--- ntds.wxs 31 Aug 2005 21:40:53 -0000 1.5.2.1
+++ ntds.wxs 11 Oct 2005 15:56:01 -0000 1.5.2.2
@@ -38,7 +38,7 @@
+ Version='1.0.1' Manufacturer='Fedora Project'>
Author: nkinder
Update of /cvs/dirsec/ldapserver/ldap/synctools/passwordsync/wix
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24737/synctools/passwordsync/wix
Modified Files:
Tag: Directory71RtmBranch
PassSync.wxs
Log Message:
170321 - Increase winsync version to 1.0.1
Index: PassSync.wxs
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/synctools/passwordsync/wix/PassSync.wxs,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -r1.8 -r1.8.2.1
--- PassSync.wxs 4 May 2005 23:45:07 -0000 1.8
+++ PassSync.wxs 11 Oct 2005 15:56:02 -0000 1.8.2.1
@@ -38,11 +38,11 @@
+ Version='1.0.1' Manufacturer='Fedora Project'>
From fedora-directory-commits at redhat.com Tue Oct 11 15:56:04 2005
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Tue, 11 Oct 2005 11:56:04 -0400
Subject: [Fedora-directory-commits]
ldapserver/ldap/synctools/passwordsync/passsync dssynch.h, 1.5,
1.5.2.1
Message-ID: <200510111556.j9BFu4Ji024781@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/ldapserver/ldap/synctools/passwordsync/passsync
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24737/synctools/passwordsync/passsync
Modified Files:
Tag: Directory71RtmBranch
dssynch.h
Log Message:
170321 - Increase winsync version to 1.0.1
Index: dssynch.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/synctools/passwordsync/passsync/dssynch.h,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- dssynch.h 19 Apr 2005 22:07:44 -0000 1.5
+++ dssynch.h 11 Oct 2005 15:56:01 -0000 1.5.2.1
@@ -65,6 +65,6 @@
#define DS_SERVICE_NAME_UNI L"Netscape Directory Synchronization Service"
#define DS_EVENT_NAME TEXT("Netscape DirSynch")
#define DSS_TERM_EVENT TEXT("NS_DSSYNCH")
-#define SYNCH_VERSION "5.0"
+#define SYNCH_VERSION "1.0.1"
#endif // _DSSYNCH_H_
From fedora-directory-commits at redhat.com Wed Oct 12 18:37:38 2005
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Wed, 12 Oct 2005 14:37:38 -0400
Subject: [Fedora-directory-commits]
ldapserver/ldap/synctools/passwordsync/wix PassSync.wxs, 1.9, 1.10
Message-ID: <200510121837.j9CIbcsb003965@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/ldapserver/ldap/synctools/passwordsync/wix
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3949
Modified Files:
PassSync.wxs
Log Message:
170328 - Fixed modify type installation so it actually updates the registry
Index: PassSync.wxs
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/synctools/passwordsync/wix/PassSync.wxs,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- PassSync.wxs 11 Oct 2005 15:40:40 -0000 1.9
+++ PassSync.wxs 12 Oct 2005 18:37:35 -0000 1.10
@@ -47,6 +47,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -124,6 +148,7 @@
+
@@ -814,6 +839,7 @@
+
1]]>
From fedora-directory-commits at redhat.com Wed Oct 12 18:41:06 2005
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Wed, 12 Oct 2005 14:41:06 -0400
Subject: [Fedora-directory-commits]
ldapserver/ldap/synctools/passwordsync/wix PassSync.wxs,
1.8.2.1, 1.8.2.2
Message-ID: <200510121841.j9CIf6Ox003998@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/ldapserver/ldap/synctools/passwordsync/wix
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3982
Modified Files:
Tag: Directory71RtmBranch
PassSync.wxs
Log Message:
170328 - Fixed modify type installation so it actually updates the registry
Index: PassSync.wxs
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/synctools/passwordsync/wix/PassSync.wxs,v
retrieving revision 1.8.2.1
retrieving revision 1.8.2.2
diff -u -r1.8.2.1 -r1.8.2.2
--- PassSync.wxs 11 Oct 2005 15:56:02 -0000 1.8.2.1
+++ PassSync.wxs 12 Oct 2005 18:41:03 -0000 1.8.2.2
@@ -47,6 +47,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -124,6 +148,7 @@
+
@@ -814,6 +839,7 @@
+
1]]>
From fedora-directory-commits at redhat.com Wed Oct 12 21:57:06 2005
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Wed, 12 Oct 2005 17:57:06 -0400
Subject: [Fedora-directory-commits] ldapserver/ldap/cm Makefile, 1.30.2.8,
1.30.2.9
Message-ID: <200510122157.j9CLv6HT008902@cvs-int.fedora.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/cm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8886
Modified Files:
Tag: Directory71RtmBranch
Makefile
Log Message:
[167982] Service Pack framework
fixed RHEL build failure: should have used simply expanded variable when generating a temporary directory name to store the 7.1 RTM package.
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/Makefile,v
retrieving revision 1.30.2.8
retrieving revision 1.30.2.9
diff -u -r1.30.2.8 -r1.30.2.9
--- Makefile 28 Sep 2005 22:47:13 -0000 1.30.2.8
+++ Makefile 12 Oct 2005 21:57:03 -0000 1.30.2.9
@@ -218,8 +218,8 @@
ABSRELDIR = $(ABSBUILD_ROOT)/built/release
GENRPMPATCH = $(ABSBUILD_ROOT)/ldap/cm/genRpmPatch.pl
PATCHINF = $(ABSBUILD_ROOT)/ldap/cm/fedora-patch.inf
-DATETIME = $(shell date +%Y%m%d-%H%M%S)
-SPEXT = .SP.$(DATETIME)
+DATETIME := $(shell date +%Y%m%d-%H%M%S)
+SPEXT := .SP.$(DATETIME)
# This is the directory where we put what we're making: the files which go on the CD.
ifndef INSTDIR
From fedora-directory-commits at redhat.com Wed Oct 12 22:27:22 2005
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Wed, 12 Oct 2005 18:27:22 -0400
Subject: [Fedora-directory-commits]
ldapserver/ldap/synctools/passwordsync/wix PassSync.wxs, 1.10, 1.11
Message-ID: <200510122227.j9CMRMGA010380@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/ldapserver/ldap/synctools/passwordsync/wix
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10364
Modified Files:
PassSync.wxs
Log Message:
170558 - Add certutil, pk12util and missing dlls to PassSync.msi
Index: PassSync.wxs
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/synctools/passwordsync/wix/PassSync.wxs,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- PassSync.wxs 12 Oct 2005 18:37:35 -0000 1.10
+++ PassSync.wxs 12 Oct 2005 22:27:20 -0000 1.11
@@ -74,51 +74,51 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -151,8 +151,15 @@
+
-
+
+
+
+
+
+
+
@@ -181,6 +188,9 @@
+
+
+
From fedora-directory-commits at redhat.com Wed Oct 12 22:30:07 2005
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Wed, 12 Oct 2005 18:30:07 -0400
Subject: [Fedora-directory-commits]
ldapserver/ldap/synctools/passwordsync/wix PassSync.wxs,
1.8.2.2, 1.8.2.3
Message-ID: <200510122230.j9CMU7qo010407@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/ldapserver/ldap/synctools/passwordsync/wix
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10391
Modified Files:
Tag: Directory71RtmBranch
PassSync.wxs
Log Message:
170558 - Add certutil, pk12util and missing dlls to PassSync.msi
Index: PassSync.wxs
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/synctools/passwordsync/wix/PassSync.wxs,v
retrieving revision 1.8.2.2
retrieving revision 1.8.2.3
diff -u -r1.8.2.2 -r1.8.2.3
--- PassSync.wxs 12 Oct 2005 18:41:03 -0000 1.8.2.2
+++ PassSync.wxs 12 Oct 2005 22:30:04 -0000 1.8.2.3
@@ -74,51 +74,51 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -151,8 +151,15 @@
+
-
+
+
+
+
+
+
+
@@ -181,6 +188,9 @@
+
+
+
From fedora-directory-commits at redhat.com Wed Oct 12 23:26:55 2005
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Wed, 12 Oct 2005 19:26:55 -0400
Subject: [Fedora-directory-commits] ldapserver/ldap/synctools/passwordsync
build.bat, 1.8, 1.9
Message-ID: <200510122326.j9CNQtvs011992@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/ldapserver/ldap/synctools/passwordsync
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11976
Modified Files:
build.bat
Log Message:
170558 - Add certutil, pk12util and missing dlls to PassSync.msi
Index: build.bat
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/synctools/passwordsync/build.bat,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- build.bat 16 May 2005 19:41:38 -0000 1.8
+++ build.bat 12 Oct 2005 23:26:52 -0000 1.9
@@ -108,6 +108,15 @@
if EXIST ..\%LIBROOT%\nss\lib\softokn3.dll (
copy /Y ..\%LIBROOT%\nss\lib\softokn3.dll %OBJDEST%\
)
+if EXIST ..\%LIBROOT%\nss\lib\smime3.dll (
+ copy /Y ..\%LIBROOT%\nss\lib\smime3.dll %OBJDEST%\
+)
+if EXIST ..\%LIBROOT%\nss\bin\certutil.exe (
+ copy /Y ..\%LIBROOT%\nss\bin\certutil.exe %OBJDEST%\
+)
+if EXIST ..\%LIBROOT%\nss\bin\pk12util.exe (
+ copy /Y ..\%LIBROOT%\nss\bin\pk12util.exe %OBJDEST%\
+)
xcopy /E /Y /I %WXSDIR%\Binary %OBJDEST%\Binary
From fedora-directory-commits at redhat.com Wed Oct 12 23:28:02 2005
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Wed, 12 Oct 2005 19:28:02 -0400
Subject: [Fedora-directory-commits] ldapserver/ldap/synctools/passwordsync
build.bat, 1.8, 1.8.2.1
Message-ID: <200510122328.j9CNS2vn012026@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/ldapserver/ldap/synctools/passwordsync
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12010
Modified Files:
Tag: Directory71RtmBranch
build.bat
Log Message:
170558 - Add certutil, pk12util and missing dlls to PassSync.msi
Index: build.bat
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/synctools/passwordsync/build.bat,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -r1.8 -r1.8.2.1
--- build.bat 16 May 2005 19:41:38 -0000 1.8
+++ build.bat 12 Oct 2005 23:27:59 -0000 1.8.2.1
@@ -108,6 +108,15 @@
if EXIST ..\%LIBROOT%\nss\lib\softokn3.dll (
copy /Y ..\%LIBROOT%\nss\lib\softokn3.dll %OBJDEST%\
)
+if EXIST ..\%LIBROOT%\nss\lib\smime3.dll (
+ copy /Y ..\%LIBROOT%\nss\lib\smime3.dll %OBJDEST%\
+)
+if EXIST ..\%LIBROOT%\nss\bin\certutil.exe (
+ copy /Y ..\%LIBROOT%\nss\bin\certutil.exe %OBJDEST%\
+)
+if EXIST ..\%LIBROOT%\nss\bin\pk12util.exe (
+ copy /Y ..\%LIBROOT%\nss\bin\pk12util.exe %OBJDEST%\
+)
xcopy /E /Y /I %WXSDIR%\Binary %OBJDEST%\Binary
From fedora-directory-commits at redhat.com Thu Oct 13 18:56:29 2005
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Thu, 13 Oct 2005 14:56:29 -0400
Subject: [Fedora-directory-commits]
ldapserver/ldap/synctools/passwordsync/passsync syncserv.cpp,
1.8, 1.9
Message-ID: <200510131856.j9DIuTbT010858@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/ldapserver/ldap/synctools/passwordsync/passsync
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10842
Modified Files:
syncserv.cpp
Log Message:
170135 - Improved passsync logging facilities
Index: syncserv.cpp
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/synctools/passwordsync/passsync/syncserv.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- syncserv.cpp 1 Jun 2005 18:10:42 -0000 1.8
+++ syncserv.cpp 13 Oct 2005 18:56:26 -0000 1.9
@@ -127,14 +127,12 @@
_snprintf(logPath, SYNCSERV_BUF_SIZE, "%spasssync.log", installPath);
_snprintf(dataFilename, SYNCSERV_BUF_SIZE, "%s\\system32\\passhook.dat", sysPath);
- if(logLevel > 0)
- {
- outLog.open(logPath, ios::out | ios::app);
- }
+ outLog.open(logPath, ios::out | ios::app);
+
if(outLog.is_open())
{
timeStamp(&outLog);
- outLog << "begin log" << endl;
+ outLog << "PassSync service started" << endl;
}
PK11_SetPasswordFunc(passwdcb);
@@ -150,7 +148,7 @@
if(outLog.is_open())
{
timeStamp(&outLog);
- outLog << "end log" << endl;
+ outLog << "PassSync service stopped" << endl;
}
outLog.close();
}
@@ -185,11 +183,27 @@
{
if(passInfoList.empty())
{
+ if(logLevel > 0) {
+ timeStamp(&outLog);
+ outLog << "Password list is empty. Waiting for passhook event" << endl;
+ }
WaitForSingleObject(passhookEventHandle, INFINITE);
+ if(logLevel > 0) {
+ timeStamp(&outLog);
+ outLog << "Received passhook event. Attempting sync" << endl;
+ }
}
else
{
+ if(logLevel > 0) {
+ timeStamp(&outLog);
+ outLog << "Backing off for " << BackoffTime(GetMinBackoff()) << "ms" << endl;
+ }
WaitForSingleObject(passhookEventHandle, BackoffTime(GetMinBackoff()));
+ if(logLevel > 0) {
+ timeStamp(&outLog);
+ outLog << "Backoff time expired. Attempting sync" << endl;
+ }
}
SyncPasswords();
@@ -198,20 +212,20 @@
ResetEvent(passhookEventHandle);
}
- if(saveSet(&passInfoList, dataFilename) == 0)
+ if(passInfoList.size() > 0)
{
- if(outLog.is_open())
+ if(saveSet(&passInfoList, dataFilename) == 0)
{
- timeStamp(&outLog);
- outLog << passInfoList.size() << " entries saved to file" << endl;
+ if(logLevel > 0)
+ {
+ timeStamp(&outLog);
+ outLog << passInfoList.size() << " entries saved to data file" << endl;
+ }
}
- }
- else
- {
- if(outLog.is_open())
+ else
{
timeStamp(&outLog);
- outLog << "failed to save entries to file" << endl;
+ outLog << "Failed to save entries to data file" << endl;
}
}
@@ -233,89 +247,117 @@
if(Connect(&mainLdapConnection, ldapAuthUsername, ldapAuthPassword) < 0)
{
// log connection failure.
- if(outLog.is_open())
- {
- timeStamp(&outLog);
- outLog << "can not connect to ldap server in SyncPasswords" << endl;
- }
+ timeStamp(&outLog);
+ outLog << "Can not connect to ldap server in SyncPasswords" << endl;
goto exit;
}
if(loadSet(&passInfoList, dataFilename) == 0)
{
- if(outLog.is_open())
+ if((passInfoList.size() - tempSize) > 0)
{
- timeStamp(&outLog);
- outLog << passInfoList.size() - tempSize << " new entries loaded from file" << endl;
+ if(logLevel > 0)
+ {
+ timeStamp(&outLog);
+ outLog << passInfoList.size() - tempSize << " new entries loaded from data file" << endl;
+ }
+
+ if(saveSet(&emptyPassInfoList, dataFilename) == 0)
+ {
+ if(logLevel > 0)
+ {
+ timeStamp(&outLog);
+ outLog << "Cleared contents of data file" << endl;
+ }
+ }
+ else
+ {
+ timeStamp(&outLog);
+ outLog << "Failed to clear contents of data file" << endl;
+ }
}
- saveSet(&emptyPassInfoList, dataFilename);
}
else
{
- if(outLog.is_open())
+ timeStamp(&outLog);
+ outLog << "Failed to load entries from file" << endl;
+ }
+
+ if(passInfoList.size() > 0)
+ {
+ if(logLevel > 0)
{
timeStamp(&outLog);
- outLog << "failed to load entries from file" << endl;
+ outLog << "Password list has " << passInfoList.size() << " entries" << endl;
}
}
currentPassInfo = passInfoList.begin();
while(currentPassInfo != passInfoList.end())
{
+ if(logLevel > 0)
+ {
+ timeStamp(&outLog);
+ outLog << "Attempting to sync password for " << currentPassInfo->username << endl;
+ }
+
if(QueryUsername(currentPassInfo->username) == 0)
{
while((dn = GetDN()) != NULL)
{
if(FutureOccurrence(currentPassInfo))
{
- if(outLog.is_open())
+ if(logLevel > 0)
{
timeStamp(&outLog);
- outLog << "newer modifies exist: " << currentPassInfo->username << endl;
+ outLog << "Newer password changes for " << currentPassInfo->username << " exist" << endl;
}
}
else if(MultipleResults() && !SYNCSERV_ALLOW_MULTI_MOD)
{
- if(outLog.is_open())
- {
- timeStamp(&outLog);
- outLog << "multiple results not allowed: " << currentPassInfo->username << endl;
- }
+ timeStamp(&outLog);
+ outLog << "Multiple results not allowed: " << currentPassInfo->username << endl;
}
else if(CanBind(dn, currentPassInfo->password))
{
- if(outLog.is_open())
+ if(logLevel > 0)
{
timeStamp(&outLog);
- outLog << "password match, no modify preformed: " << currentPassInfo->username << endl;
+ outLog << "Password match, no modify performed: " << currentPassInfo->username << endl;
}
}
else if(ModifyPassword(dn, currentPassInfo->password) != 0)
{
// log modify failure.
- if(outLog.is_open())
- {
- timeStamp(&outLog);
- outLog << "modify password for " << currentPassInfo->username << " failed in SyncPasswords" << endl;
- }
+ timeStamp(&outLog);
+ outLog << "Modify password failed for remote entry: " << dn << endl;
}
else
{
- if(outLog.is_open())
+ if(logLevel > 0)
{
timeStamp(&outLog);
- outLog << "password for " << currentPassInfo->username << " modified" << endl;
- outLog << "\t" << dn << endl;
+ outLog << "Password modified for remote entry: " << dn << endl;
}
}
tempPassInfo = currentPassInfo;
currentPassInfo++;
+ if(logLevel > 0)
+ {
+ timeStamp(&outLog);
+ outLog << "Removing password change from list" << endl;
+ }
passInfoList.erase(tempPassInfo);
}
}
else
{
+ if(logLevel > 0)
+ {
+ timeStamp(&outLog);
+ outLog << "Deferring password change for " << currentPassInfo->username << endl;
+ }
currentPassInfo++;
}
}
@@ -340,12 +382,9 @@
{
result = PR_GetError();
- if(outLog.is_open())
- {
- //timeStamp(&outLog);
- //outLog << "ldapssl_client_init failed in Connect" << endl;
- //outLog << "\t" << result << ": " << ldap_err2string(result) << endl;
- }
+ timeStamp(&outLog);
+ outLog << "ldapssl_client_init failed in Connect" << endl;
+ outLog << "\t" << result << ": " << ldap_err2string(result) << endl;
result = GetLastError();
@@ -357,11 +396,8 @@
if(*connection == NULL)
{
- if(outLog.is_open())
- {
- //timeStamp(&outLog);
- //outLog << "ldapssl_init failed in Connect" << endl;
- }
+ timeStamp(&outLog);
+ outLog << "ldapssl_init failed in Connect" << endl;
result = -1;
goto exit;
@@ -371,12 +407,12 @@
if(lastLdapError != LDAP_SUCCESS)
{
- // log reason for bind failure.
- if(outLog.is_open())
+ // Log error if we're binding as ldapAuthUsername
+ if(strcmp(dn, ldapAuthUsername) == 0)
{
- //timeStamp(&outLog);
- //outLog << "ldap error in Connect" << endl;
- //outLog << "\t" << lastLdapError << ": " << ldap_err2string(lastLdapError) << endl;
+ timeStamp(&outLog);
+ outLog << "Ldap bind error in Connect" << endl;
+ outLog << "\t" << lastLdapError << ": " << ldap_err2string(lastLdapError) << endl;
}
result = -1;
@@ -411,27 +447,30 @@
_snprintf(searchFilter, SYNCSERV_BUF_SIZE, "(%s=%s)", ldapUsernameField, username);
+ if(logLevel > 0)
+ {
+ timeStamp(&outLog);
+ outLog << "Searching for (" << ldapUsernameField << "=" << username << ")" << endl;
+ }
+
lastLdapError = ldap_search_ext_s(mainLdapConnection, ldapSearchBase, LDAP_SCOPE_SUBTREE, searchFilter, NULL, 0, NULL, NULL, NULL, -1, &results);
if(lastLdapError != LDAP_SUCCESS)
{
// log reason for search failure.
- if(outLog.is_open())
- {
- timeStamp(&outLog);
- outLog << "ldap error in QueryUsername" << endl;
- outLog << "\t" << lastLdapError << ": " << ldap_err2string(lastLdapError) << endl;
- }
+ timeStamp(&outLog);
+ outLog << "Ldap error in QueryUsername" << endl;
+ outLog << "\t" << lastLdapError << ": " << ldap_err2string(lastLdapError) << endl;
result = -1;
goto exit;
}
if(ldap_first_entry(mainLdapConnection, results) == NULL)
{
- if(outLog.is_open())
+ if(logLevel > 0)
{
timeStamp(&outLog);
- outLog << "there are no entries that match: " << username << endl;
+ outLog << "There are no entries that match: " << username << endl;
}
result = -1;
goto exit;
@@ -480,12 +519,9 @@
if(lastLdapError != LDAP_SUCCESS)
{
// log reason for modify failure.
- if(outLog.is_open())
- {
- timeStamp(&outLog);
- outLog << "ldap error in ModifyPassword" << endl;
- outLog << "\t" << lastLdapError << ": " << ldap_err2string(lastLdapError) << endl;
- }
+ timeStamp(&outLog);
+ outLog << "Ldap error in ModifyPassword" << endl;
+ outLog << "\t" << lastLdapError << ": " << ldap_err2string(lastLdapError) << endl;
result = -1;
}
@@ -595,11 +631,8 @@
if((currentTime - currentPassInfo->atTime) > (maxBackoffTime / 1000))
{
- if(outLog.is_open())
- {
- timeStamp(&outLog);
- outLog << "abandoning password change for " << currentPassInfo->username << ", backoff expired" << endl;
- }
+ timeStamp(&outLog);
+ outLog << "Abandoning password change for " << currentPassInfo->username << ", backoff expired" << endl;
tempPassInfo = currentPassInfo;
currentPassInfo++;
From fedora-directory-commits at redhat.com Thu Oct 13 18:59:23 2005
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Thu, 13 Oct 2005 14:59:23 -0400
Subject: [Fedora-directory-commits]
ldapserver/ldap/synctools/passwordsync/passsync syncserv.cpp,
1.7.2.1, 1.7.2.2
Message-ID: <200510131859.j9DIxNfY010898@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/ldapserver/ldap/synctools/passwordsync/passsync
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10882
Modified Files:
Tag: Directory71RtmBranch
syncserv.cpp
Log Message:
170135 - Improved passsync logging facilities
Index: syncserv.cpp
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/synctools/passwordsync/passsync/syncserv.cpp,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -u -r1.7.2.1 -r1.7.2.2
--- syncserv.cpp 1 Jun 2005 18:30:53 -0000 1.7.2.1
+++ syncserv.cpp 13 Oct 2005 18:59:21 -0000 1.7.2.2
@@ -127,14 +127,12 @@
_snprintf(logPath, SYNCSERV_BUF_SIZE, "%spasssync.log", installPath);
_snprintf(dataFilename, SYNCSERV_BUF_SIZE, "%s\\system32\\passhook.dat", sysPath);
- if(logLevel > 0)
- {
- outLog.open(logPath, ios::out | ios::app);
- }
+ outLog.open(logPath, ios::out | ios::app);
+
if(outLog.is_open())
{
timeStamp(&outLog);
- outLog << "begin log" << endl;
+ outLog << "PassSync service started" << endl;
}
PK11_SetPasswordFunc(passwdcb);
@@ -150,7 +148,7 @@
if(outLog.is_open())
{
timeStamp(&outLog);
- outLog << "end log" << endl;
+ outLog << "PassSync service stopped" << endl;
}
outLog.close();
}
@@ -185,11 +183,27 @@
{
if(passInfoList.empty())
{
+ if(logLevel > 0) {
+ timeStamp(&outLog);
+ outLog << "Password list is empty. Waiting for passhook event" << endl;
+ }
WaitForSingleObject(passhookEventHandle, INFINITE);
+ if(logLevel > 0) {
+ timeStamp(&outLog);
+ outLog << "Received passhook event. Attempting sync" << endl;
+ }
}
else
{
+ if(logLevel > 0) {
+ timeStamp(&outLog);
+ outLog << "Backing off for " << BackoffTime(GetMinBackoff()) << "ms" << endl;
+ }
WaitForSingleObject(passhookEventHandle, BackoffTime(GetMinBackoff()));
+ if(logLevel > 0) {
+ timeStamp(&outLog);
+ outLog << "Backoff time expired. Attempting sync" << endl;
+ }
}
SyncPasswords();
@@ -198,20 +212,20 @@
ResetEvent(passhookEventHandle);
}
- if(saveSet(&passInfoList, dataFilename) == 0)
+ if(passInfoList.size() > 0)
{
- if(outLog.is_open())
+ if(saveSet(&passInfoList, dataFilename) == 0)
{
- timeStamp(&outLog);
- outLog << passInfoList.size() << " entries saved to file" << endl;
+ if(logLevel > 0)
+ {
+ timeStamp(&outLog);
+ outLog << passInfoList.size() << " entries saved to data file" << endl;
+ }
}
- }
- else
- {
- if(outLog.is_open())
+ else
{
timeStamp(&outLog);
- outLog << "failed to save entries to file" << endl;
+ outLog << "Failed to save entries to data file" << endl;
}
}
@@ -233,89 +247,117 @@
if(Connect(&mainLdapConnection, ldapAuthUsername, ldapAuthPassword) < 0)
{
// log connection failure.
- if(outLog.is_open())
- {
- timeStamp(&outLog);
- outLog << "can not connect to ldap server in SyncPasswords" << endl;
- }
+ timeStamp(&outLog);
+ outLog << "Can not connect to ldap server in SyncPasswords" << endl;
goto exit;
}
if(loadSet(&passInfoList, dataFilename) == 0)
{
- if(outLog.is_open())
+ if((passInfoList.size() - tempSize) > 0)
{
- timeStamp(&outLog);
- outLog << passInfoList.size() - tempSize << " new entries loaded from file" << endl;
+ if(logLevel > 0)
+ {
+ timeStamp(&outLog);
+ outLog << passInfoList.size() - tempSize << " new entries loaded from data file" << endl;
+ }
+
+ if(saveSet(&emptyPassInfoList, dataFilename) == 0)
+ {
+ if(logLevel > 0)
+ {
+ timeStamp(&outLog);
+ outLog << "Cleared contents of data file" << endl;
+ }
+ }
+ else
+ {
+ timeStamp(&outLog);
+ outLog << "Failed to clear contents of data file" << endl;
+ }
}
- saveSet(&emptyPassInfoList, dataFilename);
}
else
{
- if(outLog.is_open())
+ timeStamp(&outLog);
+ outLog << "Failed to load entries from file" << endl;
+ }
+
+ if(passInfoList.size() > 0)
+ {
+ if(logLevel > 0)
{
timeStamp(&outLog);
- outLog << "failed to load entries from file" << endl;
+ outLog << "Password list has " << passInfoList.size() << " entries" << endl;
}
}
currentPassInfo = passInfoList.begin();
while(currentPassInfo != passInfoList.end())
{
+ if(logLevel > 0)
+ {
+ timeStamp(&outLog);
+ outLog << "Attempting to sync password for " << currentPassInfo->username << endl;
+ }
+
if(QueryUsername(currentPassInfo->username) == 0)
{
while((dn = GetDN()) != NULL)
{
if(FutureOccurrence(currentPassInfo))
{
- if(outLog.is_open())
+ if(logLevel > 0)
{
timeStamp(&outLog);
- outLog << "newer modifies exist: " << currentPassInfo->username << endl;
+ outLog << "Newer password changes for " << currentPassInfo->username << " exist" << endl;
}
}
else if(MultipleResults() && !SYNCSERV_ALLOW_MULTI_MOD)
{
- if(outLog.is_open())
- {
- timeStamp(&outLog);
- outLog << "multiple results not allowed: " << currentPassInfo->username << endl;
- }
+ timeStamp(&outLog);
+ outLog << "Multiple results not allowed: " << currentPassInfo->username << endl;
}
else if(CanBind(dn, currentPassInfo->password))
{
- if(outLog.is_open())
+ if(logLevel > 0)
{
timeStamp(&outLog);
- outLog << "password match, no modify preformed: " << currentPassInfo->username << endl;
+ outLog << "Password match, no modify performed: " << currentPassInfo->username << endl;
}
}
else if(ModifyPassword(dn, currentPassInfo->password) != 0)
{
// log modify failure.
- if(outLog.is_open())
- {
- timeStamp(&outLog);
- outLog << "modify password for " << currentPassInfo->username << " failed in SyncPasswords" << endl;
- }
+ timeStamp(&outLog);
+ outLog << "Modify password failed for remote entry: " << dn << endl;
}
else
{
- if(outLog.is_open())
+ if(logLevel > 0)
{
timeStamp(&outLog);
- outLog << "password for " << currentPassInfo->username << " modified" << endl;
- outLog << "\t" << dn << endl;
+ outLog << "Password modified for remote entry: " << dn << endl;
}
}
tempPassInfo = currentPassInfo;
currentPassInfo++;
+ if(logLevel > 0)
+ {
+ timeStamp(&outLog);
+ outLog << "Removing password change from list" << endl;
+ }
passInfoList.erase(tempPassInfo);
}
}
else
{
+ if(logLevel > 0)
+ {
+ timeStamp(&outLog);
+ outLog << "Deferring password change for " << currentPassInfo->username << endl;
+ }
currentPassInfo++;
}
}
@@ -340,12 +382,9 @@
{
result = PR_GetError();
- if(outLog.is_open())
- {
- //timeStamp(&outLog);
- //outLog << "ldapssl_client_init failed in Connect" << endl;
- //outLog << "\t" << result << ": " << ldap_err2string(result) << endl;
- }
+ timeStamp(&outLog);
+ outLog << "ldapssl_client_init failed in Connect" << endl;
+ outLog << "\t" << result << ": " << ldap_err2string(result) << endl;
result = GetLastError();
@@ -357,11 +396,8 @@
if(*connection == NULL)
{
- if(outLog.is_open())
- {
- //timeStamp(&outLog);
- //outLog << "ldapssl_init failed in Connect" << endl;
- }
+ timeStamp(&outLog);
+ outLog << "ldapssl_init failed in Connect" << endl;
result = -1;
goto exit;
@@ -371,12 +407,12 @@
if(lastLdapError != LDAP_SUCCESS)
{
- // log reason for bind failure.
- if(outLog.is_open())
+ // Log error if we're binding as ldapAuthUsername
+ if(strcmp(dn, ldapAuthUsername) == 0)
{
- //timeStamp(&outLog);
- //outLog << "ldap error in Connect" << endl;
- //outLog << "\t" << lastLdapError << ": " << ldap_err2string(lastLdapError) << endl;
+ timeStamp(&outLog);
+ outLog << "Ldap bind error in Connect" << endl;
+ outLog << "\t" << lastLdapError << ": " << ldap_err2string(lastLdapError) << endl;
}
result = -1;
@@ -411,27 +447,30 @@
_snprintf(searchFilter, SYNCSERV_BUF_SIZE, "(%s=%s)", ldapUsernameField, username);
+ if(logLevel > 0)
+ {
+ timeStamp(&outLog);
+ outLog << "Searching for (" << ldapUsernameField << "=" << username << ")" << endl;
+ }
+
lastLdapError = ldap_search_ext_s(mainLdapConnection, ldapSearchBase, LDAP_SCOPE_SUBTREE, searchFilter, NULL, 0, NULL, NULL, NULL, -1, &results);
if(lastLdapError != LDAP_SUCCESS)
{
// log reason for search failure.
- if(outLog.is_open())
- {
- timeStamp(&outLog);
- outLog << "ldap error in QueryUsername" << endl;
- outLog << "\t" << lastLdapError << ": " << ldap_err2string(lastLdapError) << endl;
- }
+ timeStamp(&outLog);
+ outLog << "Ldap error in QueryUsername" << endl;
+ outLog << "\t" << lastLdapError << ": " << ldap_err2string(lastLdapError) << endl;
result = -1;
goto exit;
}
if(ldap_first_entry(mainLdapConnection, results) == NULL)
{
- if(outLog.is_open())
+ if(logLevel > 0)
{
timeStamp(&outLog);
- outLog << "there are no entries that match: " << username << endl;
+ outLog << "There are no entries that match: " << username << endl;
}
result = -1;
goto exit;
@@ -480,12 +519,9 @@
if(lastLdapError != LDAP_SUCCESS)
{
// log reason for modify failure.
- if(outLog.is_open())
- {
- timeStamp(&outLog);
- outLog << "ldap error in ModifyPassword" << endl;
- outLog << "\t" << lastLdapError << ": " << ldap_err2string(lastLdapError) << endl;
- }
+ timeStamp(&outLog);
+ outLog << "Ldap error in ModifyPassword" << endl;
+ outLog << "\t" << lastLdapError << ": " << ldap_err2string(lastLdapError) << endl;
result = -1;
}
@@ -595,11 +631,8 @@
if((currentTime - currentPassInfo->atTime) > (maxBackoffTime / 1000))
{
- if(outLog.is_open())
- {
- timeStamp(&outLog);
- outLog << "abandoning password change for " << currentPassInfo->username << ", backoff expired" << endl;
- }
+ timeStamp(&outLog);
+ outLog << "Abandoning password change for " << currentPassInfo->username << ", backoff expired" << endl;
tempPassInfo = currentPassInfo;
currentPassInfo++;
From fedora-directory-commits at redhat.com Fri Oct 14 17:14:11 2005
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Fri, 14 Oct 2005 13:14:11 -0400
Subject: [Fedora-directory-commits]
ldapserver ldapserver.spec.tmpl, 1.10.2.5, 1.10.2.6
Message-ID: <200510141714.j9EHEB8W017868@cvs-int.fedora.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17822
Modified Files:
Tag: Directory71RtmBranch
ldapserver.spec.tmpl
Log Message:
[170322] setup script hangs without prompting for token password
Specifying the admin server's config file as a config file with %config in
%files section, the files won't be touched unless the upgrade has changes from
the previous version. With the line, we don't have to do backup/restore the
admin-serv config directory.
Index: ldapserver.spec.tmpl
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldapserver.spec.tmpl,v
retrieving revision 1.10.2.5
retrieving revision 1.10.2.6
diff -u -r1.10.2.5 -r1.10.2.6
--- ldapserver.spec.tmpl 14 Oct 2005 16:07:54 -0000 1.10.2.5
+++ ldapserver.spec.tmpl 14 Oct 2005 17:14:09 -0000 1.10.2.6
@@ -90,6 +90,9 @@
# files in different places, we won't be able to do this anymore
%defattr(-,root,root,-)
%{prefix}
+# don't update admin server configuration files.
+# note: if there's somes change b/w 2 versions, new file is put with .rpmnew
+%config %{prefix}/admin-serv/config/*
%pre
# in case upgrade, need to shutdown the servers before the installation
@@ -113,24 +116,9 @@
$RPM_INSTALL_PREFIX/stop-admin
fi
fi
-if [ -d $RPM_INSTALL_PREFIX/admin-serv/config ]; then
- if [ -d $RPM_INSTALL_PREFIX/admin-serv/config.backup ]; then
- rm -rf $RPM_INSTALL_PREFIX/admin-serv/config.backup
- fi
- cp -r $RPM_INSTALL_PREFIX/admin-serv/config $RPM_INSTALL_PREFIX/admin-serv/config.backup
-fi
%post
echo ""
-if [ -d $RPM_INSTALL_PREFIX/admin-serv/config.backup ]; then
- if [ -d $RPM_INSTALL_PREFIX/admin-serv/config ]; then
- if [ -d $RPM_INSTALL_PREFIX/admin-serv/config.generated ]; then
- rm -rf $RPM_INSTALL_PREFIX/admin-serv/config.generated
- fi
- mv $RPM_INSTALL_PREFIX/admin-serv/config $RPM_INSTALL_PREFIX/admin-serv/config.generated
- fi
- mv $RPM_INSTALL_PREFIX/admin-serv/config.backup $RPM_INSTALL_PREFIX/admin-serv/config
-fi
if [ -z "$RPM_INSTALL_PREFIX" ]; then
RPM_INSTALL_PREFIX=%{prefix}
fi
From fedora-directory-commits at redhat.com Fri Oct 14 16:07:28 2005
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Fri, 14 Oct 2005 12:07:28 -0400
Subject: [Fedora-directory-commits]
ldapserver/ldap/synctools/passwordsync/wix PassSync.wxs,
1.8.2.3, 1.8.2.4
Message-ID: <200510141607.j9EG7SaL015900@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/ldapserver/ldap/synctools/passwordsync/wix
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15860/wix
Modified Files:
Tag: Directory71RtmBranch
PassSync.wxs
Log Message:
170556 - Make passsync obey backoff for retries when DS is down
Index: PassSync.wxs
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/synctools/passwordsync/wix/PassSync.wxs,v
retrieving revision 1.8.2.3
retrieving revision 1.8.2.4
diff -u -r1.8.2.3 -r1.8.2.4
--- PassSync.wxs 12 Oct 2005 22:30:04 -0000 1.8.2.3
+++ PassSync.wxs 14 Oct 2005 16:06:58 -0000 1.8.2.4
@@ -137,7 +137,7 @@
-
+
From fedora-directory-commits at redhat.com Fri Oct 14 16:00:08 2005
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Fri, 14 Oct 2005 12:00:08 -0400
Subject: [Fedora-directory-commits]
ldapserver/ldap/synctools/passwordsync/wix PassSync.wxs, 1.11, 1.12
Message-ID: <200510141600.j9EG08NX014083@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/ldapserver/ldap/synctools/passwordsync/wix
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14039/wix
Modified Files:
PassSync.wxs
Log Message:
170556 - Make passsync obey backoff for retries when DS is down
Index: PassSync.wxs
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/synctools/passwordsync/wix/PassSync.wxs,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- PassSync.wxs 12 Oct 2005 22:27:20 -0000 1.11
+++ PassSync.wxs 14 Oct 2005 16:00:00 -0000 1.12
@@ -137,7 +137,7 @@
-
+
From fedora-directory-commits at redhat.com Fri Oct 14 16:07:58 2005
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Fri, 14 Oct 2005 12:07:58 -0400
Subject: [Fedora-directory-commits]
ldapserver ldapserver.spec.tmpl, 1.10.2.4, 1.10.2.5
Message-ID: <200510141608.j9EG8S4E015962@cvs-int.fedora.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15823
Modified Files:
Tag: Directory71RtmBranch
ldapserver.spec.tmpl
Log Message:
[170322] setup script hangs without prompting for token password
Disable SSL before applying the patch, then enable it when the patch installation is done.
Index: ldapserver.spec.tmpl
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldapserver.spec.tmpl,v
retrieving revision 1.10.2.4
retrieving revision 1.10.2.5
diff -u -r1.10.2.4 -r1.10.2.5
--- ldapserver.spec.tmpl 13 Sep 2005 17:22:03 -0000 1.10.2.4
+++ ldapserver.spec.tmpl 14 Oct 2005 16:07:54 -0000 1.10.2.5
@@ -80,7 +80,7 @@
%clean
if [ -z "$RPM_INSTALL_PREFIX" ]; then
- RPM_INSTALL_PREFIX=%{prefix}
+ RPM_INSTALL_PREFIX=%{prefix}
fi
rm -rf $RPM_BUILD_ROOT/$RPM_INSTALL_PREFIX
@@ -93,9 +93,9 @@
%pre
# in case upgrade, need to shutdown the servers before the installation
-ls $RPM_BUILD_ROOT/$RPM_INSTALL_PREFIX/slapd-* > /dev/null 2>&1
+ls $RPM_INSTALL_PREFIX/slapd-* > /dev/null 2>&1
if [ $? -eq 0 ]; then
- for instance in `ls -d $RPM_BUILD_ROOT/$RPM_INSTALL_PREFIX/slapd-*`
+ for instance in `ls -d $RPM_INSTALL_PREFIX/slapd-*`
do
if [ -f $instance/logs/pid ]; then
pid=`cat $instance/logs/pid`
@@ -106,27 +106,31 @@
fi
done
fi
-if [ -f $RPM_BUILD_ROOT/$RPM_INSTALL_PREFIX/admin-serv/logs/pid ]; then
- pid=`cat $RPM_BUILD_ROOT/$RPM_INSTALL_PREFIX/admin-serv/logs/pid`
+if [ -f $RPM_INSTALL_PREFIX/admin-serv/logs/pid ]; then
+ pid=`cat $RPM_INSTALL_PREFIX/admin-serv/logs/pid`
psval=`ps -ef | egrep $pid`
if [ "$psval" != "" ]; then
- $RPM_BUILD_ROOT/$RPM_INSTALL_PREFIX/stop-admin
+ $RPM_INSTALL_PREFIX/stop-admin
+ fi
+fi
+if [ -d $RPM_INSTALL_PREFIX/admin-serv/config ]; then
+ if [ -d $RPM_INSTALL_PREFIX/admin-serv/config.backup ]; then
+ rm -rf $RPM_INSTALL_PREFIX/admin-serv/config.backup
fi
+ cp -r $RPM_INSTALL_PREFIX/admin-serv/config $RPM_INSTALL_PREFIX/admin-serv/config.backup
fi
%post
-# in case upgrade, need to start the servers before running setup
-ls $RPM_BUILD_ROOT/$RPM_INSTALL_PREFIX/slapd-* > /dev/null 2>&1
-if [ $? -eq 0 ]; then
- for instance in `ls -d $RPM_BUILD_ROOT/$RPM_INSTALL_PREFIX/slapd-*`
- do
- $instance/start-slapd
- done
-fi
-if [ -f $RPM_BUILD_ROOT/$RPM_INSTALL_PREFIX/start-admin ]; then
- $RPM_BUILD_ROOT/$RPM_INSTALL_PREFIX/start-admin
-fi
echo ""
+if [ -d $RPM_INSTALL_PREFIX/admin-serv/config.backup ]; then
+ if [ -d $RPM_INSTALL_PREFIX/admin-serv/config ]; then
+ if [ -d $RPM_INSTALL_PREFIX/admin-serv/config.generated ]; then
+ rm -rf $RPM_INSTALL_PREFIX/admin-serv/config.generated
+ fi
+ mv $RPM_INSTALL_PREFIX/admin-serv/config $RPM_INSTALL_PREFIX/admin-serv/config.generated
+ fi
+ mv $RPM_INSTALL_PREFIX/admin-serv/config.backup $RPM_INSTALL_PREFIX/admin-serv/config
+fi
if [ -z "$RPM_INSTALL_PREFIX" ]; then
RPM_INSTALL_PREFIX=%{prefix}
fi
@@ -135,11 +139,11 @@
%preun
# only run uninstall if this is the last version of the package
if [ "$1" = 0 ] ; then
- if [ -z "$RPM_INSTALL_PREFIX" ]; then
- RPM_INSTALL_PREFIX=%{prefix}
- fi
- cd $RPM_INSTALL_PREFIX
- ./uninstall -s -force
+ if [ -z "$RPM_INSTALL_PREFIX" ]; then
+ RPM_INSTALL_PREFIX=%{prefix}
+ fi
+ cd $RPM_INSTALL_PREFIX
+ ./uninstall -s -force
fi
%changelog
From fedora-directory-commits at redhat.com Fri Oct 14 16:00:02 2005
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Fri, 14 Oct 2005 12:00:02 -0400
Subject: [Fedora-directory-commits]
ldapserver/ldap/synctools/passwordsync/passsync syncserv.cpp,
1.9, 1.10
Message-ID: <200510141600.j9EG0Xjm014207@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/ldapserver/ldap/synctools/passwordsync/passsync
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14039/passsync
Modified Files:
syncserv.cpp
Log Message:
170556 - Make passsync obey backoff for retries when DS is down
Index: syncserv.cpp
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/synctools/passwordsync/passsync/syncserv.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- syncserv.cpp 13 Oct 2005 18:56:26 -0000 1.9
+++ syncserv.cpp 14 Oct 2005 16:00:00 -0000 1.10
@@ -101,7 +101,7 @@
}
else
{
- maxBackoffTime = pow(2, 12) * SYNCSERV_BASE_BACKOFF_LEN;
+ maxBackoffTime = (1 << 12) * SYNCSERV_BASE_BACKOFF_LEN;
}
size = SYNCSERV_BUF_SIZE;
@@ -177,6 +177,18 @@
void PassSyncService::Run()
{
isRunning = true;
+
+ // Initialize NSS
+ if(ldapssl_client_init(certPath, &certdbh) != 0)
+ {
+ timeStamp(&outLog);
+ outLog << "Error initializing SSL: err=" << PR_GetError() << endl;
+ timeStamp(&outLog);
+ outLog << "Ensure that your SSL is setup correctly" << endl;
+
+ goto exit;
+ }
+
SyncPasswords();
while(isRunning)
@@ -229,6 +241,7 @@
}
}
+exit:
CloseHandle(passhookEventHandle);
}
@@ -244,15 +257,6 @@
char* dn;
int tempSize = passInfoList.size();
- if(Connect(&mainLdapConnection, ldapAuthUsername, ldapAuthPassword) < 0)
- {
- // log connection failure.
- timeStamp(&outLog);
- outLog << "Can not connect to ldap server in SyncPasswords" << endl;
-
- goto exit;
- }
-
if(loadSet(&passInfoList, dataFilename) == 0)
{
if((passInfoList.size() - tempSize) > 0)
@@ -293,6 +297,15 @@
}
}
+ if(Connect(&mainLdapConnection, ldapAuthUsername, ldapAuthPassword) < 0)
+ {
+ // log connection failure.
+ timeStamp(&outLog);
+ outLog << "Can not connect to ldap server in SyncPasswords" << endl;
+
+ goto exit;
+ }
+
currentPassInfo = passInfoList.begin();
while(currentPassInfo != passInfoList.end())
{
@@ -378,20 +391,6 @@
{
int result = 0;
- if(ldapssl_client_init(certPath, &certdbh) != 0)
- {
- result = PR_GetError();
-
- timeStamp(&outLog);
- outLog << "ldapssl_client_init failed in Connect" << endl;
- outLog << "\t" << result << ": " << ldap_err2string(result) << endl;
-
- result = GetLastError();
-
- result = -1;
- goto exit;
- }
-
*connection = ldapssl_init(ldapHostName, atoi(ldapHostPort), 1);
if(*connection == NULL)
@@ -604,7 +603,7 @@
if(backoff > 0)
{
- backoffTime = pow(2, backoff) * SYNCSERV_BASE_BACKOFF_LEN;
+ backoffTime = (1 << backoff) * SYNCSERV_BASE_BACKOFF_LEN;
}
return backoffTime;
@@ -624,12 +623,12 @@
currentPassInfo = passInfoList.begin();
while(currentPassInfo != passInfoList.end())
{
- if((currentPassInfo->atTime + (BackoffTime(currentPassInfo->backoffCount) / 1000)) <= currentTime)
+ if(((unsigned long)currentPassInfo->atTime + (BackoffTime(currentPassInfo->backoffCount) / 1000)) <= (unsigned long)currentTime)
{
currentPassInfo->backoffCount++;
}
- if((currentTime - currentPassInfo->atTime) > (maxBackoffTime / 1000))
+ if(((unsigned long)currentTime - (unsigned long)currentPassInfo->atTime) > (maxBackoffTime / 1000))
{
timeStamp(&outLog);
outLog << "Abandoning password change for " << currentPassInfo->username << ", backoff expired" << endl;
@@ -656,7 +655,7 @@
for(currentPassInfo = passInfoList.begin(); currentPassInfo != passInfoList.end(); currentPassInfo++)
{
- if(currentPassInfo->backoffCount < minBackoff)
+ if((unsigned long)currentPassInfo->backoffCount < minBackoff)
{
minBackoff = currentPassInfo->backoffCount;
}
From fedora-directory-commits at redhat.com Fri Oct 14 16:08:11 2005
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Fri, 14 Oct 2005 12:08:11 -0400
Subject: [Fedora-directory-commits] ldapserver/ldap/cm Makefile, 1.30.2.9,
1.30.2.10
Message-ID: <200510141608.j9EG8BPv015949@cvs-int.fedora.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/cm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15823/ldap/cm
Modified Files:
Tag: Directory71RtmBranch
Makefile
Log Message:
[170322] setup script hangs without prompting for token password
Disable SSL before applying the patch, then enable it when the patch installation is done.
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/Makefile,v
retrieving revision 1.30.2.9
retrieving revision 1.30.2.10
diff -u -r1.30.2.9 -r1.30.2.10
--- Makefile 12 Oct 2005 21:57:03 -0000 1.30.2.9
+++ Makefile 14 Oct 2005 16:07:56 -0000 1.30.2.10
@@ -820,7 +820,7 @@
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 `grep "^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)
- at for file in $(PACKAGE_SETUP_LIBS_32) ; \
@@ -830,7 +830,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 `grep "^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
From fedora-directory-commits at redhat.com Fri Oct 14 16:07:00 2005
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Fri, 14 Oct 2005 12:07:00 -0400
Subject: [Fedora-directory-commits]
ldapserver/ldap/synctools/passwordsync/passsync syncserv.cpp,
1.7.2.2, 1.7.2.3
Message-ID: <200510141607.j9EG7VX6015901@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/ldapserver/ldap/synctools/passwordsync/passsync
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15860/passsync
Modified Files:
Tag: Directory71RtmBranch
syncserv.cpp
Log Message:
170556 - Make passsync obey backoff for retries when DS is down
Index: syncserv.cpp
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/synctools/passwordsync/passsync/syncserv.cpp,v
retrieving revision 1.7.2.2
retrieving revision 1.7.2.3
diff -u -r1.7.2.2 -r1.7.2.3
--- syncserv.cpp 13 Oct 2005 18:59:21 -0000 1.7.2.2
+++ syncserv.cpp 14 Oct 2005 16:06:54 -0000 1.7.2.3
@@ -101,7 +101,7 @@
}
else
{
- maxBackoffTime = pow(2, 12) * SYNCSERV_BASE_BACKOFF_LEN;
+ maxBackoffTime = (1 << 12) * SYNCSERV_BASE_BACKOFF_LEN;
}
size = SYNCSERV_BUF_SIZE;
@@ -177,6 +177,18 @@
void PassSyncService::Run()
{
isRunning = true;
+
+ // Initialize NSS
+ if(ldapssl_client_init(certPath, &certdbh) != 0)
+ {
+ timeStamp(&outLog);
+ outLog << "Error initializing SSL: err=" << PR_GetError() << endl;
+ timeStamp(&outLog);
+ outLog << "Ensure that your SSL is setup correctly" << endl;
+
+ goto exit;
+ }
+
SyncPasswords();
while(isRunning)
@@ -229,6 +241,7 @@
}
}
+exit:
CloseHandle(passhookEventHandle);
}
@@ -244,15 +257,6 @@
char* dn;
int tempSize = passInfoList.size();
- if(Connect(&mainLdapConnection, ldapAuthUsername, ldapAuthPassword) < 0)
- {
- // log connection failure.
- timeStamp(&outLog);
- outLog << "Can not connect to ldap server in SyncPasswords" << endl;
-
- goto exit;
- }
-
if(loadSet(&passInfoList, dataFilename) == 0)
{
if((passInfoList.size() - tempSize) > 0)
@@ -293,6 +297,15 @@
}
}
+ if(Connect(&mainLdapConnection, ldapAuthUsername, ldapAuthPassword) < 0)
+ {
+ // log connection failure.
+ timeStamp(&outLog);
+ outLog << "Can not connect to ldap server in SyncPasswords" << endl;
+
+ goto exit;
+ }
+
currentPassInfo = passInfoList.begin();
while(currentPassInfo != passInfoList.end())
{
@@ -378,20 +391,6 @@
{
int result = 0;
- if(ldapssl_client_init(certPath, &certdbh) != 0)
- {
- result = PR_GetError();
-
- timeStamp(&outLog);
- outLog << "ldapssl_client_init failed in Connect" << endl;
- outLog << "\t" << result << ": " << ldap_err2string(result) << endl;
-
- result = GetLastError();
-
- result = -1;
- goto exit;
- }
-
*connection = ldapssl_init(ldapHostName, atoi(ldapHostPort), 1);
if(*connection == NULL)
@@ -604,7 +603,7 @@
if(backoff > 0)
{
- backoffTime = pow(2, backoff) * SYNCSERV_BASE_BACKOFF_LEN;
+ backoffTime = (1 << backoff) * SYNCSERV_BASE_BACKOFF_LEN;
}
return backoffTime;
@@ -624,12 +623,12 @@
currentPassInfo = passInfoList.begin();
while(currentPassInfo != passInfoList.end())
{
- if((currentPassInfo->atTime + (BackoffTime(currentPassInfo->backoffCount) / 1000)) <= currentTime)
+ if(((unsigned long)currentPassInfo->atTime + (BackoffTime(currentPassInfo->backoffCount) / 1000)) <= (unsigned long)currentTime)
{
currentPassInfo->backoffCount++;
}
- if((currentTime - currentPassInfo->atTime) > (maxBackoffTime / 1000))
+ if(((unsigned long)currentTime - (unsigned long)currentPassInfo->atTime) > (maxBackoffTime / 1000))
{
timeStamp(&outLog);
outLog << "Abandoning password change for " << currentPassInfo->username << ", backoff expired" << endl;
@@ -656,7 +655,7 @@
for(currentPassInfo = passInfoList.begin(); currentPassInfo != passInfoList.end(); currentPassInfo++)
{
- if(currentPassInfo->backoffCount < minBackoff)
+ if((unsigned long)currentPassInfo->backoffCount < minBackoff)
{
minBackoff = currentPassInfo->backoffCount;
}
From fedora-directory-commits at redhat.com Fri Oct 14 16:08:12 2005
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Fri, 14 Oct 2005 12:08:12 -0400
Subject: [Fedora-directory-commits]
ldapserver/ldap/cm/newinst setup, 1.9.2.3,
1.9.2.4 setup.patch, 1.1.2.2, 1.1.2.3
Message-ID: <200510141608.j9EG8C8N015958@cvs-int.fedora.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/cm/newinst
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15823/ldap/cm/newinst
Modified Files:
Tag: Directory71RtmBranch
setup setup.patch
Log Message:
[170322] setup script hangs without prompting for token password
Disable SSL before applying the patch, then enable it when the patch installation is done.
Index: setup
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinst/setup,v
retrieving revision 1.9.2.3
retrieving revision 1.9.2.4
diff -u -r1.9.2.3 -r1.9.2.4
--- setup 28 Sep 2005 22:47:14 -0000 1.9.2.3
+++ setup 14 Oct 2005 16:08:09 -0000 1.9.2.4
@@ -180,7 +180,7 @@
rm -f $sroot/setup/install.inf
# Fix for "[160589] IBM JVM breaks on some machines/kernels :
-# admin server fails to start
+# admin server fails to start
JAVA_COMPILER=NONE; export JAVA_COMPILER
echo "INFO Begin Setup . . ." | tee -a $logfile
@@ -199,8 +199,162 @@
askYN "Continue?"
fi
+isadminsslon=0
+sslparams=""
+
+adminSSLOff() {
+ conffile=$1
+ confparam=$2
+ tmpfile=$3
+ if [ -f $conffile ]; then
+ security=`grep -i "^$confparam" $conffile | awk '{print $1}'`
+ issecure=`grep -i "^$confparam" $conffile | awk '{print $2}'`
+ if [ "$issecure" = "on" -o "$issecure" = "ON" -o "$issecure" = "On" -o "$issecure" = "oN" ]
+ then
+ if [ $isadminsslon -eq 0 ]; then
+ $sroot/stop-admin
+ isadminsslon=1
+ fi
+ echo $conffile=$security >> $tmpfile
+ cat $conffile | sed -e "s/^\($security\) .*/\1 off/g" > $conffile.01
+ mv $conffile.01 $conffile
+ echo "$conffile: SSL off ..."
+ fi
+ fi
+}
+
+adminXmlSSLOff() {
+ conffile=$1
+ confparam=$2
+ tmpfile=$3
+ if [ -f $conffile ]; then
+ grep -i "\ /dev/null 2>&1
+ rval=$?
+ if [ $rval -eq 0 ]
+ then
+ if [ $isadminsslon -eq 0 ]; then
+ $sroot/stop-admin
+ isadminsslon=1
+ fi
+ echo $conffile=$confparam >> $tmpfile
+ cat $conffile | sed -e "s/\([Ss][Ee][Cc][Uu][Rr][Ii][Tt][Yy]=\)\"[A-Za-z]*\"/\1\"off\"/g" > $conffile.0
+ mv $conffile.0 $conffile
+ echo "$conffile: SSL off ..."
+ fi
+ sslparams0=`grep -i "<.*SSLPARAMS " $conffile`
+ rval=$?
+ if [ $rval -eq 0 ]
+ then
+ if [ $isadminsslon -eq 0 ]; then
+ $sroot/stop-admin
+ isadminsslon=1
+ fi
+echo adminXmlSSLOff: SSLPARAMS off
+ sslparams1=`echo $sslparams0 | sed -e 's/\//\\\\\//g'`
+ sslparams=`echo $sslparams1 | sed -e 's/\"/\\\\\"/g'`
+ cat $conffile | sed -e "s/\($sslparams\)/\<\!-- \1 --\>/g" > $conffile.1
+ mv $conffile.1 $conffile
+ fi
+ fi
+}
+
+SSLOff() {
+ rm -f dssecure.txt assecure.txt > /dev/null 2>&1
+ touch dssecure.txt
+ touch assecure.txt
+
+ for dir in $sroot/slapd-* ; do
+ if [ -f $dir/config/dse.ldif ]; then
+ security=`grep -i "^nsslapd-security:" $dir/config/dse.ldif | awk '{print $1}'`
+ issecure=`grep -i "^nsslapd-security:" $dir/config/dse.ldif | awk '{print $2}'`
+ if [ "$issecure" = "on" -o "$issecure" = "ON" -o "$issecure" = "On" -o "$issecure" = "oN" ]
+ then
+ echo $dir >> dssecure.txt
+ $dir/stop-slapd
+ cat $dir/config/dse.ldif | sed -e "s/\($security\) .*/\1 off/g" > $dir/config/dse.ldif.0
+ mv $dir/config/dse.ldif.0 $dir/config/dse.ldif
+ echo "$dir/config/dse.ldif: SSL off ..."
+ fi
+ $dir/start-slapd
+ fi
+ done
+ if [ -d $sroot/admin-serv/config ]; then
+ adminSSLOff $sroot/admin-serv/config/adm.conf security: assecure.txt
+ adminSSLOff $sroot/admin-serv/config/local.conf configuration.nsServerSecurity: assecure.txt
+ adminSSLOff $sroot/admin-serv/config/magnus.conf Security assecure.txt
+ adminXmlSSLOff $sroot/admin-serv/config/server.xml security assecure.txt
+
+ if [ $isadminsslon -ne 0 ]; then
+ $sroot/start-admin
+ fi
+ fi
+}
+
+adminSSLOn() {
+ conffile=$1
+ confparam=$2
+ if [ -f $conffile ]; then
+ cat $conffile | sed -e "s/^\($confparam\) .*/\1 on/g" > $conffile.00
+ mv $conffile.00 $conffile
+ echo "$conffile $confparam: SSL on ..."
+ fi
+}
+
+adminXmlSSLOn() {
+ conffile=$1
+ if [ -f $conffile ]; then
+ cat $conffile | sed -e "s/\([Ss][Ee][Cc][Uu][Rr][Ii][Tt][Yy]=\)\"[A-Za-z]*\"/\1\"on\"/g" > $conffile.2
+ mv $conffile.2 $conffile
+ fi
+ grep -i "<.*SSLPARAMS " $conffile > /dev/null 2>&1
+ rval=$?
+ if [ $rval -eq 0 ]
+ then
+ cat $conffile | sed -e "s/<\!-- *$sslparams *-->/$sslparams/g" > $conffile.3
+ mv $conffile.3 $conffile
+ fi
+ echo "$conffile: SSL on ..."
+}
+
+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 [ $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 [ $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
if [ -f $sroot/admin-serv/config/adm.conf ]; then
+ SSLOff
+
dsinst=`getValFromAdminConf "ldapStart:" "adm.conf" | awk -F/ '{print $1}'`
if [ -f $sroot/$dsinst/config/dse.ldif ]; then
# it is an in=place installation
@@ -213,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"
@@ -227,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
@@ -343,8 +497,10 @@
`pwd`/bin/admin/ns-update $doreconfig $silentarg $myargs -f $inffile | tee -a $logfile || doExit
+SSLOn
+
# Fix for "[160589] IBM JVM breaks on some machines/kernels :
-# admin server fails to start
+# admin server fails to start
sed -e "s/jvm.option=\(.*\)/jvm.option=\1 -Djava.compiler=NONE/" admin-serv/config/jvm12.conf > admin-serv/config/jvm12.tmp
mv admin-serv/config/jvm12.tmp admin-serv/config/jvm12.conf
setup.patch:
Index: setup.patch
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinst/Attic/setup.patch,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- setup.patch 29 Sep 2005 20:51:59 -0000 1.1.2.2
+++ setup.patch 14 Oct 2005 16:08:09 -0000 1.1.2.3
@@ -92,7 +92,7 @@
cattr=$1
cfile=$2
rval=`grep -i $cattr $serverroot/admin-serv/config/$cfile | awk '{print $2}'`
- echo $rval
+ echo $rval
}
dsinst=`getValFromAdminConf "ldapStart:" "adm.conf" | awk -F/ '{print $1}'`
@@ -105,6 +105,97 @@
clear
+isadminsslon=0
+sslparams=""
+
+adminSSLOff() {
+ conffile=$1
+ confparam=$2
+ tmpfile=$3
+ if [ -f $conffile ]; then
+ security=`grep -i "^$confparam" $conffile | awk '{print $1}'`
+ issecure=`grep -i "^$confparam" $conffile | awk '{print $2}'`
+ if [ "$issecure" = "on" -o "$issecure" = "ON" -o "$issecure" = "On" ]
+ if [ "$issecure" = "on" -o "$issecure" = "ON" -o "$issecure" = "On" -o "$issecure" = "oN" ]
+ then
+ if [ $isadminsslon -eq 0 ]; then
+ $serverroot/stop-admin
+ isadminsslon=1
+ fi
+ echo $conffile=$security >> $tmpfile
+ cat $conffile | sed -e "s/^\($security\) .*/\1 off/g" > $conffile.0
+ mv $conffile.0 $conffile
+ echo "$conffile: SSL off ..."
+ fi
+ fi
+}
+
+adminXmlSSLOff() {
+ conffile=$1
+ confparam=$2
+ tmpfile=$3
+ if [ -f $conffile ]; then
+ grep -i "\ /dev/null 2>&1
+ rval=$?
+ if [ $rval -eq 0 ]
+ then
+ if [ $isadminsslon -eq 0 ]; then
+ $serverroot/stop-admin
+ isadminsslon=1
+ fi
+ echo $conffile=$confparam >> $tmpfile
+ cat $conffile | sed -e "s/\([Ss][Ee][Cc][Uu][Rr][Ii][Tt][Yy]=\)\"[A-Za-z]*\"/\1\"off\"/g" > $conffile.0
+ mv $conffile.0 $conffile
+ echo "$conffile: SSL off ..."
+ fi
+ sslparams0=`grep -i "<.*SSLPARAMS " $conffile`
+ rval=$?
+ if [ $rval -eq 0 ]
+ then
+ if [ $isadminsslon -eq 0 ]; then
+ $serverroot/stop-admin
+ isadminsslon=1
+ fi
+ sslparams1=`echo $sslparams0 | sed -e 's/\//\\\\\//g'`
+ sslparams=`echo $sslparams1 | sed -e 's/\"/\\\\\"/g'`
+ cat $conffile | sed -e "s/\($sslparams\)/\<\!-- \1 --\>/g" > $conffile.0
+ mv $conffile.0 $conffile
+ echo "$conffile: SSL off ..."
+ fi
+ fi
+}
+
+rm -f dssecure.txt assecure.txt > /dev/null 2>&1
+touch dssecure.txt
+touch assecure.txt
+
+for dir in $serverroot/slapd-* ; do
+ if [ -f $dir/config/dse.ldif ]; then
+ security=`grep -i "^nsslapd-security:" $dir/config/dse.ldif | awk '{print $1}'`
+ issecure=`grep -i "^nsslapd-security:" $dir/config/dse.ldif | awk '{print $2}'`
+ if [ "$issecure" = "on" -o "$issecure" = "ON" -o "$issecure" = "On" -o "$issecure" = "oN" ]
+ then
+ echo $dir >> dssecure.txt
+ $dir/stop-slapd
+ cat $dir/config/dse.ldif | sed -e "s/\($security\) .*/\1 off/g" > $dir/config/dse.ldif.0
+ mv $dir/config/dse.ldif.0 $dir/config/dse.ldif
+ echo "$dir/config/dse.ldif: SSL off ..."
+ $dir/start-slapd
+ fi
+ fi
+done
+
+if [ -d $serverroot/admin-serv/config ]; then
+ adminSSLOff $serverroot/admin-serv/config/adm.conf security: assecure.txt
+ adminSSLOff $serverroot/admin-serv/config/local.conf configuration.nsServerSecurity: assecure.txt
+ adminSSLOff $serverroot/admin-serv/config/magnus.conf Security assecure.txt
+ adminXmlSSLOff $serverroot/admin-serv/config/server.xml security assecure.txt
+
+ if [ $isadminsslon -ne 0 ]; then
+ $serverroot/start-admin
+ fi
+fi
+
ldaphost=`getValFromAdminConf "ldapHost:" "adm.conf"`
ldapport=`getValFromAdminConf "ldapPort:" "adm.conf"`
siepid=`getValFromAdminConf "siepid:" "adm.conf"`
@@ -115,6 +206,8 @@
admindomain=`domainname`
fi
+clear
+
echo " Fedora Project"
echo " Directory Installation/Uninstallation"
echo "-------------------------------------------------------------------------------"
@@ -153,3 +246,63 @@
clear
./dssetup -s -f $inffile
+
+adminSSLOn() {
+ conffile=$1
+ confparam=$2
+ if [ -f $conffile ]; then
+ cat $conffile | sed -e "s/^\($confparam\) .*/\1 on/g" > $conffile.0
+ mv $conffile.0 $conffile
+ echo "$conffile $confparam: SSL on ..."
+ fi
+}
+
+adminXmlSSLOn() {
+ conffile=$1
+ if [ -f $conffile ]; then
+ cat $conffile | sed -e "s/\([Ss][Ee][Cc][Uu][Rr][Ii][Tt][Yy]=\)\"[A-Za-z]*\"/\1\"on\"/g" > $conffile.0
+ mv $conffile.0 $conffile
+ fi
+ grep -i "<.*SSLPARAMS " $conffile > /dev/null 2>&1
+ rval=$?
+ if [ $rval -eq 0 ]
+ then
+ cat $conffile | sed -e "s/<\!-- *$sslparams *-->/$sslparams/g" > $conffile.0
+ mv $conffile.0 $conffile
+ fi
+ echo "$conffile: SSL on ..."
+}
+
+for dir in `cat dssecure.txt` ; do
+ clear
+ 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 [ $isadminsslon -ne 0 ]; then
+ $serverroot/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 [ $isadminsslon -ne 0 ]; then
+ echo "Restarting Administration Server: $serverroot/start-admin"
+ $serverroot/start-admin
+fi
+
+rm -f dssecure.txt assecuire.txt
From fedora-directory-commits at redhat.com Fri Oct 14 17:32:48 2005
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Fri, 14 Oct 2005 13:32:48 -0400
Subject: [Fedora-directory-commits]
ldapserver ldapserver.spec.tmpl, 1.10.2.6, 1.10.2.7
Message-ID: <200510141732.j9EHWmaF017994@cvs-int.fedora.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17971
Modified Files:
Tag: Directory71RtmBranch
ldapserver.spec.tmpl
Log Message:
[170322] setup script hangs without prompting for token password
Modified the comment to describe the %config behavior correctly
# don't update admin server configuration files.
# note: if there's somes change b/w 2 versions, on-disk file is put w/ .rpmsave
%config %{prefix}/admin-serv/config/*
Index: ldapserver.spec.tmpl
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldapserver.spec.tmpl,v
retrieving revision 1.10.2.6
retrieving revision 1.10.2.7
diff -u -r1.10.2.6 -r1.10.2.7
--- ldapserver.spec.tmpl 14 Oct 2005 17:14:09 -0000 1.10.2.6
+++ ldapserver.spec.tmpl 14 Oct 2005 17:32:46 -0000 1.10.2.7
@@ -91,7 +91,7 @@
%defattr(-,root,root,-)
%{prefix}
# don't update admin server configuration files.
-# note: if there's somes change b/w 2 versions, new file is put with .rpmnew
+# note: if there's somes change b/w 2 versions, on-disk file is put w/ .rpmsave
%config %{prefix}/admin-serv/config/*
%pre
From fedora-directory-commits at redhat.com Fri Oct 14 17:58:22 2005
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Fri, 14 Oct 2005 13:58:22 -0400
Subject: [Fedora-directory-commits]
ldapserver/ldap/synctools/passwordsync/passsync syncserv.cpp,
1.10, 1.11
Message-ID: <200510141758.j9EHwM9v018787@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/ldapserver/ldap/synctools/passwordsync/passsync
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18771
Modified Files:
syncserv.cpp
Log Message:
170816 - Don't consume password changes if modify fails
Index: syncserv.cpp
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/synctools/passwordsync/passsync/syncserv.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- syncserv.cpp 14 Oct 2005 16:00:00 -0000 1.10
+++ syncserv.cpp 14 Oct 2005 17:58:19 -0000 1.11
@@ -345,6 +345,11 @@
// log modify failure.
timeStamp(&outLog);
outLog << "Modify password failed for remote entry: " << dn << endl;
+ // defer this change for later
+ timeStamp(&outLog);
+ outLog << "Deferring password change for " << currentPassInfo->username << endl;
+ currentPassInfo++;
+ continue;
}
else
{
From fedora-directory-commits at redhat.com Fri Oct 14 17:59:03 2005
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Fri, 14 Oct 2005 13:59:03 -0400
Subject: [Fedora-directory-commits]
ldapserver/ldap/synctools/passwordsync/passsync syncserv.cpp,
1.7.2.3, 1.7.2.4
Message-ID: <200510141759.j9EHx3Oq018809@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/ldapserver/ldap/synctools/passwordsync/passsync
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18793/passsync
Modified Files:
Tag: Directory71RtmBranch
syncserv.cpp
Log Message:
170816 - Don't consume password changes if modify fails
Index: syncserv.cpp
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/synctools/passwordsync/passsync/syncserv.cpp,v
retrieving revision 1.7.2.3
retrieving revision 1.7.2.4
diff -u -r1.7.2.3 -r1.7.2.4
--- syncserv.cpp 14 Oct 2005 16:06:54 -0000 1.7.2.3
+++ syncserv.cpp 14 Oct 2005 17:59:01 -0000 1.7.2.4
@@ -345,6 +345,11 @@
// log modify failure.
timeStamp(&outLog);
outLog << "Modify password failed for remote entry: " << dn << endl;
+ // defer this change for later
+ timeStamp(&outLog);
+ outLog << "Deferring password change for " << currentPassInfo->username << endl;
+ currentPassInfo++;
+ continue;
}
else
{
From fedora-directory-commits at redhat.com Mon Oct 17 18:07:16 2005
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Mon, 17 Oct 2005 14:07:16 -0400
Subject: [Fedora-directory-commits] ldapserver/ldap/cm/newinst setup.patch,
1.1.2.3, 1.1.2.4
Message-ID: <200510171807.j9HI7GOL019072@cvs-int.fedora.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/cm/newinst
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17645
Modified Files:
Tag: Directory71RtmBranch
setup.patch
Log Message:
Forgot to remove an obsolete line in the previous checkin.
setup.patch:
Index: setup.patch
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinst/Attic/setup.patch,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- setup.patch 14 Oct 2005 16:08:09 -0000 1.1.2.3
+++ setup.patch 17 Oct 2005 18:07:11 -0000 1.1.2.4
@@ -115,7 +115,6 @@
if [ -f $conffile ]; then
security=`grep -i "^$confparam" $conffile | awk '{print $1}'`
issecure=`grep -i "^$confparam" $conffile | awk '{print $2}'`
- if [ "$issecure" = "on" -o "$issecure" = "ON" -o "$issecure" = "On" ]
if [ "$issecure" = "on" -o "$issecure" = "ON" -o "$issecure" = "On" -o "$issecure" = "oN" ]
then
if [ $isadminsslon -eq 0 ]; then
From fedora-directory-commits at redhat.com Mon Oct 17 18:43:10 2005
From: fedora-directory-commits at redhat.com (Anthony Foxworth (foxworth))
Date: Mon, 17 Oct 2005 14:43:10 -0400
Subject: [Fedora-directory-commits] CVSROOT loginfo,1.6,1.7
Message-ID: <200510171843.j9HIhAZb019484@cvs-int.fedora.redhat.com>
Author: foxworth
Update of /cvs/dirsec/CVSROOT
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19438
Modified Files:
loginfo
Log Message:
Updated loginfo checkin notification to include bonsai-checkin-daemon\@hurricane.sfbay.redhat.com. This will allow updates to DirSec's local Bonsai server as well as Fedora CVS's bonsai server.
Index: loginfo
===================================================================
RCS file: /cvs/dirsec/CVSROOT/loginfo,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- loginfo 1 Jun 2005 16:47:38 -0000 1.6
+++ loginfo 17 Oct 2005 18:43:07 -0000 1.7
@@ -26,4 +26,4 @@
# or
#DEFAULT (echo ""; id; echo %{sVv}; date; cat) >> $CVSROOT/CVSROOT/commitlog
DEFAULT $CVSROOT/CVSROOT/syncmail %{sVv} cvsdirsec at fedora.redhat.com
-ALL /cvs/extras/CVSROOT/dolog.pl -r /cvs/dirsec localdelivery at cvs-int.fedora.redhat.com
+ALL /cvs/extras/CVSROOT/dolog.pl -r /cvs/dirsec localdelivery at cvs-int.fedora.redhat.com bonsai-checkin-daemon at hurricane.sfbay.redhat.com
From fedora-directory-commits at redhat.com Thu Oct 20 17:12:23 2005
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Thu, 20 Oct 2005 13:12:23 -0400
Subject: [Fedora-directory-commits]
ldapserver/ldap/servers/plugins/replication
windows_protocol_util.c, 1.21, 1.22
Message-ID: <200510201712.j9KHCNkL012403@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/replication
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12369/ldap/servers/plugins/replication
Modified Files:
windows_protocol_util.c
Log Message:
170071 - Automatically add grouptype for new groups being synchd to NT4
Index: windows_protocol_util.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/windows_protocol_util.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- windows_protocol_util.c 28 Sep 2005 20:21:20 -0000 1.21
+++ windows_protocol_util.c 20 Oct 2005 17:12:16 -0000 1.22
@@ -1362,6 +1362,19 @@
vs = NULL;
}
}
+ /* NT4 must have the groupType attribute set for groups. If it is not present, we will
+ * add it here with a value of 2 (global group).
+ */
+ if (is_nt4 && is_group)
+ {
+ Slapi_Attr *ap = NULL;
+ if(slapi_entry_attr_find(new_entry, "groupType", &ap))
+ {
+ /* groupType attribute wasn't found, so we'll add it */
+ slapi_entry_attr_set_int(new_entry, "groupType", 2 /* global group */);
+ }
+ }
+
if (remote_entry)
{
*remote_entry = new_entry;
From fedora-directory-commits at redhat.com Thu Oct 20 17:12:18 2005
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Thu, 20 Oct 2005 13:12:18 -0400
Subject: [Fedora-directory-commits] ldapserver/ldap/servers/ntds/apacheds
usersync.schema, 1.3, 1.4
Message-ID: <200510201712.j9KHCmm6012406@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/ldapserver/ldap/servers/ntds/apacheds
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12369/ldap/servers/ntds/apacheds
Modified Files:
usersync.schema
Log Message:
170071 - Automatically add grouptype for new groups being synchd to NT4
Index: usersync.schema
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/ntds/apacheds/usersync.schema,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- usersync.schema 13 May 2005 03:20:11 -0000 1.3
+++ usersync.schema 20 Oct 2005 17:12:15 -0000 1.4
@@ -522,7 +522,6 @@
isCriticalSystemObject $
member $
name $
- groupType $
showInAdvancedViewOnly $
systemFlags $
objectCategory $
From fedora-directory-commits at redhat.com Thu Oct 20 17:25:25 2005
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Thu, 20 Oct 2005 13:25:25 -0400
Subject: [Fedora-directory-commits]
ldapserver/ldap/servers/plugins/replication
windows_protocol_util.c, 1.20.2.1, 1.20.2.2
Message-ID: <200510201725.j9KHPPF8012459@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/replication
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12443
Modified Files:
Tag: Directory71RtmBranch
windows_protocol_util.c
Log Message:
170071 - Automatically add grouptype for new groups being synchd to NT4
Index: windows_protocol_util.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/windows_protocol_util.c,v
retrieving revision 1.20.2.1
retrieving revision 1.20.2.2
diff -u -r1.20.2.1 -r1.20.2.2
--- windows_protocol_util.c 28 Sep 2005 20:27:53 -0000 1.20.2.1
+++ windows_protocol_util.c 20 Oct 2005 17:25:22 -0000 1.20.2.2
@@ -1362,6 +1362,19 @@
vs = NULL;
}
}
+ /* NT4 must have the groupType attribute set for groups. If it is not present, we will
+ * add it here with a value of 2 (global group).
+ */
+ if (is_nt4 && is_group)
+ {
+ Slapi_Attr *ap = NULL;
+ if(slapi_entry_attr_find(new_entry, "groupType", &ap))
+ {
+ /* groupType attribute wasn't found, so we'll add it */
+ slapi_entry_attr_set_int(new_entry, "groupType", 2 /* global group */);
+ }
+ }
+
if (remote_entry)
{
*remote_entry = new_entry;
From fedora-directory-commits at redhat.com Thu Oct 20 18:11:26 2005
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Thu, 20 Oct 2005 14:11:26 -0400
Subject: [Fedora-directory-commits] ldapserver/ldap/cm fedora-patch.inf,
1.1.2.4, 1.1.2.5 redhat-patch.inf, 1.1.2.4, 1.1.2.5
Message-ID: <200510201811.j9KIBQCR014112@cvs-int.fedora.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/cm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14056
Modified Files:
Tag: Directory71RtmBranch
fedora-patch.inf redhat-patch.inf
Log Message:
Removing ntds.msi from the patch list since there is no fixes going into DS7.1SP1.
Index: fedora-patch.inf
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/fedora-patch.inf,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- fedora-patch.inf 28 Sep 2005 22:47:13 -0000 1.1.2.4
+++ fedora-patch.inf 20 Oct 2005 18:11:23 -0000 1.1.2.5
@@ -54,7 +54,6 @@
file: 165640: lib/views-plugin.*
file: 167478,160589: setup/setup
file: 156120,159037: winsync/PassSync.msi
-file: 156120,159037: winsync/ntds.msi
file: 167761: java/jars/ds71.jar
file: 169388: lib/replication-plugin.*
file: xxxxxx: bin/slapd/README.txt
Index: redhat-patch.inf
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/redhat-patch.inf,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- redhat-patch.inf 28 Sep 2005 22:47:13 -0000 1.1.2.4
+++ redhat-patch.inf 20 Oct 2005 18:11:23 -0000 1.1.2.5
@@ -54,7 +54,6 @@
file: 165640: lib/views-plugin.*
file: 167478,160589: setup/setup
file: 156120,159037: winsync/PassSync.msi
-file: 156120,159037: winsync/ntds.msi
file: 167761: java/jars/ds71.jar
file: 169388: lib/replication-plugin.*
file: xxxxxx: bin/slapd/README.txt
From fedora-directory-commits at redhat.com Thu Oct 20 18:49:02 2005
From: fedora-directory-commits at redhat.com (Anthony Foxworth (foxworth))
Date: Thu, 20 Oct 2005 14:49:02 -0400
Subject: [Fedora-directory-commits] CVSROOT loginfo,1.7,1.8
Message-ID: <200510201849.j9KIn23L014470@cvs-int.fedora.redhat.com>
Author: foxworth
Update of /cvs/dirsec/CVSROOT
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14452
Modified Files:
loginfo
Log Message:
Removed mail recipient bonsai-checkin-daemon\@hurricane.sfbay.redhat.com from dolog.pl recipient list. Mail to alias was being bounced. Will add back later when problem is resolved.
Index: loginfo
===================================================================
RCS file: /cvs/dirsec/CVSROOT/loginfo,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- loginfo 17 Oct 2005 18:43:07 -0000 1.7
+++ loginfo 20 Oct 2005 18:48:52 -0000 1.8
@@ -26,4 +26,4 @@
# or
#DEFAULT (echo ""; id; echo %{sVv}; date; cat) >> $CVSROOT/CVSROOT/commitlog
DEFAULT $CVSROOT/CVSROOT/syncmail %{sVv} cvsdirsec at fedora.redhat.com
-ALL /cvs/extras/CVSROOT/dolog.pl -r /cvs/dirsec localdelivery at cvs-int.fedora.redhat.com bonsai-checkin-daemon at hurricane.sfbay.redhat.com
+ALL /cvs/extras/CVSROOT/dolog.pl -r /cvs/dirsec localdelivery at cvs-int.fedora.redhat.com
From fedora-directory-commits at redhat.com Fri Oct 21 17:40:36 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Fri, 21 Oct 2005 13:40:36 -0400
Subject: [Fedora-directory-commits]
ldapserver/ldap/servers/plugins/replication
windows_connection.c, 1.8.2.2, 1.8.2.3
Message-ID: <200510211740.j9LHeaiA021987@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/replication
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21711/ldapserver/ldap/servers/plugins/replication
Modified Files:
Tag: Directory71RtmBranch
windows_connection.c
Log Message:
Bug(s) fixed: 170350
Bug Description: RHDS to AD: entries with constraint violations not sync'ed
Reviewed by: Nathan and Noriko (Thanks!)
Branch: Directory71RtmBranch and HEAD
Fix Description: The DS correctly rejects the change and continues when
it gets a constraint violation from Windows AD in response to an
update. However, there is no way for the admin to know that this
occurred, and no easy way to find out what the problem is or how to fix
it. This fix just logs the error message from Windows at the default
log level, so an admin can know which entry and attribute had a
problem. Other log messages are logged at the repl log level, as
before. The other part of this is to remove the extraneous new line
chars from the Windows error message.
Platforms tested: RHEL4
Flag Day: no
Doc impact: Yes. We need to document a way for the user to fix the
problem and then re-sync the entry over to Windows. We also need a link
to detailed information about AD error messages.
QA impact: should be covered by regular nightly and manual testing
New Tests integrated into TET: none
Index: windows_connection.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/windows_connection.c,v
retrieving revision 1.8.2.2
retrieving revision 1.8.2.3
diff -u -r1.8.2.2 -r1.8.2.3
--- windows_connection.c 6 Oct 2005 18:15:35 -0000 1.8.2.2
+++ windows_connection.c 21 Oct 2005 17:40:33 -0000 1.8.2.3
@@ -385,6 +385,7 @@
char *errmsg = NULL;
char **referrals = NULL;
char *matched = NULL;
+ char *ptr;
rc = ldap_parse_result(conn->ld, res, &err, &matched,
&errmsg, &referrals, &loc_returned_controls,
@@ -433,13 +434,34 @@
}
return_value = LDAP_SUCCESS == conn->last_ldap_error ? CONN_OPERATION_SUCCESS : CONN_OPERATION_FAILED;
}
- slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name,
- "%s: Received result code %d for %s operation %s%s\n",
- agmt_get_long_name(conn->agmt),
- conn->last_ldap_error,
- op_string == NULL ? "" : op_string,
- extra_op_string == NULL ? "" : extra_op_string,
- extra_op_string == NULL ? "" : " ");
+ /* remove extra newlines from AD error message */
+ for (ptr = errmsg; ptr && *ptr; ++ptr) {
+ if ((*ptr == '\n') || (*ptr == '\r')) {
+ *ptr = ' ';
+ }
+ }
+ /* handle special case of constraint violation - give admin
+ enough information to allow them to fix the problem
+ and retry - bug 170350 */
+ if (conn->last_ldap_error == LDAP_CONSTRAINT_VIOLATION) {
+ char ebuf[BUFSIZ];
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name,
+ "%s: Received error [%s] when attempting to %s"
+ " entry [%s]: Please correct the attribute specified "
+ "in the error message. Refer to the Windows Active "
+ "Directory docs for more information.\n",
+ agmt_get_long_name(conn->agmt),
+ errmsg, op_string == NULL ? "" : op_string,
+ escape_string(dn, ebuf));
+ } else {
+ slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name,
+ "%s: Received result code %d (%s) for %s operation %s%s\n",
+ agmt_get_long_name(conn->agmt),
+ conn->last_ldap_error, errmsg,
+ op_string == NULL ? "" : op_string,
+ extra_op_string == NULL ? "" : extra_op_string,
+ extra_op_string == NULL ? "" : " ");
+ }
/*
* XXXggood do I need to free matched, referrals,
* anything else? Or can I pass NULL for the args
From fedora-directory-commits at redhat.com Fri Oct 21 17:55:25 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Fri, 21 Oct 2005 13:55:25 -0400
Subject: [Fedora-directory-commits]
ldapserver/ldap/servers/plugins/replication
windows_connection.c, 1.10, 1.11
Message-ID: <200510211755.j9LHtPQO023108@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/replication
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23088
Modified Files:
windows_connection.c
Log Message:
also checkin fix for 170350 onto trunk
Index: windows_connection.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/windows_connection.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- windows_connection.c 6 Oct 2005 18:23:10 -0000 1.10
+++ windows_connection.c 21 Oct 2005 17:55:22 -0000 1.11
@@ -385,6 +385,7 @@
char *errmsg = NULL;
char **referrals = NULL;
char *matched = NULL;
+ char *ptr;
rc = ldap_parse_result(conn->ld, res, &err, &matched,
&errmsg, &referrals, &loc_returned_controls,
@@ -433,13 +434,34 @@
}
return_value = LDAP_SUCCESS == conn->last_ldap_error ? CONN_OPERATION_SUCCESS : CONN_OPERATION_FAILED;
}
- slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name,
- "%s: Received result code %d for %s operation %s%s\n",
- agmt_get_long_name(conn->agmt),
- conn->last_ldap_error,
- op_string == NULL ? "" : op_string,
- extra_op_string == NULL ? "" : extra_op_string,
- extra_op_string == NULL ? "" : " ");
+ /* remove extra newlines from AD error message */
+ for (ptr = errmsg; ptr && *ptr; ++ptr) {
+ if ((*ptr == '\n') || (*ptr == '\r')) {
+ *ptr = ' ';
+ }
+ }
+ /* handle special case of constraint violation - give admin
+ enough information to allow them to fix the problem
+ and retry - bug 170350 */
+ if (conn->last_ldap_error == LDAP_CONSTRAINT_VIOLATION) {
+ char ebuf[BUFSIZ];
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name,
+ "%s: Received error [%s] when attempting to %s"
+ " entry [%s]: Please correct the attribute specified "
+ "in the error message. Refer to the Windows Active "
+ "Directory docs for more information.\n",
+ agmt_get_long_name(conn->agmt),
+ errmsg, op_string == NULL ? "" : op_string,
+ escape_string(dn, ebuf));
+ } else {
+ slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name,
+ "%s: Received result code %d (%s) for %s operation %s%s\n",
+ agmt_get_long_name(conn->agmt),
+ conn->last_ldap_error, errmsg,
+ op_string == NULL ? "" : op_string,
+ extra_op_string == NULL ? "" : extra_op_string,
+ extra_op_string == NULL ? "" : " ");
+ }
/*
* XXXggood do I need to free matched, referrals,
* anything else? Or can I pass NULL for the args
From fedora-directory-commits at redhat.com Fri Oct 21 19:19:13 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Fri, 21 Oct 2005 15:19:13 -0400
Subject: [Fedora-directory-commits] adminserver/admserv/cgi-src40 Makefile,
1.6, 1.7 perl.c, 1.4, NONE
Message-ID: <200510211919.j9LJJDqp027218@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/adminserver/admserv/cgi-src40
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27187/adminserver/admserv/cgi-src40
Modified Files:
Makefile
Removed Files:
perl.c
Log Message:
Bug(s) fixed: 171066
Bug Description: Get rid of nsperl; use perldap with system perl
Reviewed by: Noriko, Rob, Nathan (Thanks!)
Branch: HEAD
Fix Description: All perl scripts are made executable by using the
#!/usr/bin/env perl *nix trick. This means that the correct version of
perl must be in the user's PATH e.g. 5.6.1 or later. This version is
either shipped with the OS or available on all platforms. On HP/ux, it
is available as a depot which is installed in /opt/perl. For CGI perl
scripts, the PATH can be set in the admserv.conf, so we may have to do
that for HP/ux. To make perldap work, some ugly hacks are involved.
Each perl script that uses perldap has a BEGIN section that figures out
where it is in the server root, sets a server root variable, and sets
LD_LIBRARY_PATH and SHLIB_PATH to point to serverroot/shared/lib.
Perldap will be installed under serverroot/lib/perl. This directory
will have 3 subdirectories: arch - containing the binary files; auto -
containing autoloaded perl modules; and Mozilla - containing the base
perldap .pm files. The BEGIN section also sets the perl INC path to
find those modules. The directory gets rid of nsperl plus a lot of old
crufty perl building code that we do not use anymore. Those are the
removed files. The admin server code also gets rid of the perl.c wrapper.
Noriko pointed out that this does not take care of upgrade install, so I
added several more files and diffs to take care of that case.
Basically, go through the tasks in o=netscaperoot and replace
perl?scriptname with just scriptname. Also, go through all of the
template generated scripts and replace the shebang line with
#!/usr/bin/env perl, and make sure they are chmod +x. I also found a
few more places that referenced nsperl and removed them.
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/adminserver/admserv/cgi-src40/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Makefile 26 Sep 2005 14:07:17 -0000 1.6
+++ Makefile 21 Oct 2005 19:19:11 -0000 1.7
@@ -63,7 +63,7 @@
RB_PROGS = admpw config dsconfig htmladmin listOldSrvs mergeConfig migrateConfig monreplication restartsrv sec-activate security $(SNMP_PROGS) stopsrv ugdsconfig viewdata viewlog
#Programs without Resource Bundles
-NO_RB_PROGS = perl statusping userinfo ReadLog statpingserv
+NO_RB_PROGS = statusping userinfo ReadLog statpingserv
#Target CGI programs
PROGS = $(NO_RB_PROGS) $(RB_PROGS)
@@ -509,13 +509,6 @@
# helpsrch.cpp /link /INCREMENTAL:no /SUBSYSTEM:console
#endif
-ifneq ($(ARCH), WINNT)
-$(BINDIR)/perl: perl.c
- cd $(BINDIR); \
- $(CCC) $(NONSHARED) $(CFLAGS) $(MCC_INCLUDE) -o perl \
- $(SRCDIR)/perl.c $
-endif
-
$(BINDIR)/%: %.sh
cp $*.sh $(BINDIR)/$*
--- perl.c DELETED ---
From fedora-directory-commits at redhat.com Fri Oct 21 19:19:14 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Fri, 21 Oct 2005 15:19:14 -0400
Subject: [Fedora-directory-commits] adminserver/admserv/schema/ldif
tasks.ldif, 1.4, 1.5
Message-ID: <200510211919.j9LJJE1n027224@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/adminserver/admserv/schema/ldif
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27187/adminserver/admserv/schema/ldif
Modified Files:
tasks.ldif
Log Message:
Bug(s) fixed: 171066
Bug Description: Get rid of nsperl; use perldap with system perl
Reviewed by: Noriko, Rob, Nathan (Thanks!)
Branch: HEAD
Fix Description: All perl scripts are made executable by using the
#!/usr/bin/env perl *nix trick. This means that the correct version of
perl must be in the user's PATH e.g. 5.6.1 or later. This version is
either shipped with the OS or available on all platforms. On HP/ux, it
is available as a depot which is installed in /opt/perl. For CGI perl
scripts, the PATH can be set in the admserv.conf, so we may have to do
that for HP/ux. To make perldap work, some ugly hacks are involved.
Each perl script that uses perldap has a BEGIN section that figures out
where it is in the server root, sets a server root variable, and sets
LD_LIBRARY_PATH and SHLIB_PATH to point to serverroot/shared/lib.
Perldap will be installed under serverroot/lib/perl. This directory
will have 3 subdirectories: arch - containing the binary files; auto -
containing autoloaded perl modules; and Mozilla - containing the base
perldap .pm files. The BEGIN section also sets the perl INC path to
find those modules. The directory gets rid of nsperl plus a lot of old
crufty perl building code that we do not use anymore. Those are the
removed files. The admin server code also gets rid of the perl.c wrapper.
Noriko pointed out that this does not take care of upgrade install, so I
added several more files and diffs to take care of that case.
Basically, go through the tasks in o=netscaperoot and replace
perl?scriptname with just scriptname. Also, go through all of the
template generated scripts and replace the shebang line with
#!/usr/bin/env perl, and make sure they are chmod +x. I also found a
few more places that referenced nsperl and removed them.
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: tasks.ldif
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/schema/ldif/tasks.ldif,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tasks.ldif 9 Sep 2005 18:49:22 -0000 1.4
+++ tasks.ldif 21 Oct 2005 19:19:11 -0000 1.5
@@ -204,7 +204,7 @@
objectclass: nstask
objectclass: nsAdminObject
nshelpref: admin/monreplication.html
-nsexecref: perl?repl-monitor-cgi.pl
+nsexecref: repl-monitor-cgi.pl
# Top level Command branch
#
From fedora-directory-commits at redhat.com Fri Oct 21 19:21:26 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Fri, 21 Oct 2005 15:21:26 -0400
Subject: [Fedora-directory-commits] ldapserver/ldap/ldif commonTasks.ldif,
1.4, 1.5 tasks.ldif, 1.5, 1.6
Message-ID: <200510211921.j9LJLQww027419@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/ldif
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27230/ldapserver/ldap/ldif
Modified Files:
commonTasks.ldif tasks.ldif
Log Message:
Bug(s) fixed: 171066
Bug Description: Get rid of nsperl; use perldap with system perl
Reviewed by: Noriko, Rob, Nathan (Thanks!)
Branch: HEAD
Fix Description: All perl scripts are made executable by using the
#!/usr/bin/env perl *nix trick. This means that the correct version of
perl must be in the user's PATH e.g. 5.6.1 or later. This version is
either shipped with the OS or available on all platforms. On HP/ux, it
is available as a depot which is installed in /opt/perl. For CGI perl
scripts, the PATH can be set in the admserv.conf, so we may have to do
that for HP/ux. To make perldap work, some ugly hacks are involved.
Each perl script that uses perldap has a BEGIN section that figures out
where it is in the server root, sets a server root variable, and sets
LD_LIBRARY_PATH and SHLIB_PATH to point to serverroot/shared/lib.
Perldap will be installed under serverroot/lib/perl. This directory
will have 3 subdirectories: arch - containing the binary files; auto -
containing autoloaded perl modules; and Mozilla - containing the base
perldap .pm files. The BEGIN section also sets the perl INC path to
find those modules. The directory gets rid of nsperl plus a lot of old
crufty perl building code that we do not use anymore. Those are the
removed files. The admin server code also gets rid of the perl.c wrapper.
Noriko pointed out that this does not take care of upgrade install, so I
added several more files and diffs to take care of that case.
Basically, go through the tasks in o=netscaperoot and replace
perl?scriptname with just scriptname. Also, go through all of the
template generated scripts and replace the shebang line with
#!/usr/bin/env perl, and make sure they are chmod +x. I also found a
few more places that referenced nsperl and removed them.
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: commonTasks.ldif
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/ldif/commonTasks.ldif,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- commonTasks.ldif 19 Apr 2005 22:07:26 -0000 1.4
+++ commonTasks.ldif 21 Oct 2005 19:21:19 -0000 1.5
@@ -56,7 +56,7 @@
objectclass: top
objectclass: nstask
objectclass: nsAdminObject
-nsexecref: perl?migrateInstance
+nsexecref: migrateInstance
dn: cn=Create, cn=Operation, cn=Tasks
objectclass: top
@@ -68,10 +68,10 @@
objectclass: top
objectclass: nstask
objectclass: nsAdminObject
-nsexecref: perl?getConfigInfo
+nsexecref: getConfigInfo
dn: cn=MigrateLocalDB, cn=Operation, cn=Tasks
objectclass: top
objectclass: nstask
objectclass: nsAdminObject
-nsexecref: perl?migrateLocalDB
+nsexecref: migrateLocalDB
Index: tasks.ldif
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/ldif/tasks.ldif,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- tasks.ldif 19 Apr 2005 22:07:26 -0000 1.5
+++ tasks.ldif 21 Oct 2005 19:21:19 -0000 1.6
@@ -133,7 +133,7 @@
objectclass: top
objectclass: nstask
objectclass: nsAdminObject
-nsexecref: perl?ds_viewlog.pl
+nsexecref: ds_viewlog.pl
dn: cn=ListBackups, cn=operation, cn=Tasks
objectclass: top
From fedora-directory-commits at redhat.com Fri Oct 21 19:21:06 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Fri, 21 Oct 2005 15:21:06 -0400
Subject: [Fedora-directory-commits] ldapserver buildpaths.mk, 1.5,
1.6 components.mk, 1.32, 1.33 nsperl.mk, 1.4, 1.5
Message-ID: <200510211921.j9LJLbin027424@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27230/ldapserver
Modified Files:
buildpaths.mk components.mk nsperl.mk
Log Message:
Bug(s) fixed: 171066
Bug Description: Get rid of nsperl; use perldap with system perl
Reviewed by: Noriko, Rob, Nathan (Thanks!)
Branch: HEAD
Fix Description: All perl scripts are made executable by using the
#!/usr/bin/env perl *nix trick. This means that the correct version of
perl must be in the user's PATH e.g. 5.6.1 or later. This version is
either shipped with the OS or available on all platforms. On HP/ux, it
is available as a depot which is installed in /opt/perl. For CGI perl
scripts, the PATH can be set in the admserv.conf, so we may have to do
that for HP/ux. To make perldap work, some ugly hacks are involved.
Each perl script that uses perldap has a BEGIN section that figures out
where it is in the server root, sets a server root variable, and sets
LD_LIBRARY_PATH and SHLIB_PATH to point to serverroot/shared/lib.
Perldap will be installed under serverroot/lib/perl. This directory
will have 3 subdirectories: arch - containing the binary files; auto -
containing autoloaded perl modules; and Mozilla - containing the base
perldap .pm files. The BEGIN section also sets the perl INC path to
find those modules. The directory gets rid of nsperl plus a lot of old
crufty perl building code that we do not use anymore. Those are the
removed files. The admin server code also gets rid of the perl.c wrapper.
Noriko pointed out that this does not take care of upgrade install, so I
added several more files and diffs to take care of that case.
Basically, go through the tasks in o=netscaperoot and replace
perl?scriptname with just scriptname. Also, go through all of the
template generated scripts and replace the shebang line with
#!/usr/bin/env perl, and make sure they are chmod +x. I also found a
few more places that referenced nsperl and removed them.
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: buildpaths.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/buildpaths.mk,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- buildpaths.mk 3 Oct 2005 19:53:40 -0000 1.5
+++ buildpaths.mk 21 Oct 2005 19:21:04 -0000 1.6
@@ -135,3 +135,5 @@
# JAF - activation.jar - http://java.sun.com/products/javabeans/glasgow/jaf.html
# JWSDP - jaxrpc-api.jar,jaxrpc.jar,saaj.jar - http://java.sun.com/webservices/downloads/webservicespack.html
# Crimson - crimson.jar - http://xml.apache.org/crimson/
+
+PERLDAP_SOURCE_ROOT = $(MOZILLA_SOURCE_ROOT)
Index: components.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/components.mk,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- components.mk 3 Oct 2005 19:53:40 -0000 1.32
+++ components.mk 21 Oct 2005 19:21:04 -0000 1.33
@@ -741,3 +741,15 @@
- at echo "MAVEN is not required except on Windows."
endif #WINNT
+########### PerLDAP #############
+ifdef PERLDAP_SOURCE_ROOT
+ PERLDAP_BUILT_DIR = $(PERLDAP_SOURCE_ROOT)/directory/perldap/blib
+ 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
+# else we're using the pre-built zip file - see ldap/cm/Makefile
+endif
Index: nsperl.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/nsperl.mk,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nsperl.mk 19 Apr 2005 22:06:42 -0000 1.4
+++ nsperl.mk 21 Oct 2005 19:21:04 -0000 1.5
@@ -39,8 +39,6 @@
#
NSPERL_RELDATE := 20020626
-NSPERL_VERSION := nsPerl5.6.1
-NSPERL_COMPONENT_DIR = $(COMPONENTS_DIR)/nsPerl/$(NSPERL_RELDATE)/$(NSOBJDIR_NAME_32)
# default; will be redefined below for specific platform
#PERL=$(NSPERL_COMPONENT_DIR)/lib/$(NSPERL_VERSION)/nsperl
PERL=/share/builds/sbstools/nsPerl/$(NSPERL_RELDATE)/$(NSOBJDIR_NAME_32)/nsperl
@@ -55,66 +53,3 @@
ifdef USE_PERL_FROM_PATH
PERL = $(shell perl -e 'print "$$\n"')
endif
-
-NSPERL_ZIP_FILE = nsperl561.zip
-
-# This makefile sets up the environment so that we can build and link
-# perl xsubs. It assumes that you have a perl base directory that has
-# a bin and lib subdir and that which perl yields base dir/bin/perl[.exe]
-# also, this is only really necessary for NT, since this usually just
-# works in the NFS world of unix
-# for unix, we derive the paths from the Config information
-ifdef USE_OLD_NTPERL
-PERL_EXE = $(shell $(PERL) -e '($$foo = $$) =~ s@\\@/@g ; print "$$foo\n"')
-PERL_EXENT = $(subst \,/,$(PERL_EXE))
-PERL_BASEDIR = $(dir $(PERL_EXENT))
-PERL_ROOT = $(subst /bin/,,$(PERL_BASEDIR))
-IS_ACTIVESTATE = $(shell $(PERL) -v | grep -i activestate)
-else
-PERL_CONFIG = $(shell $(PERL) -e 'use Config; foreach $$item (qw(installprivlib installarchlib installsitelib installsitearch prefixexp)) { ($$foo = $$Config{$$item}) =~ s@\\@/@g ; print "$$foo "; } print "\\\n"')
-PERL_LIB = $(word 1, $(PERL_CONFIG))
-PERL_ARCHLIB = $(word 2, $(PERL_CONFIG))
-SITELIB = $(word 3, $(PERL_CONFIG))
-SITEARCH = $(word 4, $(PERL_CONFIG))
-PERL_ROOT = $(word 5, $(PERL_CONFIG))
-endif
-
-ifdef USE_OLD_NTPERL
-PERL_LIB = $(PERL_ROOT)/lib
-PERL_ARCHLIB = $(PERL_LIB)
-PERL_SITE = site
-SITELIB = $(PERL_ROOT)/$(PERL_SITE)/lib
-SITEARCH = $(SITELIB)
-endif
-
-INSTALLSITEARCH = $(SITEARCH)
-INSTALLSITELIB = $(SITELIB)
-SITEARCHEXP = $(SITEARCH)
-SITELIBEXP = $(SITELIB)
-XSUBPPDIR = $(PERL_LIB)/ExtUtils
-XSUBPP = $(XSUBPPDIR)/xsubpp
-XSPROTOARG =
-XSUBPPDEPS = $(XSUBPPDIR)/typemap
-XSUBPPARGS = -typemap $(XSUBPPDIR)/typemap
-PERL_INC = -I$(PERL_ARCHLIB)/CORE
-
-SITEHACK = $(subst $(PERL_ROOT)/,,$(SITELIB))
-ARCHHACK = $(subst $(PERL_ROOT)/,,$(PERL_ARCHLIB))
-
-ifeq ($(ARCH), WINNT)
-ifdef IS_ACTIVESTATE
-# C compilation/linking does not work for activestate; force C++
-PERL_CFLAGS = -TP -D_CONSOLE -DNO_STRICT -DPERL_OBJECT
-ifeq ($(DEBUG), full)
-PERL_CFLAGS += -DNDEBUG
-endif
-LIBPERL_A = /LIBPATH:$(PERL_ARCHLIB)/CORE perlCAPI.lib perlcore.lib PerlCRT.lib
-else
-LIBPERL_A = /LIBPATH:$(PERL_ARCHLIB)/CORE perl56.lib
-endif
-else
-ifeq ($(DEBUG), full)
-PERL_CFLAGS = -UDEBUG
-endif
-LIBPERL_A = -L$(PERL_ARCHLIB)/CORE -lperl
-endif
From fedora-directory-commits at redhat.com Fri Oct 21 19:21:12 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Fri, 21 Oct 2005 15:21:12 -0400
Subject: [Fedora-directory-commits] ldapserver/httpd/src Makefile,1.7,1.8
Message-ID: <200510211921.j9LJLgXa027427@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/httpd/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27230/ldapserver/httpd/src
Modified Files:
Makefile
Log Message:
Bug(s) fixed: 171066
Bug Description: Get rid of nsperl; use perldap with system perl
Reviewed by: Noriko, Rob, Nathan (Thanks!)
Branch: HEAD
Fix Description: All perl scripts are made executable by using the
#!/usr/bin/env perl *nix trick. This means that the correct version of
perl must be in the user's PATH e.g. 5.6.1 or later. This version is
either shipped with the OS or available on all platforms. On HP/ux, it
is available as a depot which is installed in /opt/perl. For CGI perl
scripts, the PATH can be set in the admserv.conf, so we may have to do
that for HP/ux. To make perldap work, some ugly hacks are involved.
Each perl script that uses perldap has a BEGIN section that figures out
where it is in the server root, sets a server root variable, and sets
LD_LIBRARY_PATH and SHLIB_PATH to point to serverroot/shared/lib.
Perldap will be installed under serverroot/lib/perl. This directory
will have 3 subdirectories: arch - containing the binary files; auto -
containing autoloaded perl modules; and Mozilla - containing the base
perldap .pm files. The BEGIN section also sets the perl INC path to
find those modules. The directory gets rid of nsperl plus a lot of old
crufty perl building code that we do not use anymore. Those are the
removed files. The admin server code also gets rid of the perl.c wrapper.
Noriko pointed out that this does not take care of upgrade install, so I
added several more files and diffs to take care of that case.
Basically, go through the tasks in o=netscaperoot and replace
perl?scriptname with just scriptname. Also, go through all of the
template generated scripts and replace the shebang line with
#!/usr/bin/env perl, and make sure they are chmod +x. I also found a
few more places that referenced nsperl and removed them.
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/httpd/src/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Makefile 19 Apr 2005 22:06:43 -0000 1.7
+++ Makefile 21 Oct 2005 19:21:04 -0000 1.8
@@ -147,8 +147,6 @@
#OBJS+=$(HTTPD_DIR)/httpd-lib/nspr20/uxwrap.o
endif
-DAEMONLIB=
-
ifeq ($(ARCH), WINNT)
# Don't define DEPLIBS for NT because standard macros like LINK_EXE
# and LINK_DLL automatically pick up DEPLIBS which we don't always wan't.
@@ -168,7 +166,6 @@
ifndef DEPLIBS
DEPLIBS = $(addsuffix .$(LIB_SUFFIX), \
$(addprefix $(OBJDIR)/lib/lib,$(HTTPD_LIBS)) \
- $(DAEMONLIB) \
$(OBJDIR)/lib/libaccess \
$(OBJDIR)/lib/libbase \
$(OBJDIR)/lib/libsi18n \
@@ -179,7 +176,6 @@
DEPLINK = $(addsuffix .$(LIB_SUFFIX), \
$(addprefix $(OBJDIR)/lib/lib,$(HTTPD_LIBS)) \
- $(DAEMONLIB) \
$(OBJDIR)/lib/libaccess \
$(OBJDIR)/lib/libbase \
$(OBJDIR)/lib/libsi18n \
From fedora-directory-commits at redhat.com Fri Oct 21 19:21:13 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Fri, 21 Oct 2005 15:21:13 -0400
Subject: [Fedora-directory-commits]
ldapserver/ldap/admin/src Makefile, 1.13,
1.14 configure_instance.cpp, 1.7, 1.8 create_instance.c, 1.22,
1.23 ds_newinst.pl, 1.4, 1.5 ds_viewlog.pl, 1.4,
1.5 getConfigInfo, 1.4, 1.5 import2info, 1.4,
1.5 makemccvlvindexes, 1.4, 1.5 makevlvindex, 1.4,
1.5 makevlvsearch, 1.4, 1.5 migrateInstance, 1.4,
1.5 migrateLocalDB, 1.4, 1.5 migratePwdFile, 1.4,
1.5 migrateTo4, 1.5, 1.6 migratedsgw, 1.4,
1.5 ns-newpwpolicy.pl, 1.4, 1.5 updatedsgw, 1.6,
1.7 upgradeServer, 1.6, 1.7 AddPerlHeader.pl, 1.4,
NONE Base.def, 1.5, NONE Base.pm, 1.4, NONE CreateInstall.pl,
1.4, NONE DSAdmin.def, 1.4, NONE DSAdmin.mk, 1.7,
NONE DSAdmin.pm, 1.5, NONE DSAdmin.xs, 1.4, NONE Inf.pm, 1.4, NONE
Message-ID: <200510211921.j9LJLhGZ027431@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/admin/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27230/ldapserver/ldap/admin/src
Modified Files:
Makefile configure_instance.cpp create_instance.c
ds_newinst.pl ds_viewlog.pl getConfigInfo import2info
makemccvlvindexes makevlvindex makevlvsearch migrateInstance
migrateLocalDB migratePwdFile migrateTo4 migratedsgw
ns-newpwpolicy.pl updatedsgw upgradeServer
Removed Files:
AddPerlHeader.pl Base.def Base.pm CreateInstall.pl DSAdmin.def
DSAdmin.mk DSAdmin.pm DSAdmin.xs Inf.pm
Log Message:
Bug(s) fixed: 171066
Bug Description: Get rid of nsperl; use perldap with system perl
Reviewed by: Noriko, Rob, Nathan (Thanks!)
Branch: HEAD
Fix Description: All perl scripts are made executable by using the
#!/usr/bin/env perl *nix trick. This means that the correct version of
perl must be in the user's PATH e.g. 5.6.1 or later. This version is
either shipped with the OS or available on all platforms. On HP/ux, it
is available as a depot which is installed in /opt/perl. For CGI perl
scripts, the PATH can be set in the admserv.conf, so we may have to do
that for HP/ux. To make perldap work, some ugly hacks are involved.
Each perl script that uses perldap has a BEGIN section that figures out
where it is in the server root, sets a server root variable, and sets
LD_LIBRARY_PATH and SHLIB_PATH to point to serverroot/shared/lib.
Perldap will be installed under serverroot/lib/perl. This directory
will have 3 subdirectories: arch - containing the binary files; auto -
containing autoloaded perl modules; and Mozilla - containing the base
perldap .pm files. The BEGIN section also sets the perl INC path to
find those modules. The directory gets rid of nsperl plus a lot of old
crufty perl building code that we do not use anymore. Those are the
removed files. The admin server code also gets rid of the perl.c wrapper.
Noriko pointed out that this does not take care of upgrade install, so I
added several more files and diffs to take care of that case.
Basically, go through the tasks in o=netscaperoot and replace
perl?scriptname with just scriptname. Also, go through all of the
template generated scripts and replace the shebang line with
#!/usr/bin/env perl, and make sure they are chmod +x. I also found a
few more places that referenced nsperl and removed them.
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/admin/src/Makefile,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Makefile 3 Oct 2005 19:53:52 -0000 1.13
+++ Makefile 21 Oct 2005 19:21:10 -0000 1.14
@@ -348,10 +348,12 @@
$(BINDIR)/%: %
-@$(RM) $@
$(CP) $< $@
+ chmod +x $@
$(LDAP_SERVER_RELDIR)/%: % $(LDAP_SERVER_RELDIR)
-@$(RM) $@
$(CP) $< $@
+ chmod +x $@
$(INST_INCLUDES): install_keywords.h
-@$(RM) $@
@@ -360,3 +362,4 @@
$(SCRIPTSDIR)/template-%: scripts/template-% $(SCRIPTSDIR)
-@$(RM) $@
$(CP) $< $@
+ chmod +x $@
Index: configure_instance.cpp
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/configure_instance.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- configure_instance.cpp 19 Apr 2005 22:06:55 -0000 1.7
+++ configure_instance.cpp 21 Oct 2005 19:21:10 -0000 1.8
@@ -1964,5 +1964,60 @@
}
while (ldapent.next() == OKAY);
+ // we no longer use nsperl - any CGIs which we used to invoke via perl?perlscript
+ // are now invoked directly by making the perl script executable - we need to
+ // search for all nsexecref: perl?perlscript and replace them with
+ // nsexecref: perlscript
+ filter = NSString("(nsexecref=perl*)");
+ scope = LDAP_SCOPE_SUBTREE;
+ baseDN = name_netscaperootDN;
+
+ ldapent.clear();
+ le = ldapent.retrieve(filter, scope, baseDN);
+ if (le != OKAY)
+ {
+ if (le == NOT_FOUND) {
+ dsLogMessage(SETUP_LOG_INFO, "Slapd",
+ "No old nsperl references found");
+ } else {
+ dsLogMessage(SETUP_LOG_FATAL, "Slapd",
+ "ERROR: Could not find old nsperl references\n"
+ "URL %s user id %s DN %s (%d:%s)",
+ installInfo->get(SLAPD_KEY_K_LDAP_URL),
+ installInfo->get(SLAPD_KEY_SERVER_ADMIN_ID),
+ (const char *)baseDN,
+ le.errorCode(), le.msg());
+ return le.errorCode();
+ }
+ } else {
+ do
+ {
+ LdapEntry repEntry(ldapent.ldap());
+ repEntry.retrieve(ldapent.entryDN());
+ char *val = repEntry.getAttribute("nsexecref");
+ const char *ptr = 0;
+ if (val && *val && (ptr = strstr(val, "perl?"))) {
+ ptr = strchr(ptr, '?');
+ ptr++;
+ NSString newscript = NSString(ptr);
+ repEntry.setAttribute("nsexecref", newscript);
+ }
+
+ le = repEntry.replace(repEntry.entryDN());
+ if (le != OKAY)
+ {
+ dsLogMessage(SETUP_LOG_FATAL, "Slapd",
+ "ERROR: Could not fix old nsperl reference\n"
+ "URL %s user id %s DN %s (%d:%s)" ,
+ installInfo->get(SLAPD_KEY_K_LDAP_URL),
+ installInfo->get(SLAPD_KEY_SERVER_ADMIN_ID),
+ (const char *)repEntry.entryDN(),
+ le.errorCode(), le.msg());
+ return le.errorCode();
+ }
+ }
+ while (ldapent.next() == OKAY);
+ }
+
return 0;
}
Index: create_instance.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/create_instance.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- create_instance.c 6 Sep 2005 21:15:14 -0000 1.22
+++ create_instance.c 21 Oct 2005 19:21:10 -0000 1.23
@@ -765,9 +765,13 @@
FILE_PATHSEP, FILE_PATHSEP, FILE_PATHSEP, FILE_PATHSEP,
FILE_PATHSEP, name);
PR_snprintf(fn, sizeof(fn), "%s%c%s", cs_path, FILE_PATHSEP, name);
+#ifdef USE_NSPERL
PR_snprintf(myperl, sizeof(myperl), "!%s%cbin%cslapd%cadmin%cbin%cperl",
s_root, FILE_PATHSEP, FILE_PATHSEP,
FILE_PATHSEP, FILE_PATHSEP, FILE_PATHSEP);
+#else
+ strcpy(myperl, "!/usr/bin/env perl");
+#endif
table[0][0] = "DS-ROOT";
table[0][1] = s_root;
@@ -812,9 +816,13 @@
FILE_PATHSEP, name);
PR_snprintf(fn, sizeof(fn), "%s%cbin%cslapd%cadmin%cbin%c%s", s_root, FILE_PATHSEP,
FILE_PATHSEP, FILE_PATHSEP, FILE_PATHSEP, FILE_PATHSEP, name);
+#ifdef USE_NSPERL
PR_snprintf(myperl, sizeof(myperl), "!%s%cbin%cslapd%cadmin%cbin%cperl",
s_root, FILE_PATHSEP, FILE_PATHSEP,
FILE_PATHSEP, FILE_PATHSEP, FILE_PATHSEP);
+#else
+ strcpy(myperl, "!/usr/bin/env perl");
+#endif
table[0][0] = "DS-ROOT";
table[0][1] = s_root;
Index: ds_newinst.pl
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/ds_newinst.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ds_newinst.pl 19 Apr 2005 22:06:55 -0000 1.4
+++ ds_newinst.pl 21 Oct 2005 19:21:10 -0000 1.5
@@ -1,3 +1,4 @@
+#!/usr/bin/env perl
# BEGIN COPYRIGHT BLOCK
# This Program is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free Software
Index: ds_viewlog.pl
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/ds_viewlog.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ds_viewlog.pl 19 Apr 2005 22:06:55 -0000 1.4
+++ ds_viewlog.pl 21 Oct 2005 19:21:10 -0000 1.5
@@ -1,4 +1,4 @@
-#!perl
+#!/usr/bin/env perl
#
# BEGIN COPYRIGHT BLOCK
# This Program is free software; you can redistribute it and/or modify it under
Index: getConfigInfo
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/getConfigInfo,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- getConfigInfo 19 Apr 2005 22:06:55 -0000 1.4
+++ getConfigInfo 21 Oct 2005 19:21:10 -0000 1.5
@@ -1,4 +1,4 @@
-#!perl
+#!/usr/bin/env perl
#
# BEGIN COPYRIGHT BLOCK
# This Program is free software; you can redistribute it and/or modify it under
Index: import2info
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/import2info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import2info 19 Apr 2005 22:06:55 -0000 1.4
+++ import2info 21 Oct 2005 19:21:10 -0000 1.5
@@ -1,4 +1,4 @@
-#!perl
+#!/usr/bin/env perl
#
# BEGIN COPYRIGHT BLOCK
# This Program is free software; you can redistribute it and/or modify it under
Index: makemccvlvindexes
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/makemccvlvindexes,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- makemccvlvindexes 19 Apr 2005 22:06:55 -0000 1.4
+++ makemccvlvindexes 21 Oct 2005 19:21:10 -0000 1.5
@@ -1,4 +1,4 @@
-#!perl
+#!/usr/bin/env perl
#
# BEGIN COPYRIGHT BLOCK
# This Program is free software; you can redistribute it and/or modify it under
Index: makevlvindex
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/makevlvindex,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- makevlvindex 19 Apr 2005 22:06:55 -0000 1.4
+++ makevlvindex 21 Oct 2005 19:21:10 -0000 1.5
@@ -1,4 +1,4 @@
-#!perl
+#!/usr/bin/env perl
#
# BEGIN COPYRIGHT BLOCK
# This Program is free software; you can redistribute it and/or modify it under
Index: makevlvsearch
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/makevlvsearch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- makevlvsearch 19 Apr 2005 22:06:55 -0000 1.4
+++ makevlvsearch 21 Oct 2005 19:21:10 -0000 1.5
@@ -1,4 +1,4 @@
-#!perl
+#!/usr/bin/env perl
#
# BEGIN COPYRIGHT BLOCK
# This Program is free software; you can redistribute it and/or modify it under
Index: migrateInstance
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/migrateInstance,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- migrateInstance 19 Apr 2005 22:06:55 -0000 1.4
+++ migrateInstance 21 Oct 2005 19:21:10 -0000 1.5
@@ -1,4 +1,4 @@
-#!perl
+#!/usr/bin/env perl
#
# BEGIN COPYRIGHT BLOCK
# This Program is free software; you can redistribute it and/or modify it under
Index: migrateLocalDB
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/migrateLocalDB,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- migrateLocalDB 19 Apr 2005 22:06:55 -0000 1.4
+++ migrateLocalDB 21 Oct 2005 19:21:10 -0000 1.5
@@ -1,4 +1,4 @@
-#!perl
+#!/usr/bin/env perl
#
# BEGIN COPYRIGHT BLOCK
# This Program is free software; you can redistribute it and/or modify it under
Index: migratePwdFile
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/migratePwdFile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- migratePwdFile 19 Apr 2005 22:06:55 -0000 1.4
+++ migratePwdFile 21 Oct 2005 19:21:10 -0000 1.5
@@ -1,4 +1,4 @@
-#!perl
+#!/usr/bin/env perl
#
# BEGIN COPYRIGHT BLOCK
# This Program is free software; you can redistribute it and/or modify it under
Index: migrateTo4
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/migrateTo4,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- migrateTo4 19 Apr 2005 22:06:55 -0000 1.5
+++ migrateTo4 21 Oct 2005 19:21:10 -0000 1.6
@@ -1,4 +1,4 @@
-#!perl
+#!/usr/bin/env perl
#
# BEGIN COPYRIGHT BLOCK
# This Program is free software; you can redistribute it and/or modify it under
Index: migratedsgw
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/migratedsgw,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- migratedsgw 19 Apr 2005 22:06:55 -0000 1.4
+++ migratedsgw 21 Oct 2005 19:21:10 -0000 1.5
@@ -1,4 +1,4 @@
-#!perl
+#!/usr/bin/env perl
#
# BEGIN COPYRIGHT BLOCK
# This Program is free software; you can redistribute it and/or modify it under
Index: ns-newpwpolicy.pl
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/ns-newpwpolicy.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ns-newpwpolicy.pl 19 Apr 2005 22:06:55 -0000 1.4
+++ ns-newpwpolicy.pl 21 Oct 2005 19:21:10 -0000 1.5
@@ -1,4 +1,4 @@
-# perl script
+#!/usr/bin/env perl
#
# BEGIN COPYRIGHT BLOCK
# This Program is free software; you can redistribute it and/or modify it under
@@ -39,6 +39,28 @@
# END COPYRIGHT BLOCK
#
+# enable the use of our bundled perldap with our bundled ldapsdk libraries
+# all of this nonsense can be omitted if the mozldapsdk and perldap are
+# installed in the operating system locations (e.g. /usr/lib /usr/lib/perl5)
+BEGIN {
+ my $savedir = `pwd`;
+ my $dirname = `dirname $0`;
+ chdir $dirname;
+ my $sroot = `pwd`;
+ $sroot =~ s@/slapd-.*@@;
+ chomp($sroot);
+ chdir $savedir;
+ push @INC, "$sroot/lib/perl/arch", "$sroot/lib/perl";
+ if ($ENV{LD_LIBRARY_PATH}) {
+ $ENV{LD_LIBRARY_PATH} .= ":";
+ }
+ $ENV{LD_LIBRARY_PATH} .= "$sroot/shared/lib";
+ # this is only needed for HP/ux PA-RISC, but it doesn't hurt other platforms
+ if ($ENV{SHLIB_PATH}) {
+ $ENV{SHLIB_PATH} .= ":";
+ }
+ $ENV{SHLIB_PATH} .= "$sroot/shared/lib";
+}
# Add new password policy specific entries
#############################################################################
Index: updatedsgw
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/updatedsgw,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- updatedsgw 19 Apr 2005 22:06:55 -0000 1.6
+++ updatedsgw 21 Oct 2005 19:21:10 -0000 1.7
@@ -1,4 +1,4 @@
-#!perl
+#!/usr/bin/env perl
#
# BEGIN COPYRIGHT BLOCK
# This Program is free software; you can redistribute it and/or modify it under
Index: upgradeServer
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/upgradeServer,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- upgradeServer 7 Sep 2005 00:54:20 -0000 1.6
+++ upgradeServer 21 Oct 2005 19:21:10 -0000 1.7
@@ -1,4 +1,4 @@
-#!perl
+#!/usr/bin/env perl
#
# BEGIN COPYRIGHT BLOCK
# This Program is free software; you can redistribute it and/or modify it under
@@ -266,7 +266,7 @@
last; # not found, just abort
}
if ($inClEntry && /^nsslapd-changelogdir:\s*/i) {
- $clDir = $';
+ $clDir = $'; #'
chomp($clDir);
last;
}
@@ -407,6 +407,48 @@
return $version;
}
+sub instantiate_new_package_scripts {
+
+ my @newtemplates = (
+ "$sroot/bin/slapd/admin/scripts/template-cl-dump.pl",
+ "$sroot/bin/slapd/admin/scripts/template-migrate5to7",
+ "$sroot/bin/slapd/admin/scripts/template-migrate6to7",
+ "$sroot/bin/slapd/admin/scripts/template-migrateInstance7",
+ "$sroot/bin/slapd/admin/scripts/template-migrateTo4",
+ "$sroot/bin/slapd/admin/scripts/template-migrateTo7",
+ "$sroot/bin/slapd/admin/scripts/template-repl-monitor-cgi.pl",
+ );
+
+ foreach $src ( @newtemplates ) {
+ $dest = "$sroot/bin/slapd/admin/bin/$1" if $src =~ /.*template-(.*)$/;
+ # repl mon cgi script goes in bin/admin/admin/bin
+ if ($src =~ /repl-monitor-cgi.pl/) {
+ $dest =~ s@/bin/slapd/admin/bin/@/bin/admin/admin/bin/@;
+ }
+ unless ( open ( template, $src )) {
+ print "Can't open $src: $!\n";
+ next;
+ }
+ unless ( open ( target, ">$dest" )) {
+ print "Can't open $dest: $!\n";
+ close template;
+ next;
+ }
+ while ( ) {
+ s#{{PERL-EXEC}}#!/usr/bin/env perl#g;
+ s#{{DS-ROOT}}#$sroot#g;
+ s#{{SEP}}#${PS}#g;
+ print target;
+ }
+ close template;
+ close target;
+
+ chmod 0755, $dest;
+ }
+
+ return 0;
+}
+
#
# Some scripts generated by create_instance may not
# get generated during in-place upgrade. This function
@@ -418,8 +460,18 @@
#
sub instantiate_new_scripts {
- @newtemplates = (
- "$sroot/bin/slapd/admin/scripts/template-db2index.pl"
+ my @newtemplates = (
+ "$sroot/bin/slapd/admin/scripts/template-verify-db.pl",
+ "$sroot/bin/slapd/admin/scripts/template-db2index.pl",
+ "$sroot/bin/slapd/admin/scripts/template-bak2db.pl",
+ "$sroot/bin/slapd/admin/scripts/template-db2bak.pl",
+ "$sroot/bin/slapd/admin/scripts/template-db2ldif.pl",
+ "$sroot/bin/slapd/admin/scripts/template-dsml-activate.pl",
+ "$sroot/bin/slapd/admin/scripts/template-ldif2db.pl",
+ "$sroot/bin/slapd/admin/scripts/template-ns-accountstatus.pl",
+ "$sroot/bin/slapd/admin/scripts/template-ns-activate.pl",
+ "$sroot/bin/slapd/admin/scripts/template-ns-inactivate.pl",
+ "$sroot/bin/slapd/admin/scripts/template-ns-newpwpolicy.pl"
);
$host = localhost;
@@ -444,7 +496,7 @@
next;
}
while ( ) {
- s#{{PERL-EXEC}}#!$sroot/bin/slapd/admin/bin/perl#g;
+ s#{{PERL-EXEC}}#!/usr/bin/env perl#g;
s#{{DS-ROOT}}#$sroot#g;
s#{{SEP}}#${PS}#g;
s#{{ROOT-DN}}#$rootdn#g;
@@ -460,20 +512,28 @@
}
# copy schema is safe even if same version
-copy_schema_files;
+copy_schema_files if ($prefix);
# modify only if necessary
-modify_dse_ldif;
+modify_dse_ldif if ($prefix);
# fix changelog is safe even if same version - no op
-my $clDir = get_changelog_dir;
-if ($clDir && -d $clDir) {
- my $oldclversion = getChangelogVersion($clDir);
- my $clversion = "2.0"; # with DS 6.1
-
- if ($oldclversion < $clversion) {
- fix_changelog($clDir, $clversion);
- }
+if ($prefix) {
+ my $clDir = get_changelog_dir;
+ if ($clDir && -d $clDir) {
+ my $oldclversion = getChangelogVersion($clDir);
+ my $clversion = "2.0"; # with DS 6.1
+
+ if ($oldclversion < $clversion) {
+ fix_changelog($clDir, $clversion);
+ }
+ }
+}
+
+# fix instance specific scripts
+if ($prefix) {
+ instantiate_new_scripts ();
+} else {
+# fix non instance specific (package) scripts
+ instantiate_new_package_scripts ();
}
-
-instantiate_new_scripts ();
--- AddPerlHeader.pl DELETED ---
--- Base.def DELETED ---
--- Base.pm DELETED ---
--- CreateInstall.pl DELETED ---
--- DSAdmin.def DELETED ---
--- DSAdmin.mk DELETED ---
--- DSAdmin.pm DELETED ---
--- DSAdmin.xs DELETED ---
--- Inf.pm DELETED ---
From fedora-directory-commits at redhat.com Fri Oct 21 19:21:14 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Fri, 21 Oct 2005 15:21:14 -0400
Subject: [Fedora-directory-commits] ldapserver/ldap/admin/src/scripts
template-cl-dump.pl, 1.6, 1.7 template-migrate50to51, 1.5,
1.6 template-migrate5to6, 1.4, 1.5 template-migrate5to7, 1.4,
1.5 template-migrate6to7, 1.6, 1.7 template-migrateInstance5,
1.4, 1.5 template-migrateInstance6, 1.4,
1.5 template-migrateInstance7, 1.5, 1.6 template-migrateTo5,
1.5, 1.6 template-migrateTo6, 1.4, 1.5 template-migrateTo7,
1.5, 1.6 template-ns-newpwpolicy.pl, 1.4,
1.5 template-repl-monitor-cgi.pl, 1.4,
1.5 template-repl-monitor.pl, 1.6, 1.7 template-verify-db.pl,
1.4, 1.5
Message-ID: <200510211921.j9LJLiRF027444@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/admin/src/scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27230/ldapserver/ldap/admin/src/scripts
Modified Files:
template-cl-dump.pl template-migrate50to51
template-migrate5to6 template-migrate5to7 template-migrate6to7
template-migrateInstance5 template-migrateInstance6
template-migrateInstance7 template-migrateTo5
template-migrateTo6 template-migrateTo7
template-ns-newpwpolicy.pl template-repl-monitor-cgi.pl
template-repl-monitor.pl template-verify-db.pl
Log Message:
Bug(s) fixed: 171066
Bug Description: Get rid of nsperl; use perldap with system perl
Reviewed by: Noriko, Rob, Nathan (Thanks!)
Branch: HEAD
Fix Description: All perl scripts are made executable by using the
#!/usr/bin/env perl *nix trick. This means that the correct version of
perl must be in the user's PATH e.g. 5.6.1 or later. This version is
either shipped with the OS or available on all platforms. On HP/ux, it
is available as a depot which is installed in /opt/perl. For CGI perl
scripts, the PATH can be set in the admserv.conf, so we may have to do
that for HP/ux. To make perldap work, some ugly hacks are involved.
Each perl script that uses perldap has a BEGIN section that figures out
where it is in the server root, sets a server root variable, and sets
LD_LIBRARY_PATH and SHLIB_PATH to point to serverroot/shared/lib.
Perldap will be installed under serverroot/lib/perl. This directory
will have 3 subdirectories: arch - containing the binary files; auto -
containing autoloaded perl modules; and Mozilla - containing the base
perldap .pm files. The BEGIN section also sets the perl INC path to
find those modules. The directory gets rid of nsperl plus a lot of old
crufty perl building code that we do not use anymore. Those are the
removed files. The admin server code also gets rid of the perl.c wrapper.
Noriko pointed out that this does not take care of upgrade install, so I
added several more files and diffs to take care of that case.
Basically, go through the tasks in o=netscaperoot and replace
perl?scriptname with just scriptname. Also, go through all of the
template generated scripts and replace the shebang line with
#!/usr/bin/env perl, and make sure they are chmod +x. I also found a
few more places that referenced nsperl and removed them.
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: template-cl-dump.pl
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-cl-dump.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- template-cl-dump.pl 19 Apr 2005 22:13:37 -0000 1.6
+++ template-cl-dump.pl 21 Oct 2005 19:21:11 -0000 1.7
@@ -96,6 +96,23 @@
# DSHOME/bin/slapd/admin/scripts
#
################################################################################
+# enable the use of our bundled perldap with our bundled ldapsdk libraries
+# all of this nonsense can be omitted if the mozldapsdk and perldap are
+# installed in the operating system locations (e.g. /usr/lib /usr/lib/perl5)
+BEGIN {
+ my $sroot = "{{DS-ROOT}}";
+ push @INC, "$sroot/lib/perl/arch", "$sroot/lib/perl";
+ if ($ENV{LD_LIBRARY_PATH}) {
+ $ENV{LD_LIBRARY_PATH} .= ":";
+ }
+ $ENV{LD_LIBRARY_PATH} .= "$sroot/shared/lib";
+ # this is only needed for HP/ux PA-RISC, but it doesn't hurt other platforms
+ if ($ENV{SHLIB_PATH}) {
+ $ENV{SHLIB_PATH} .= ":";
+ }
+ $ENV{SHLIB_PATH} .= "$sroot/shared/lib";
+}
+
$usage="Usage: $0 [-h host] [-p port] [-D bind-dn] [-w bind-password | -P bind-cert] [-r replica-roots] [-o output-file] [-c] [-v]\n\n $0 -i changelog-ldif-file-with-base64encoding [-o output-file] [-c]";
use Getopt::Std; # Parse command line arguments
Index: template-migrate50to51
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-migrate50to51,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- template-migrate50to51 19 Apr 2005 22:07:00 -0000 1.5
+++ template-migrate50to51 21 Oct 2005 19:21:11 -0000 1.6
@@ -39,6 +39,22 @@
# END COPYRIGHT BLOCK
#
+# enable the use of our bundled perldap with our bundled ldapsdk libraries
+# all of this nonsense can be omitted if the mozldapsdk and perldap are
+# installed in the operating system locations (e.g. /usr/lib /usr/lib/perl5)
+BEGIN {
+ my $sroot = "{{DS-ROOT}}";
+ push @INC, "$sroot/lib/perl/arch", "$sroot/lib/perl";
+ if ($ENV{LD_LIBRARY_PATH}) {
+ $ENV{LD_LIBRARY_PATH} .= ":";
+ }
+ $ENV{LD_LIBRARY_PATH} .= "$sroot/shared/lib";
+ # this is only needed for HP/ux PA-RISC, but it doesn't hurt other platforms
+ if ($ENV{SHLIB_PATH}) {
+ $ENV{SHLIB_PATH} .= ":";
+ }
+ $ENV{SHLIB_PATH} .= "$sroot/shared/lib";
+}
# Migrate a 5.0 directory server to a 5.1 directory server
#######################################################################################################
Index: template-migrate5to6
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-migrate5to6,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- template-migrate5to6 19 Apr 2005 22:07:00 -0000 1.4
+++ template-migrate5to6 21 Oct 2005 19:21:11 -0000 1.5
@@ -39,6 +39,22 @@
# END COPYRIGHT BLOCK
#
+# enable the use of our bundled perldap with our bundled ldapsdk libraries
+# all of this nonsense can be omitted if the mozldapsdk and perldap are
+# installed in the operating system locations (e.g. /usr/lib /usr/lib/perl5)
+BEGIN {
+ my $sroot = "{{DS-ROOT}}";
+ push @INC, "$sroot/lib/perl/arch", "$sroot/lib/perl";
+ if ($ENV{LD_LIBRARY_PATH}) {
+ $ENV{LD_LIBRARY_PATH} .= ":";
+ }
+ $ENV{LD_LIBRARY_PATH} .= "$sroot/shared/lib";
+ # this is only needed for HP/ux PA-RISC, but it doesn't hurt other platforms
+ if ($ENV{SHLIB_PATH}) {
+ $ENV{SHLIB_PATH} .= ":";
+ }
+ $ENV{SHLIB_PATH} .= "$sroot/shared/lib";
+}
# Migrate a 5.x directory server to a 6.2 directory server
#######################################################################################################
Index: template-migrate5to7
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-migrate5to7,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- template-migrate5to7 19 Apr 2005 22:07:00 -0000 1.4
+++ template-migrate5to7 21 Oct 2005 19:21:11 -0000 1.5
@@ -39,6 +39,22 @@
# END COPYRIGHT BLOCK
#
+# enable the use of our bundled perldap with our bundled ldapsdk libraries
+# all of this nonsense can be omitted if the mozldapsdk and perldap are
+# installed in the operating system locations (e.g. /usr/lib /usr/lib/perl5)
+BEGIN {
+ my $sroot = "{{DS-ROOT}}";
+ push @INC, "$sroot/lib/perl/arch", "$sroot/lib/perl";
+ if ($ENV{LD_LIBRARY_PATH}) {
+ $ENV{LD_LIBRARY_PATH} .= ":";
+ }
+ $ENV{LD_LIBRARY_PATH} .= "$sroot/shared/lib";
+ # this is only needed for HP/ux PA-RISC, but it doesn't hurt other platforms
+ if ($ENV{SHLIB_PATH}) {
+ $ENV{SHLIB_PATH} .= ":";
+ }
+ $ENV{SHLIB_PATH} .= "$sroot/shared/lib";
+}
# Migrate a 5.x directory server to a 7.0 directory server
#######################################################################################################
Index: template-migrate6to7
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-migrate6to7,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- template-migrate6to7 19 Apr 2005 22:07:00 -0000 1.6
+++ template-migrate6to7 21 Oct 2005 19:21:11 -0000 1.7
@@ -39,6 +39,22 @@
# END COPYRIGHT BLOCK
#
+# enable the use of our bundled perldap with our bundled ldapsdk libraries
+# all of this nonsense can be omitted if the mozldapsdk and perldap are
+# installed in the operating system locations (e.g. /usr/lib /usr/lib/perl5)
+BEGIN {
+ my $sroot = "{{DS-ROOT}}";
+ push @INC, "$sroot/lib/perl/arch", "$sroot/lib/perl";
+ if ($ENV{LD_LIBRARY_PATH}) {
+ $ENV{LD_LIBRARY_PATH} .= ":";
+ }
+ $ENV{LD_LIBRARY_PATH} .= "$sroot/shared/lib";
+ # this is only needed for HP/ux PA-RISC, but it doesn't hurt other platforms
+ if ($ENV{SHLIB_PATH}) {
+ $ENV{SHLIB_PATH} .= ":";
+ }
+ $ENV{SHLIB_PATH} .= "$sroot/shared/lib";
+}
# Migrate a 6.x directory server to a 7.0 directory server
#######################################################################################################
Index: template-migrateInstance5
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-migrateInstance5,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- template-migrateInstance5 19 Apr 2005 22:07:00 -0000 1.4
+++ template-migrateInstance5 21 Oct 2005 19:21:11 -0000 1.5
@@ -140,16 +140,6 @@
exit(1);
}
$ENV{"$LIB_PATH"} = "$root${PATHSEP}lib${SEP}".$ENV{"$LIB_PATH"} ;
-if ($isSolaris9) {
- $ENV{"$LIB_PATH"} = "$root${PATHSEP}lib${PATHSEP}nsPerl5.005_03${PATHSEP}lib${PATHSEP}sun4-solaris${PATHSEP}CORE${SEP}".$ENV{"$LIB_PATH"} ;
-}
-
-if ($isNT) {
- $ENV{"PERL5LIB"} = "$root${PATHSEP}lib${PATHSEP}nsPerl5.005_03${PATHSEP}site${PATHSEP}lib${SEP}".$ENV{"PERL5LIB"} ;
-}
-else {
- $ENV{"PERL5LIB"} = "$root${PATHSEP}lib${PATHSEP}nsPerl5.005_03${PATHSEP}lib${PATHSEP}site${SEP}".$ENV{"PERL5LIB"} ;
-}
# get the version of the DS to migrate
($oldVersion, $oldMinor) = &getVersion($oldDir);
Index: template-migrateInstance6
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-migrateInstance6,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- template-migrateInstance6 19 Apr 2005 22:07:00 -0000 1.4
+++ template-migrateInstance6 21 Oct 2005 19:21:11 -0000 1.5
@@ -144,16 +144,6 @@
exit(1);
}
$ENV{"$LIB_PATH"} = "$root${PATHSEP}lib${SEP}".$ENV{"$LIB_PATH"} ;
-if ($isSolaris9) {
- $ENV{"$LIB_PATH"} = "$root${PATHSEP}lib${PATHSEP}nsPerl5.6.1${PATHSEP}lib${PATHSEP}sun4-solaris${PATHSEP}CORE${SEP}".$ENV{"$LIB_PATH"} ;
-}
-
-if ($isNT) {
- $ENV{"PERL5LIB"} = "$root${PATHSEP}lib${PATHSEP}nsPerl5.6.1${PATHSEP}site${PATHSEP}lib${SEP}".$ENV{"PERL5LIB"} ;
-}
-else {
- $ENV{"PERL5LIB"} = "$root${PATHSEP}lib${PATHSEP}nsPerl5.6.1${PATHSEP}lib${PATHSEP}site${SEP}".$ENV{"PERL5LIB"} ;
-}
# get the version of the DS to migrate
($oldVersion, $oldMinor) = &getVersion($oldDir, $oldversionstr);
Index: template-migrateInstance7
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-migrateInstance7,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- template-migrateInstance7 19 Apr 2005 22:07:00 -0000 1.5
+++ template-migrateInstance7 21 Oct 2005 19:21:11 -0000 1.6
@@ -144,16 +144,6 @@
exit(1);
}
$ENV{"$LIB_PATH"} = "$root${PATHSEP}lib${SEP}".$ENV{"$LIB_PATH"} ;
-if ($isSolaris9) {
- $ENV{"$LIB_PATH"} = "$root${PATHSEP}lib${PATHSEP}nsPerl5.6.1${PATHSEP}lib${PATHSEP}sun4-solaris${PATHSEP}CORE${SEP}".$ENV{"$LIB_PATH"} ;
-}
-
-if ($isNT) {
- $ENV{"PERL5LIB"} = "$root${PATHSEP}lib${PATHSEP}nsPerl5.6.1${PATHSEP}site${PATHSEP}lib${SEP}".$ENV{"PERL5LIB"} ;
-}
-else {
- $ENV{"PERL5LIB"} = "$root${PATHSEP}lib${PATHSEP}nsPerl5.6.1${PATHSEP}lib${PATHSEP}site${SEP}".$ENV{"PERL5LIB"} ;
-}
# get the version of the DS to migrate
($oldVersion, $oldMinor) = &getVersion($oldDir, $oldversionstr);
Index: template-migrateTo5
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-migrateTo5,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- template-migrateTo5 19 Apr 2005 22:07:00 -0000 1.5
+++ template-migrateTo5 21 Oct 2005 19:21:11 -0000 1.6
@@ -39,6 +39,22 @@
# END COPYRIGHT BLOCK
#
+# enable the use of our bundled perldap with our bundled ldapsdk libraries
+# all of this nonsense can be omitted if the mozldapsdk and perldap are
+# installed in the operating system locations (e.g. /usr/lib /usr/lib/perl5)
+BEGIN {
+ my $sroot = "{{DS-ROOT}}";
+ push @INC, "$sroot/lib/perl/arch", "$sroot/lib/perl";
+ if ($ENV{LD_LIBRARY_PATH}) {
+ $ENV{LD_LIBRARY_PATH} .= ":";
+ }
+ $ENV{LD_LIBRARY_PATH} .= "$sroot/shared/lib";
+ # this is only needed for HP/ux PA-RISC, but it doesn't hurt other platforms
+ if ($ENV{SHLIB_PATH}) {
+ $ENV{SHLIB_PATH} .= ":";
+ }
+ $ENV{SHLIB_PATH} .= "$sroot/shared/lib";
+}
# Migrate a 4.0 directory server to a 5.x directory server
########################################################################################################
Index: template-migrateTo6
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-migrateTo6,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- template-migrateTo6 19 Apr 2005 22:07:00 -0000 1.4
+++ template-migrateTo6 21 Oct 2005 19:21:11 -0000 1.5
@@ -39,6 +39,22 @@
# END COPYRIGHT BLOCK
#
+# enable the use of our bundled perldap with our bundled ldapsdk libraries
+# all of this nonsense can be omitted if the mozldapsdk and perldap are
+# installed in the operating system locations (e.g. /usr/lib /usr/lib/perl5)
+BEGIN {
+ my $sroot = "{{DS-ROOT}}";
+ push @INC, "$sroot/lib/perl/arch", "$sroot/lib/perl";
+ if ($ENV{LD_LIBRARY_PATH}) {
+ $ENV{LD_LIBRARY_PATH} .= ":";
+ }
+ $ENV{LD_LIBRARY_PATH} .= "$sroot/shared/lib";
+ # this is only needed for HP/ux PA-RISC, but it doesn't hurt other platforms
+ if ($ENV{SHLIB_PATH}) {
+ $ENV{SHLIB_PATH} .= ":";
+ }
+ $ENV{SHLIB_PATH} .= "$sroot/shared/lib";
+}
# Migrate a old directory server to a 6.2 directory server
########################################################################################################
Index: template-migrateTo7
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-migrateTo7,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- template-migrateTo7 19 Apr 2005 22:07:00 -0000 1.5
+++ template-migrateTo7 21 Oct 2005 19:21:11 -0000 1.6
@@ -39,6 +39,22 @@
# END COPYRIGHT BLOCK
#
+# enable the use of our bundled perldap with our bundled ldapsdk libraries
+# all of this nonsense can be omitted if the mozldapsdk and perldap are
+# installed in the operating system locations (e.g. /usr/lib /usr/lib/perl5)
+BEGIN {
+ my $sroot = "{{DS-ROOT}}";
+ push @INC, "$sroot/lib/perl/arch", "$sroot/lib/perl";
+ if ($ENV{LD_LIBRARY_PATH}) {
+ $ENV{LD_LIBRARY_PATH} .= ":";
+ }
+ $ENV{LD_LIBRARY_PATH} .= "$sroot/shared/lib";
+ # this is only needed for HP/ux PA-RISC, but it doesn't hurt other platforms
+ if ($ENV{SHLIB_PATH}) {
+ $ENV{SHLIB_PATH} .= ":";
+ }
+ $ENV{SHLIB_PATH} .= "$sroot/shared/lib";
+}
# Migrate a old directory server to a 7.0 directory server
########################################################################################################
Index: template-ns-newpwpolicy.pl
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-ns-newpwpolicy.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- template-ns-newpwpolicy.pl 19 Apr 2005 22:07:00 -0000 1.4
+++ template-ns-newpwpolicy.pl 21 Oct 2005 19:21:11 -0000 1.5
@@ -39,6 +39,22 @@
# END COPYRIGHT BLOCK
#
+# enable the use of our bundled perldap with our bundled ldapsdk libraries
+# all of this nonsense can be omitted if the mozldapsdk and perldap are
+# installed in the operating system locations (e.g. /usr/lib /usr/lib/perl5)
+BEGIN {
+ my $sroot = "{{DS-ROOT}}";
+ push @INC, "$sroot/lib/perl/arch", "$sroot/lib/perl";
+ if ($ENV{LD_LIBRARY_PATH}) {
+ $ENV{LD_LIBRARY_PATH} .= ":";
+ }
+ $ENV{LD_LIBRARY_PATH} .= "$sroot/shared/lib";
+ # this is only needed for HP/ux PA-RISC, but it doesn't hurt other platforms
+ if ($ENV{SHLIB_PATH}) {
+ $ENV{SHLIB_PATH} .= ":";
+ }
+ $ENV{SHLIB_PATH} .= "$sroot/shared/lib";
+}
# Add new password policy specific entries
#############################################################################
Index: template-repl-monitor-cgi.pl
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-repl-monitor-cgi.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- template-repl-monitor-cgi.pl 19 Apr 2005 22:07:00 -0000 1.4
+++ template-repl-monitor-cgi.pl 21 Oct 2005 19:21:11 -0000 1.5
@@ -56,8 +56,8 @@
$params .= " -u \"$admurl\"";
}
$siteroot = $cgiVars{'siteroot'};
-$perl = "$siteroot/bin/slapd/admin/bin/perl";
-$ENV{'LD_LIBRARY_PATH'} = "$siteroot/lib:$siteroot/lib/nsPerl5.005_03/lib";
+$ENV{'LD_LIBRARY_PATH'} = "$siteroot/shared/lib";
+$ENV{'SHLIB_PATH'} = "$siteroot/shared/lib";
# Save user-specified parameters as cookies in monreplication.properties.
# Sync up with the property file so that monreplication2 is interval, and
@@ -65,8 +65,8 @@
$propertyfile = "$siteroot/bin/admin/admin/bin/property/monreplication.properties";
$edit1 = "s#monreplication2=.*#monreplication2=$cgiVars{'refreshinterval'}#;";
$edit2 = "s#^monreplication3=.*#monreplication3=$cgiVars{'configfile'}#;";
-system("$perl -p -i.bak -e \"$edit1\" -e \"$edit2\" $propertyfile");
+system("perl -p -i.bak -e \"$edit1\" -e \"$edit2\" $propertyfile");
# Now the real work
$replmon = "$siteroot/bin/slapd/admin/scripts/template-repl-monitor.pl";
-system("$perl $replmon $params");
+system("perl -I$siteroot/lib/perl/arch -I$siteroot/lib/perl $replmon $params");
Index: template-repl-monitor.pl
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-repl-monitor.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- template-repl-monitor.pl 19 Apr 2005 22:13:37 -0000 1.6
+++ template-repl-monitor.pl 21 Oct 2005 19:21:11 -0000 1.7
@@ -146,16 +146,36 @@
# /bin/slapd/admin/bin/perl repl-monitor.pl
#
# 3. Set environment variable PERL5LIB to your Perl lib dirs where
-# Mozilla::LDAP module can be located.
+# Mozilla::LDAP module can be located. This should be under serverroot/lib/perl
+# e.g. PERL5LIB="serverroot/lib/perl/arch:serverroot/lib/perl"
#
-# 4. Invoke the script as follows if /lib/site contains
-# Mozilla/LDAP:
-# /bin/perl -I /lib/site repl-monitor.pl
+# 4. Set LD_LIBRARY_PATH (or SHLIB_PATH) to point to the location of our
+# bundled shared libraries e.g. LD_LIBRARY_PATH="serverroot/shared/lib"
#
-# If you get error "Can't load ...", try to set environment variable
-# for library path to /lib:/lib/nsPerl5.005_03/lib
+# 5. Invoke the script as follows if (serverroot/lib/perl) contains
+# Mozilla/LDAP:
+# /bin/perl -I /arch -I repl-monitor.pl
#
#############################################################################
+# enable the use of our bundled perldap with our bundled ldapsdk libraries
+# all of this nonsense can be omitted if the mozldapsdk and perldap are
+# installed in the operating system locations (e.g. /usr/lib /usr/lib/perl5)
+# this script is always invoked by repl-monitor-cgi.pl, which sets all of these
+# If using this script standalone, be sure to set the shared lib path and
+# the path to the perldap modules.
+# BEGIN {
+# my $sroot = "{{DS-ROOT}}";
+# push @INC, "$sroot/lib/perl/arch", "$sroot/lib/perl";
+# if ($ENV{LD_LIBRARY_PATH}) {
+# $ENV{LD_LIBRARY_PATH} .= ":";
+# }
+# $ENV{LD_LIBRARY_PATH} .= "$sroot/shared/lib";
+# # this is only needed for HP/ux PA-RISC, but it doesn't hurt other platforms
+# if ($ENV{SHLIB_PATH}) {
+# $ENV{SHLIB_PATH} .= ":";
+# }
+# $ENV{SHLIB_PATH} .= "$sroot/shared/lib";
+# }
$usage = "\nusage: $0 -f configuration-file [-h host] [-p port] [-r] [-u refresh-url] [-t refresh-interval]\n\nor : $0 -v\n";
use Getopt::Std; # parse command line arguments
Index: template-verify-db.pl
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-verify-db.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- template-verify-db.pl 19 Apr 2005 22:07:00 -0000 1.4
+++ template-verify-db.pl 21 Oct 2005 19:21:11 -0000 1.5
@@ -95,6 +95,13 @@
return \$logfile;
}
+$isWin = -d '\\';
+if ($isWin) {
+ $NULL = "nul";
+} else {
+ $NULL = "/dev/null";
+}
+
print("*****************************************************************\n");
print("verify-db: This tool should only be run if recovery start fails\n" .
"and the server is down. If you run this tool while the server is\n" .
@@ -109,7 +116,7 @@
{
# run ../bin/slapd/server/db_printlog -h for each
print "Verify log files in $$dbdirs[$i] ... ";
- open(PRINTLOG, "..{{SEP}}bin{{SEP}}slapd{{SEP}}server{{SEP}}db_printlog -h $$dbdirs[$i] 2>&1 1> nul |");
+ open(PRINTLOG, "..{{SEP}}bin{{SEP}}slapd{{SEP}}server{{SEP}}db_printlog -h $$dbdirs[$i] 2>&1 1> $NULL |");
sleep 1;
my $haserr = 0;
while ($l = )
@@ -147,7 +154,7 @@
{
my $thisdb = $$dbdirs[$i] . "{{SEP}}" . $db;
print "Verify $thisdb ... ";
- open(DBVERIFY, "..{{SEP}}bin{{SEP}}slapd{{SEP}}server{{SEP}}db_verify $thisdb 2>&1 1> nul |");
+ open(DBVERIFY, "..{{SEP}}bin{{SEP}}slapd{{SEP}}server{{SEP}}db_verify $thisdb 2>&1 1> $NULL |");
sleep 1;
my $haserr = 0;
while ($l = )
@@ -188,7 +195,7 @@
{
my $thisdb = $$instdirs[$j] . "{{SEP}}" . $db;
print "Verify $thisdb ... ";
- open(DBVERIFY, "..{{SEP}}bin{{SEP}}slapd{{SEP}}server{{SEP}}db_verify $thisdb 2>&1 1> null |");
+ open(DBVERIFY, "..{{SEP}}bin{{SEP}}slapd{{SEP}}server{{SEP}}db_verify $thisdb 2>&1 1> $NULL |");
sleep 1;
my $haserr = 0;
while ($l = )
From fedora-directory-commits at redhat.com Fri Oct 21 19:21:14 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Fri, 21 Oct 2005 15:21:14 -0400
Subject: [Fedora-directory-commits] ldapserver/ldap/clients/orgchart
myorg.pl, 1.6, 1.7 org.pl, 1.6, 1.7
Message-ID: <200510211921.j9LJLiU5027461@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/clients/orgchart
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27230/ldapserver/ldap/clients/orgchart
Modified Files:
myorg.pl org.pl
Log Message:
Bug(s) fixed: 171066
Bug Description: Get rid of nsperl; use perldap with system perl
Reviewed by: Noriko, Rob, Nathan (Thanks!)
Branch: HEAD
Fix Description: All perl scripts are made executable by using the
#!/usr/bin/env perl *nix trick. This means that the correct version of
perl must be in the user's PATH e.g. 5.6.1 or later. This version is
either shipped with the OS or available on all platforms. On HP/ux, it
is available as a depot which is installed in /opt/perl. For CGI perl
scripts, the PATH can be set in the admserv.conf, so we may have to do
that for HP/ux. To make perldap work, some ugly hacks are involved.
Each perl script that uses perldap has a BEGIN section that figures out
where it is in the server root, sets a server root variable, and sets
LD_LIBRARY_PATH and SHLIB_PATH to point to serverroot/shared/lib.
Perldap will be installed under serverroot/lib/perl. This directory
will have 3 subdirectories: arch - containing the binary files; auto -
containing autoloaded perl modules; and Mozilla - containing the base
perldap .pm files. The BEGIN section also sets the perl INC path to
find those modules. The directory gets rid of nsperl plus a lot of old
crufty perl building code that we do not use anymore. Those are the
removed files. The admin server code also gets rid of the perl.c wrapper.
Noriko pointed out that this does not take care of upgrade install, so I
added several more files and diffs to take care of that case.
Basically, go through the tasks in o=netscaperoot and replace
perl?scriptname with just scriptname. Also, go through all of the
template generated scripts and replace the shebang line with
#!/usr/bin/env perl, and make sure they are chmod +x. I also found a
few more places that referenced nsperl and removed them.
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: myorg.pl
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/clients/orgchart/myorg.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- myorg.pl 19 Apr 2005 22:07:20 -0000 1.6
+++ myorg.pl 21 Oct 2005 19:21:12 -0000 1.7
@@ -1,4 +1,4 @@
-#!../../../bin/slapd/admin/bin/perl
+#!/usr/bin/env perl
#
# BEGIN COPYRIGHT BLOCK
# This Program is free software; you can redistribute it and/or modify it under
Index: org.pl
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/clients/orgchart/org.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- org.pl 19 Apr 2005 22:07:20 -0000 1.6
+++ org.pl 21 Oct 2005 19:21:12 -0000 1.7
@@ -1,4 +1,4 @@
-#!../../../bin/slapd/admin/bin/perl
+#!/usr/bin/env perl
#
# BEGIN COPYRIGHT BLOCK
# This Program is free software; you can redistribute it and/or modify it under
@@ -41,6 +41,29 @@
#
#set ts=4
+# enable the use of our bundled perldap with our bundled ldapsdk libraries
+# all of this nonsense can be omitted if the mozldapsdk and perldap are
+# installed in the operating system locations (e.g. /usr/lib /usr/lib/perl5)
+BEGIN {
+ my $savedir = `pwd`;
+ my $dirname = `dirname $0`;
+ chdir $dirname;
+ my $sroot = `pwd`;
+ $sroot =~ s@/clients/orgchart/bin*@@;
+ chomp($sroot);
+ chdir $savedir;
+ push @INC, "$sroot/lib/perl/arch", "$sroot/lib/perl";
+ if ($ENV{LD_LIBRARY_PATH}) {
+ $ENV{LD_LIBRARY_PATH} .= ":";
+ }
+ $ENV{LD_LIBRARY_PATH} .= "$sroot/shared/lib";
+ # this is only needed for HP/ux PA-RISC, but it doesn't hurt other platforms
+ if ($ENV{SHLIB_PATH}) {
+ $ENV{SHLIB_PATH} .= ":";
+ }
+ $ENV{SHLIB_PATH} .= "$sroot/shared/lib";
+}
+
# ------------
#
# Notes for anybody reading the code below:
From fedora-directory-commits at redhat.com Fri Oct 21 19:21:20 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Fri, 21 Oct 2005 15:21:20 -0400
Subject: [Fedora-directory-commits] ldapserver/ldap/cm Makefile, 1.35,
1.36 fixSetupInf.pl, 1.6, 1.7
Message-ID: <200510211921.j9LJLowF027472@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/cm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27230/ldapserver/ldap/cm
Modified Files:
Makefile fixSetupInf.pl
Log Message:
Bug(s) fixed: 171066
Bug Description: Get rid of nsperl; use perldap with system perl
Reviewed by: Noriko, Rob, Nathan (Thanks!)
Branch: HEAD
Fix Description: All perl scripts are made executable by using the
#!/usr/bin/env perl *nix trick. This means that the correct version of
perl must be in the user's PATH e.g. 5.6.1 or later. This version is
either shipped with the OS or available on all platforms. On HP/ux, it
is available as a depot which is installed in /opt/perl. For CGI perl
scripts, the PATH can be set in the admserv.conf, so we may have to do
that for HP/ux. To make perldap work, some ugly hacks are involved.
Each perl script that uses perldap has a BEGIN section that figures out
where it is in the server root, sets a server root variable, and sets
LD_LIBRARY_PATH and SHLIB_PATH to point to serverroot/shared/lib.
Perldap will be installed under serverroot/lib/perl. This directory
will have 3 subdirectories: arch - containing the binary files; auto -
containing autoloaded perl modules; and Mozilla - containing the base
perldap .pm files. The BEGIN section also sets the perl INC path to
find those modules. The directory gets rid of nsperl plus a lot of old
crufty perl building code that we do not use anymore. Those are the
removed files. The admin server code also gets rid of the perl.c wrapper.
Noriko pointed out that this does not take care of upgrade install, so I
added several more files and diffs to take care of that case.
Basically, go through the tasks in o=netscaperoot and replace
perl?scriptname with just scriptname. Also, go through all of the
template generated scripts and replace the shebang line with
#!/usr/bin/env perl, and make sure they are chmod +x. I also found a
few more places that referenced nsperl and removed them.
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/cm/Makefile,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- Makefile 4 Oct 2005 17:03:43 -0000 1.35
+++ Makefile 21 Oct 2005 19:21:12 -0000 1.36
@@ -185,6 +185,10 @@
PACKAGE_STAGE_DIR=$(OBJDIR)/package
endif
+ifdef INTERNAL_BUILD
+ PERLDAP := perldap
+endif
+
# 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
# symlink to
@@ -565,29 +569,6 @@
$(PERL) -w fixPerlDAPInf.pl $(dir $@)/perldap.inf
endif
-# this is the rule to pull nsPerl
-ifndef NSPERL_PULL_METHOD
-NSPERL_PULL_METHOD = FTP
-endif
-
-$(INSTDIR)/nsperl/$(NSPERL_ZIP_FILE):
-ifdef INTERNAL_BUILD
- $(RM) $@
- $(FTP_PULL) -method $(NSPERL_PULL_METHOD) \
- -objdir $(dir $@) \
- -componentdir $(NSPERL_COMPONENT_DIR) \
- -files $(notdir $@),nsperl.inf
- @if [ ! -f $@ ] ; \
- then echo "Error: could not get component NSPERL file $@" ; \
- exit 1 ; \
- fi
- $(PERL) -w fixNSPerlInf.pl $(dir $@)/nsperl.inf nsperl561
-# one more hack to nsperl - we must remove LDIF.pm because it
-# conflicts with the one in perldap - bug 600138
-# SITEHACK is defined in nsperl.mk
-# $(ZIP) -d $(dir $@)/$(NSPERL_ZIP_FILE) lib/nsPerl5.6.1/$(SITEHACK)/Mozilla/LDAP/LDIF.pm
-endif
-
$(INSTDIR)/slapd:
$(MKDIR) -p $@
@@ -597,7 +578,6 @@
# ---THE UNIX PACKAGE---
packageDirectory: $(INSTDIR)/slapd \
- $(INSTDIR)/nsperl/$(NSPERL_ZIP_FILE) \
$(INSTDIR)/perldap/$(PERLDAP_ZIP_FILE) \
$(ADMSERV_DEP)
@@ -712,15 +692,15 @@
# build the combined packages tar file; use h flag to follow symlinks
ifdef BUILD_SHIP
ifndef BUILD_PATCH
- cd $(INSTDIR); $(TAR) cvfh - setup.inf setup slapd nsperl \
- perldap dsktune $(ADMIN_IMPORTS) | gzip -f > $(BUILD_SHIP)/$(FTPNAMEGZ)
+ cd $(INSTDIR); $(TAR) cvfh - setup.inf setup slapd \
+ $(PERLDAP) dsktune $(ADMIN_IMPORTS) | gzip -f > $(BUILD_SHIP)/$(FTPNAMEGZ)
endif
ifeq ($(DEBUG), optimize)
# $(REMSH) "/u/svbld/bin/preRtm $(BUILD_SHIP) $(FTPNAMEGZ) svbld"
endif
else
- cd $(INSTDIR); $(TAR) cvfh - setup.inf setup slapd nsperl \
- perldap dsktune $(ADMIN_IMPORTS) | gzip -f > ../all$(NS_BUILD_FLAVOR).tar.gz
+ cd $(INSTDIR); $(TAR) cvfh - setup.inf setup slapd \
+ $(PERLDAP) dsktune $(ADMIN_IMPORTS) | gzip -f > ../all$(NS_BUILD_FLAVOR).tar.gz
endif # BUILD_SHIP
#cp $(INSTDIR).tar.gz $(BUILD_SHIP)
#cp $(INSTDIR)/all$(NS_BUILD_FLAVOR).tar.gz $(BUILD_SHIP)
@@ -891,8 +871,7 @@
SLAPD_DIR=slapd
-_perl: $(INSTDIR)/nsperl/$(NSPERL_ZIP_FILE) \
- $(INSTDIR)/perldap/$(PERLDAP_ZIP_FILE)
+_perl: $(INSTDIR)/perldap/$(PERLDAP_ZIP_FILE)
# ------------------------- all below this line is packageDirectory --------------------------
Index: fixSetupInf.pl
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/fixSetupInf.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- fixSetupInf.pl 19 Apr 2005 22:07:20 -0000 1.6
+++ fixSetupInf.pl 21 Oct 2005 19:21:12 -0000 1.7
@@ -65,10 +65,6 @@
$_ .= ", slapd";
$addedSlapd = 1;
}
- if (! /nsperl/) {
- $_ .= ", nsperl";
- $addedNSperl = 1;
- }
if (! /perldap/) {
$_ .= ", perldap";
$addedPerLDAP = 1;
@@ -99,11 +95,6 @@
print OUT "ComponentInfoFile = slapd/slapd.inf\n";
}
-if ($addedNSperl) {
- print OUT "\n[nsperl]\n";
- print OUT "ComponentInfoFile = nsperl/nsperl.inf\n";
-}
-
if ($addedPerLDAP) {
print OUT "\n[perldap]\n";
print OUT "ComponentInfoFile = perldap/perldap.inf\n";
From fedora-directory-commits at redhat.com Fri Oct 21 19:21:20 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Fri, 21 Oct 2005 15:21:20 -0400
Subject: [Fedora-directory-commits]
ldapserver/ldap/cm/newinst ns-update, 1.7,
1.8 setup.sh, 1.5, 1.6 slapd.inf, 1.6, 1.7
Message-ID: <200510211921.j9LJLocq027477@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/cm/newinst
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27230/ldapserver/ldap/cm/newinst
Modified Files:
ns-update setup.sh slapd.inf
Log Message:
Bug(s) fixed: 171066
Bug Description: Get rid of nsperl; use perldap with system perl
Reviewed by: Noriko, Rob, Nathan (Thanks!)
Branch: HEAD
Fix Description: All perl scripts are made executable by using the
#!/usr/bin/env perl *nix trick. This means that the correct version of
perl must be in the user's PATH e.g. 5.6.1 or later. This version is
either shipped with the OS or available on all platforms. On HP/ux, it
is available as a depot which is installed in /opt/perl. For CGI perl
scripts, the PATH can be set in the admserv.conf, so we may have to do
that for HP/ux. To make perldap work, some ugly hacks are involved.
Each perl script that uses perldap has a BEGIN section that figures out
where it is in the server root, sets a server root variable, and sets
LD_LIBRARY_PATH and SHLIB_PATH to point to serverroot/shared/lib.
Perldap will be installed under serverroot/lib/perl. This directory
will have 3 subdirectories: arch - containing the binary files; auto -
containing autoloaded perl modules; and Mozilla - containing the base
perldap .pm files. The BEGIN section also sets the perl INC path to
find those modules. The directory gets rid of nsperl plus a lot of old
crufty perl building code that we do not use anymore. Those are the
removed files. The admin server code also gets rid of the perl.c wrapper.
Noriko pointed out that this does not take care of upgrade install, so I
added several more files and diffs to take care of that case.
Basically, go through the tasks in o=netscaperoot and replace
perl?scriptname with just scriptname. Also, go through all of the
template generated scripts and replace the shebang line with
#!/usr/bin/env perl, and make sure they are chmod +x. I also found a
few more places that referenced nsperl and removed them.
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: ns-update
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinst/ns-update,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ns-update 3 Oct 2005 19:53:54 -0000 1.7
+++ ns-update 21 Oct 2005 19:21:18 -0000 1.8
@@ -44,7 +44,7 @@
# dependencies
sroot=`echo $0 | sed s#/bin/slapd/admin/bin/.\*##g`
-PERL=$sroot/bin/slapd/admin/bin/perl
+PERL=perl # just use perl from PATH
start_server()
{
@@ -60,18 +60,6 @@
cd $cwd
}
-install_nsperl()
-{
- # the current version of nsPerl to use is defined in the slapd.inf
- nsperlinst=`grep '^NSPerlPostInstall' setup/slapd/slapd.inf | cut -f2 -d= 2> /dev/null`
- if [ "$nsperlinst" ]; then
- # run the nsperl installer
- $nsperlinst > setup/nsperl/install.log
- # use nsperl as our local copy of perl
- cp `dirname $nsperlinst`/nsperl $PERL
- fi
-}
-
wrap_security_tools()
{
cwd=`pwd`
@@ -148,8 +136,6 @@
fi
done
fi
-
- install_nsperl
fi
if [ $reconfig ] ; then
@@ -171,6 +157,8 @@
start_server $sroot $dir
echo ""
done
+ # fix any non-instance specific files - omit server instance argument
+ $PERL $sroot/bin/slapd/admin/bin/upgradeServer $sroot
fi
wrap_security_tools $sroot
Index: setup.sh
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinst/setup.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- setup.sh 3 May 2005 01:19:22 -0000 1.5
+++ setup.sh 21 Oct 2005 19:21:18 -0000 1.6
@@ -39,11 +39,5 @@
setupdir=`dirname $0`
cd ${setupdir}
-# Configure nsPerl
-if [ ! -f "./tools/perl" ]; then
- ./tools/nsPerl5.6.1/install > /dev/null
- ln -s ./nsPerl5.6.1/nsperl ./tools/perl
-fi
-
# Kick off setup script
./setup.pl $*
Index: slapd.inf
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinst/slapd.inf,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- slapd.inf 19 Apr 2005 22:07:20 -0000 1.6
+++ slapd.inf 21 Oct 2005 19:21:18 -0000 1.7
@@ -52,7 +52,7 @@
Security= %%%SECURITY%%%
Vendor= Fedora Project
Description= %%%SERVER_NAME%%%
-Dependencies= base/4.5, svrcore/4.5, nsperl561/1.13, perldap14/1.01
+Dependencies= base/4.5, svrcore/4.5
ProductName=Directory Server
IsDirLite=%%%IS_DIR_LITE%%%
SourcePath=slapd
@@ -65,7 +65,6 @@
Checked=True
Mandatory=False
IsLdap=True
-NSPerlPostInstall=lib/nsPerl5.6.1/install
[slapd-client]
Name= Fedora Directory Server Console
From fedora-directory-commits at redhat.com Fri Oct 21 19:21:21 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Fri, 21 Oct 2005 15:21:21 -0400
Subject: [Fedora-directory-commits] ldapserver/ldap/cm/newinstnt slapd.inf,
1.6, 1.7
Message-ID: <200510211921.j9LJLpAi027480@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/cm/newinstnt
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27230/ldapserver/ldap/cm/newinstnt
Modified Files:
slapd.inf
Log Message:
Bug(s) fixed: 171066
Bug Description: Get rid of nsperl; use perldap with system perl
Reviewed by: Noriko, Rob, Nathan (Thanks!)
Branch: HEAD
Fix Description: All perl scripts are made executable by using the
#!/usr/bin/env perl *nix trick. This means that the correct version of
perl must be in the user's PATH e.g. 5.6.1 or later. This version is
either shipped with the OS or available on all platforms. On HP/ux, it
is available as a depot which is installed in /opt/perl. For CGI perl
scripts, the PATH can be set in the admserv.conf, so we may have to do
that for HP/ux. To make perldap work, some ugly hacks are involved.
Each perl script that uses perldap has a BEGIN section that figures out
where it is in the server root, sets a server root variable, and sets
LD_LIBRARY_PATH and SHLIB_PATH to point to serverroot/shared/lib.
Perldap will be installed under serverroot/lib/perl. This directory
will have 3 subdirectories: arch - containing the binary files; auto -
containing autoloaded perl modules; and Mozilla - containing the base
perldap .pm files. The BEGIN section also sets the perl INC path to
find those modules. The directory gets rid of nsperl plus a lot of old
crufty perl building code that we do not use anymore. Those are the
removed files. The admin server code also gets rid of the perl.c wrapper.
Noriko pointed out that this does not take care of upgrade install, so I
added several more files and diffs to take care of that case.
Basically, go through the tasks in o=netscaperoot and replace
perl?scriptname with just scriptname. Also, go through all of the
template generated scripts and replace the shebang line with
#!/usr/bin/env perl, and make sure they are chmod +x. I also found a
few more places that referenced nsperl and removed them.
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: slapd.inf
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinstnt/slapd.inf,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- slapd.inf 19 Apr 2005 22:07:21 -0000 1.6
+++ slapd.inf 21 Oct 2005 19:21:18 -0000 1.7
@@ -55,7 +55,7 @@
Vendor=Fedora Project
Description=Fedora Directory Server
DefaultAcceptLanguage=en
-Dependencies=admin/4.5,nsperl561/1.10,perldap14/1.01
+Dependencies=admin/4.5
Revision=
Checked=TRUE
IsLdap=TRUE
@@ -75,7 +75,6 @@
PostInstall=DSINST_PostInstall
PreUninstall=DSINST_PreUnInstall
PostUninstall=DSINST_PostUnInstall
-NSPerlPostInstall=lib\nsPerl5.6.1\install.bat
[slapd-client]
NickName=slapd-client
From fedora-directory-commits at redhat.com Sat Oct 22 00:07:47 2005
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Fri, 21 Oct 2005 20:07:47 -0400
Subject: [Fedora-directory-commits] ldapserver/ldap/cm Makefile, 1.30.2.10,
1.30.2.11 fedora-patch.inf, 1.1.2.5, 1.1.2.6 redhat-patch.inf,
1.1.2.5, 1.1.2.6 genRpmPatch.pl, 1.1.2.2, 1.1.2.3
Message-ID: <200510220007.j9M07lKE003728@cvs-int.fedora.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/cm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3692/ldap/cm
Modified Files:
Tag: Directory71RtmBranch
Makefile fedora-patch.inf redhat-patch.inf genRpmPatch.pl
Log Message:
[171306] Cleanup of admin server code
(component_versions.mk ldap/cm/Makefile ldap/cm/fedora-patch.inf ldap/cm/redhat-patch.inf ldap/cm/genRpmPatch.pl)
[171349] JRE,JSS files in DS 7.1 SP1 package appear changed due to stripping
(ldap/cm/Makefile)
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/Makefile,v
retrieving revision 1.30.2.10
retrieving revision 1.30.2.11
diff -u -r1.30.2.10 -r1.30.2.11
--- Makefile 14 Oct 2005 16:07:56 -0000 1.30.2.10
+++ Makefile 22 Oct 2005 00:07:42 -0000 1.30.2.11
@@ -230,6 +230,8 @@
endif
endif
ABS_INSTDIR = $(shell cd $(INSTDIR); pwd)
+ABS_DISTDIR = $(ABSBUILD_ROOT)/../dist
+ESCAPED_ABS_DISTDIR = $(shell echo $(ABS_DISTDIR) | sed -e 's/\//\\\//g')
ifdef BUILD_PATCH
PATCHINSTDIR = $(ABS_INSTDIR)-SP
@@ -628,15 +630,6 @@
$(INSTDIR)/tools/infozip.zip \
$(ADMSERV_DEP)
-ifdef BUILD_PATCH
-ifdef BUILD_RPM
-# create a patch
- $(GENRPMPATCH) -i $(RPM_BASE_NAME) -o $(NS_BUILD_FLAVOR) -r $(ABSRELDIR) -e $(SPEXT) -f $(PATCHINF) -v
- mv $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR) $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR).original
- ln -s $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR)$(SPEXT)/opt/$(RPM_BASE_NAME)-ds $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR)
-endif
-endif
-
# copy over the setup sdk stuff
# hack - remove once admin server bundles setupsdk 6.02
# cp -R $(SETUP_SDK_BUILD_DIR)/bin/* $(INSTDIR)
@@ -661,6 +654,22 @@
endif
endif
endif
+
+ifdef BUILD_PATCH
+# take care of files in components (e.g., a file in nsadmin.zip)
+ - at for pair in `grep "^compfile:" $(PATCHINF) | awk '{print $$3}'`; do \
+ zipfile=`echo $$pair | awk -F: '{print $$1}' | sed -e "s/%DISTDIR%/$(ESCAPED_ABS_DISTDIR)\/$(NC_BUILD_FLAVOR)/"` ; \
+ afile=`echo $$pair | awk -F: '{print $$2}'` ; \
+ cd $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR); $(UNZIP) -o $$zipfile $$afile ; \
+ done
+ifdef BUILD_RPM
+# create a patch
+ $(GENRPMPATCH) -i $(RPM_BASE_NAME) -o $(NS_BUILD_FLAVOR) -r $(ABSRELDIR) -e $(SPEXT) -f $(PATCHINF) -v
+ mv $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR) $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR).original
+ ln -s $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR)$(SPEXT)/opt/$(RPM_BASE_NAME)-ds $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR)
+endif
+endif
+
# create the slapd-client.zip file, which only has the ds jar file for the console and
# the ldap client utility programs
rm -f $(INSTDIR)/slapd/slapd-client.zip
@@ -821,6 +830,7 @@
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 `grep "^file:" $(PATCHINF) | awk -F: '{print $$3}'`
+ cd $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR); zip -r $(PATCHINSTDIR)/$(SLAPDSP)/ns$(SLAPDSP).zip -u `grep "^compfile:" $(PATCHINF) | awk -F: '{print $$4}'`
# put ns-config and needed libs in the $(PATCHINSTDIR)/$(SLAPDSP) directory
$(INSTALL) -m 755 $(RELDIR_32)/bin/slapd/admin/bin/ns-config $(PATCHINSTDIR)/$(SLAPDSP)
- at for file in $(PACKAGE_SETUP_LIBS_32) ; \
@@ -831,6 +841,7 @@
# create patch inf file: $(SLAPD).inf
cp $(OBJDIR)/slapd-patch.inf $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf
cd $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR); ls `grep "^file:" $(PATCHINF) | egrep -v "setup/setup" | awk -F: '{print $$3}'` > $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf.tmp
+ cd $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR); ls `grep "^compfile:" $(PATCHINF) | awk -F: '{print $$4}'` >> $(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.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- fedora-patch.inf 20 Oct 2005 18:11:23 -0000 1.1.2.5
+++ fedora-patch.inf 22 Oct 2005 00:07:42 -0000 1.1.2.6
@@ -39,6 +39,8 @@
# Info file to generate DS7.1 SP1 patch
# base: containing the base package -- DS7.1
# file: bug#:
+# compfile: bug#: :
+# %DISTDIR% points /dist/
#
base: /share/dev4/fedora-ds/fds71/ships/20050526.1
@@ -53,9 +55,10 @@
file: 164836,165600: lib/attr-unique-plugin.*
file: 165640: lib/views-plugin.*
file: 167478,160589: setup/setup
-file: 156120,159037: winsync/PassSync.msi
+file: 156120,159037,170321,170328,170556,170558,170816: winsync/PassSync.msi
file: 167761: java/jars/ds71.jar
-file: 169388: lib/replication-plugin.*
+file: 169388,169954,170071,170350: lib/replication-plugin.*
file: xxxxxx: bin/slapd/README.txt
file: xxxxxx: README.txt
+compfile: 171306: %DISTDIR%/admserv/admin/nsadmin.zip:manual/help/help
Index: redhat-patch.inf
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/redhat-patch.inf,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- redhat-patch.inf 20 Oct 2005 18:11:23 -0000 1.1.2.5
+++ redhat-patch.inf 22 Oct 2005 00:07:42 -0000 1.1.2.6
@@ -39,6 +39,8 @@
# Info file to generate DS7.1 SP1 patch
# base: containing the base package -- DS7.1
# file: bug#:
+# compfile: bug#: :
+# %DISTDIR% points /dist/
#
base: /share/dev4/ds/ds71/ships/20050524.1
@@ -53,8 +55,10 @@
file: 164836,165600: lib/attr-unique-plugin.*
file: 165640: lib/views-plugin.*
file: 167478,160589: setup/setup
-file: 156120,159037: winsync/PassSync.msi
+file: 156120,159037,170321,170328,170556,170558,170816: winsync/PassSync.msi
file: 167761: java/jars/ds71.jar
-file: 169388: lib/replication-plugin.*
+file: 169388,169954,170071,170350: lib/replication-plugin.*
file: xxxxxx: bin/slapd/README.txt
file: xxxxxx: README.txt
+
+compfile: 171306: %DISTDIR%/admserv/admin/nsadmin.zip:manual/help/help
Index: genRpmPatch.pl
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/genRpmPatch.pl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- genRpmPatch.pl 14 Sep 2005 16:16:38 -0000 1.1.2.2
+++ genRpmPatch.pl 22 Oct 2005 00:07:42 -0000 1.1.2.3
@@ -129,7 +129,13 @@
$pos = rindex($l, ":", $pos);
$pos++;
$file = substr($l, $pos);
- $file =~ s/[ ]//g;
+ $file =~ s/[ ]//g;
+ push(@newfiles, ($file));
+ } elsif ($l =~ /^compfile: /) {
+ $pos = rindex($l, ":", $pos);
+ $pos++;
+ $file = substr($l, $pos);
+ $file =~ s/[ ]//g;
push(@newfiles, ($file));
}
}
From fedora-directory-commits at redhat.com Sat Oct 22 00:07:44 2005
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Fri, 21 Oct 2005 20:07:44 -0400
Subject: [Fedora-directory-commits] ldapserver component_versions.mk,
1.35.2.1, 1.35.2.2
Message-ID: <200510220008.j9M08LEb003736@cvs-int.fedora.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3692
Modified Files:
Tag: Directory71RtmBranch
component_versions.mk
Log Message:
[171306] Cleanup of admin server code
(component_versions.mk ldap/cm/Makefile ldap/cm/fedora-patch.inf ldap/cm/redhat-patch.inf ldap/cm/genRpmPatch.pl)
[171349] JRE,JSS files in DS 7.1 SP1 package appear changed due to stripping
(ldap/cm/Makefile)
Index: component_versions.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/component_versions.mk,v
retrieving revision 1.35.2.1
retrieving revision 1.35.2.2
diff -u -r1.35.2.1 -r1.35.2.2
--- component_versions.mk 13 Sep 2005 21:25:26 -0000 1.35.2.1
+++ component_versions.mk 22 Oct 2005 00:07:40 -0000 1.35.2.2
@@ -122,7 +122,7 @@
# admin server
ifndef ADM_RELDATE
- ADM_RELDATE = 20050512
+ ADM_RELDATE = 20051017
endif
ifndef ADM_VERSDIR
ADM_VERSDIR = adminserver/70$(BUILD_MODE)
@@ -250,7 +250,7 @@
endif
ifndef ADSYNC_VERSION
- ADSYNC_VERSION=20050912
+ ADSYNC_VERSION=20051017
endif
ifndef NT4SYNC_VERSION
From fedora-directory-commits at redhat.com Sat Oct 22 07:00:06 2005
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Sat, 22 Oct 2005 03:00:06 -0400
Subject: [Fedora-directory-commits] ldapserver/ldap/cm Makefile, 1.30.2.11,
1.30.2.12
Message-ID: <200510220700.j9M7066S013489@cvs-int.fedora.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/cm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13461
Modified Files:
Tag: Directory71RtmBranch
Makefile
Log Message:
[171306] Cleanup of admin server code
Fixed the broken build (64-bit Solaris and HP-UX).
Macro (NC_BUILD_FLAVOR) does not include '_64' tag.
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/Makefile,v
retrieving revision 1.30.2.11
retrieving revision 1.30.2.12
diff -u -r1.30.2.11 -r1.30.2.12
--- Makefile 22 Oct 2005 00:07:42 -0000 1.30.2.11
+++ Makefile 22 Oct 2005 07:00:03 -0000 1.30.2.12
@@ -658,7 +658,7 @@
ifdef BUILD_PATCH
# take care of files in components (e.g., a file in nsadmin.zip)
- at for pair in `grep "^compfile:" $(PATCHINF) | awk '{print $$3}'`; do \
- zipfile=`echo $$pair | awk -F: '{print $$1}' | sed -e "s/%DISTDIR%/$(ESCAPED_ABS_DISTDIR)\/$(NC_BUILD_FLAVOR)/"` ; \
+ zipfile=`echo $$pair | awk -F: '{print $$1}' | sed -e "s/%DISTDIR%/$(ESCAPED_ABS_DISTDIR)\/$(NSOBJDIR_NAME)/"` ; \
afile=`echo $$pair | awk -F: '{print $$2}'` ; \
cd $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR); $(UNZIP) -o $$zipfile $$afile ; \
done
@@ -931,7 +931,7 @@
cleanDirectory:
cd $(LDAPDIR); $(MAKE) clean
- rm -rf $(BUILD_ROOT)/../dist/$(NC_BUILD_FLAVOR)
+ rm -rf $(BUILD_ROOT)/../dist/$(NSOBJDIR_NAME)
rm -rf $(BUILD_ROOT)/built/$(NS_BUILD_FLAVOR)
From fedora-directory-commits at redhat.com Tue Oct 25 15:29:09 2005
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Tue, 25 Oct 2005 11:29:09 -0400
Subject: [Fedora-directory-commits] adminserver components.mk,1.36,1.37
Message-ID: <200510251529.j9PFT9f6003020@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/adminserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3002
Modified Files:
components.mk
Log Message:
171667 - Pick up new console component and enable fedora component pulling
Index: components.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/components.mk,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- components.mk 6 Oct 2005 03:12:57 -0000 1.36
+++ components.mk 25 Oct 2005 15:29:07 -0000 1.37
@@ -314,17 +314,21 @@
#############################################################
NMCJDK_SUF = 71
-NMCJDK_RELDATE = 20050831
+NMCJDK_RELDATE = 20051024
NMCJDK_COMP = console/7.1
NMCJDK_VERSION = $(NMCJDK_RELDATE)
+ifeq ($(BUILD_MODE), int)
ifeq ($(INT_NMCSDK), 1)
BASE_NMCSDK = $(INT_DIR)/$(NMCJDK_COMP)/$(NMCJDK_VERSION)/$(NSOBJDIR_NAME)
else
BASE_NMCSDK = $(COMPONENTS_DIR)/$(NMCJDK_COMP)/$(NMCJDK_VERSION)/$(NSOBJDIR_NAME)
endif
+else #fedora
+BASE_NMCSDK = $(FED_COMPONENTS_DIR)/$(NMCJDK_COMP)/$(NMCJDK_VERSION)/$(NSOBJDIR_NAME)
+endif
NMCJDK_DIR = $(BASE_NMCSDK)/java
From fedora-directory-commits at redhat.com Tue Oct 25 16:55:51 2005
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Tue, 25 Oct 2005 12:55:51 -0400
Subject: [Fedora-directory-commits] ldapserver/ldap/cm Makefile, 1.36,
1.37 fedora-patch.inf, 1.3, 1.4 genRpmPatch.pl, 1.2,
1.3 redhat-patch.inf, 1.3, 1.4
Message-ID: <200510251655.j9PGtpQr004977@cvs-int.fedora.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/cm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4939
Modified Files:
Makefile fedora-patch.inf genRpmPatch.pl redhat-patch.inf
Log Message:
[167982] Service Pack framework
Reporting the patch generation code to the trunk.
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/Makefile,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- Makefile 21 Oct 2005 19:21:12 -0000 1.36
+++ Makefile 25 Oct 2005 16:55:48 -0000 1.37
@@ -208,8 +208,8 @@
ABSRELDIR = $(ABSBUILD_ROOT)/built/release
GENRPMPATCH = $(ABSBUILD_ROOT)/ldap/cm/genRpmPatch.pl
PATCHINF = $(ABSBUILD_ROOT)/ldap/cm/fedora-patch.inf
-DATETIME = $(shell date +%Y%m%d-%H%M%S)
-SPEXT = .SP.$(DATETIME)
+DATETIME := $(shell date +%Y%m%d-%H%M%S)
+SPEXT := .SP.$(DATETIME)
# This is the directory where we put what we're making: the files which go on the CD.
ifndef INSTDIR
@@ -220,6 +220,8 @@
endif
endif
ABS_INSTDIR = $(shell cd $(INSTDIR); pwd)
+ABS_DISTDIR = $(ABSBUILD_ROOT)/../dist
+ESCAPED_ABS_DISTDIR = $(shell echo $(ABS_DISTDIR) | sed -e 's/\//\\\//g')
ifdef BUILD_PATCH
PATCHINSTDIR = $(ABS_INSTDIR)-SP
@@ -581,15 +583,6 @@
$(INSTDIR)/perldap/$(PERLDAP_ZIP_FILE) \
$(ADMSERV_DEP)
-ifdef BUILD_PATCH
-ifdef BUILD_RPM
-# create a patch
- $(GENRPMPATCH) -i $(RPM_BASE_NAME) -o $(NS_BUILD_FLAVOR) -r $(ABSRELDIR) -e $(SPEXT) -f $(PATCHINF) -v
- mv $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR) $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR).original
- ln -s $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR)$(SPEXT)/opt/$(RPM_BASE_NAME)-ds $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR)
-endif
-endif
-
# this gets setup, setup.inf, silent.inf, the zip wrapper, and svrcore, among others
ifeq ($(USE_SETUPUTIL),1)
cp -R $(SETUPUTIL_BINPATH)/* $(INSTDIR)
@@ -616,6 +609,22 @@
endif
endif
endif
+
+ifdef BUILD_PATCH
+# take care of files in components (e.g., a file in nsadmin.zip)
+ - at for pair in `grep "^compfile:" $(PATCHINF) | awk '{print $$3}'`; do \
+ zipfile=`echo $$pair | awk -F: '{print $$1}' | sed -e "s/%DISTDIR%/$(ESCAPED_ABS_DISTDIR)\/$(NSOBJDIR_NAME)/"` ; \
+ afile=`echo $$pair | awk -F: '{print $$2}'` ; \
+ cd $(ABSRELDIR)/$(NS_BUILD_FLAVOR); $(UNZIP) -o $$zipfile $$afile ; \
+ done
+ifdef BUILD_RPM
+# create a patch
+ $(GENRPMPATCH) -i $(RPM_BASE_NAME) -o $(NS_BUILD_FLAVOR) -r $(ABSRELDIR) -e $(SPEXT) -f $(PATCHINF) -v
+ mv $(ABSRELDIR)/$(NS_BUILD_FLAVOR) $(ABSRELDIR)/$(NS_BUILD_FLAVOR).original
+ ln -s $(ABSRELDIR)/$(NS_BUILD_FLAVOR)$(SPEXT)/opt/$(RPM_BASE_NAME)-ds $(ABSRELDIR)/$(NS_BUILD_FLAVOR)
+endif
+endif
+
ifeq ($(USE_CONSOLE),1)
# create the slapd-client.zip file, which only has the ds jar file for the console and
# the ldap client utility programs
@@ -740,7 +749,8 @@
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)/$(NS_BUILD_FLAVOR); zip -r $(PATCHINSTDIR)/$(SLAPDSP)/ns$(SLAPDSP).zip `grep "^file:" $(PATCHINF) | awk -F: '{print $$3}'`
+ cd $(ABSRELDIR)/$(NS_BUILD_FLAVOR); zip -r $(PATCHINSTDIR)/$(SLAPDSP)/ns$(SLAPDSP).zip -u `grep "^compfile:" $(PATCHINF) | awk -F: '{print $$4}'`
# put ns-config and needed libs in the $(PATCHINSTDIR)/$(SLAPDSP) directory
$(INSTALL) -m 755 $(RELDIR_32)/bin/slapd/admin/bin/ns-config $(PATCHINSTDIR)/$(SLAPDSP)
- at for file in $(PACKAGE_SETUP_LIBS_32) ; \
@@ -750,7 +760,8 @@
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)/$(NS_BUILD_FLAVOR); ls `grep "^file:" $(PATCHINF) | egrep -v "setup/setup" | awk -F: '{print $$3}'` > $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf.tmp
+ cd $(ABSRELDIR)/$(NS_BUILD_FLAVOR); ls `grep "^compfile:" $(PATCHINF) | awk -F: '{print $$4}'` >> $(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
@@ -840,7 +851,7 @@
cleanDirectory:
cd $(LDAPDIR); $(MAKE) clean
- rm -rf $(BUILD_ROOT)/../dist/$(NC_BUILD_FLAVOR)
+ rm -rf $(BUILD_ROOT)/../dist/$(NSOBJDIR_NAME)
rm -rf $(BUILD_ROOT)/built/$(NS_BUILD_FLAVOR)
Index: fedora-patch.inf
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/fedora-patch.inf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fedora-patch.inf 4 Oct 2005 17:03:43 -0000 1.3
+++ fedora-patch.inf 25 Oct 2005 16:55:49 -0000 1.4
@@ -39,9 +39,12 @@
# Sample Info file to generate service pack
# base: containing the base package -- e.g., DS7.1
# file: :
+# compfile: bug#: :
+# %DISTDIR% points /dist/
#
base: /share/dev4/fedora-ds/fds71/ships/20050526.1
file: 000001: README.txt
file: 000002: lib/libback-ldbm.*
+compfile: 000003: %DISTDIR%/adminserver/admin/nsadmin.zip:manual/help/help
Index: genRpmPatch.pl
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/genRpmPatch.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- genRpmPatch.pl 22 Sep 2005 16:48:16 -0000 1.2
+++ genRpmPatch.pl 25 Oct 2005 16:55:49 -0000 1.3
@@ -129,7 +129,13 @@
$pos = rindex($l, ":", $pos);
$pos++;
$file = substr($l, $pos);
- $file =~ s/[ ]//g;
+ $file =~ s/[ ]//g;
+ push(@newfiles, ($file));
+ } elsif ($l =~ /^compfile: /) {
+ $pos = rindex($l, ":", $pos);
+ $pos++;
+ $file = substr($l, $pos);
+ $file =~ s/[ ]//g;
push(@newfiles, ($file));
}
}
@@ -161,9 +167,9 @@
}
$optordbg = "";
-if ($builtdirname =~ /full/) {
+if ($builtdirname =~ /_DBG/) {
$optordbg = "dbg";
-} elsif ($builtdirname =~ /optimize/) {
+} elsif ($builtdirname =~ /_OPT/) {
$optordbg = "opt";
} else {
print(STDERR "ERROR: $builtdirname has no opt/debug info\n");
@@ -205,7 +211,7 @@
}
# Expand the RPM file to the $releasedir
-$workdir = $releasedir . "/slapd/" . $builtdirname . $extension;
+$workdir = $releasedir . "/" . $builtdirname . $extension;
mkdir($workdir, 0700);
chdir($workdir);
if (1 == $verbose) {
@@ -216,7 +222,7 @@
# Copy new files onto the expanded files
foreach $afile (@newfiles) {
- $srcfile = $releasedir . "/slapd/" . $builtdirname . "/" . $afile;
+ $srcfile = $releasedir . "/" . $builtdirname . "/" . $afile;
$destfile = $workdir . "/opt/" . $iddir . "/" . $afile;
$destdir = substr($destfile, 0, rindex($destfile, "/", length($destfile)));
if (!(-d $destdir)) {
Index: redhat-patch.inf
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/redhat-patch.inf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- redhat-patch.inf 4 Oct 2005 17:03:43 -0000 1.3
+++ redhat-patch.inf 25 Oct 2005 16:55:49 -0000 1.4
@@ -39,8 +39,11 @@
# Sample Info file to generate service pack
# base: containing the base package -- e.g., DS7.1
# file: :
+# compfile: bug#: :
+# %DISTDIR% points /dist/
#
base: /share/dev4/fedora-ds/fds71/ships/20050526.1
file: 000001: README.txt
file: 000002: lib/libback-ldbm.*
+compfile: 000003: %DISTDIR%/adminserver/admin/nsadmin.zip:manual/help/help
From fedora-directory-commits at redhat.com Tue Oct 25 16:55:52 2005
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Tue, 25 Oct 2005 12:55:52 -0400
Subject: [Fedora-directory-commits] ldapserver/ldap/cm/newinst setup.patch,
1.1, 1.2 setup, 1.11, 1.12
Message-ID: <200510251655.j9PGtqpp004989@cvs-int.fedora.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/cm/newinst
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4939/newinst
Modified Files:
setup
Added Files:
setup.patch
Log Message:
[167982] Service Pack framework
Reporting the patch generation code to the trunk.
setup.patch:
Index: setup.patch
===================================================================
RCS file: setup.patch
diff -N setup.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ setup.patch 25 Oct 2005 16:55:49 -0000 1.2
@@ -0,0 +1,307 @@
+#!/bin/sh
+#
+# BEGIN COPYRIGHT BLOCK
+# This Program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; version 2 of the License.
+#
+# This Program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
+# Place, Suite 330, Boston, MA 02111-1307 USA.
+#
+# In addition, as a special exception, Red Hat, Inc. gives You the additional
+# right to link the code of this Program with code not covered under the GNU
+# General Public License ("Non-GPL Code") and to distribute linked combinations
+# including the two, subject to the limitations in this paragraph. Non-GPL Code
+# permitted under this exception must only link to the code of this Program
+# through those well defined interfaces identified in the file named EXCEPTION
+# found in the source code files (the "Approved Interfaces"). The files of
+# Non-GPL Code may instantiate templates or use macros or inline functions from
+# the Approved Interfaces without causing the resulting work to be covered by
+# the GNU General Public License. Only Red Hat, Inc. may make changes or
+# additions to the list of Approved Interfaces. You must obey the GNU General
+# Public License in all respects for all of the Program code and other code used
+# in conjunction with the Program except the Non-GPL Code covered by this
+# exception. If you modify this file, you may extend this exception to your
+# version of the file, but you are not obligated to do so. If you do not wish to
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
+#
+#
+# Copyright (C) 2005 Red Hat, Inc.
+# All rights reserved.
+# END COPYRIGHT BLOCK
+#
+
+#
+# This script is a wrapper for dssetup used for inplace upgrade / patch
+# installation.
+#
+clear
+
+echo " Fedora Project"
+echo " Fedora Server Products Installation/Uninstallation"
+echo "-------------------------------------------------------------------------------"
+echo ""
+echo ""
+echo "BY INSTALLING THIS SOFTWARE YOU ARE CONSENTING TO BE BOUND BY"
+echo "AND ARE BECOMING A PARTY TO THE AGREEMENT FOUND IN THE"
+echo "LICENSE.TXT FILE. IF YOU DO NOT AGREE TO ALL OF THE TERMS"
+echo "OF THIS AGREEMENT, PLEASE DO NOT INSTALL OR USE THIS SOFTWARE."
+echo ""
+printf "Do you agree to the license terms? [No]: "
+read ans
+
+if [ "$ans" != "Y" -a "$ans" != "YES" -a "$ans" != "Yes" -a "$ans" != "y" -a "$ans" != "yes" ]; then
+ exit 1;
+fi
+
+clear
+
+echo " Fedora Project"
+echo " Fedora Server Products Installation/Uninstallation"
+echo "-------------------------------------------------------------------------------"
+echo ""
+echo ""
+echo "This program will extract the patch files and install them"
+echo "into a directory where the Directory Server is already installed."
+echo ""
+echo "To accept the default shown in brackets, press the Enter key."
+echo ""
+printf "Install location [/opt/fedora/servers]: "
+read serverroot
+
+if [ ! -d $serverroot ]; then
+ echo ""
+ echo "Directory $serverroot does not exist."
+ exit 1
+fi
+
+if [ ! -f $serverroot/admin-serv/config/adm.conf ]; then
+ echo ""
+ echo "Administration Server's configuration file $serverroot/admin-serv/config/adm.conf does not exist."
+ exit 1
+fi
+
+getValFromAdminConf() {
+ cattr=$1
+ cfile=$2
+ rval=`grep -i $cattr $serverroot/admin-serv/config/$cfile | awk '{print $2}'`
+ echo $rval
+}
+
+dsinst=`getValFromAdminConf "ldapStart:" "adm.conf" | awk -F/ '{print $1}'`
+dsconffile=$serverroot/$dsinst/config/dse.ldif
+if [ ! -f $dsconffile ]; then
+ echo ""
+ echo "Directory Server's configuration file $dsconffile does not exist."
+ exit 1
+fi
+
+clear
+
+isadminsslon=0
+sslparams=""
+
+adminSSLOff() {
+ conffile=$1
+ confparam=$2
+ tmpfile=$3
+ if [ -f $conffile ]; then
+ security=`grep -i "^$confparam" $conffile | awk '{print $1}'`
+ issecure=`grep -i "^$confparam" $conffile | awk '{print $2}'`
+ if [ "$issecure" = "on" -o "$issecure" = "ON" -o "$issecure" = "On" -o "$issecure" = "oN" ]
+ then
+ if [ $isadminsslon -eq 0 ]; then
+ $serverroot/stop-admin
+ isadminsslon=1
+ fi
+ echo $conffile=$security >> $tmpfile
+ cat $conffile | sed -e "s/^\($security\) .*/\1 off/g" > $conffile.0
+ mv $conffile.0 $conffile
+ echo "$conffile: SSL off ..."
+ fi
+ fi
+}
+
+adminXmlSSLOff() {
+ conffile=$1
+ confparam=$2
+ tmpfile=$3
+ if [ -f $conffile ]; then
+ grep -i "\ /dev/null 2>&1
+ rval=$?
+ if [ $rval -eq 0 ]
+ then
+ if [ $isadminsslon -eq 0 ]; then
+ $serverroot/stop-admin
+ isadminsslon=1
+ fi
+ echo $conffile=$confparam >> $tmpfile
+ cat $conffile | sed -e "s/\([Ss][Ee][Cc][Uu][Rr][Ii][Tt][Yy]=\)\"[A-Za-z]*\"/\1\"off\"/g" > $conffile.0
+ mv $conffile.0 $conffile
+ echo "$conffile: SSL off ..."
+ fi
+ sslparams0=`grep -i "<.*SSLPARAMS " $conffile`
+ rval=$?
+ if [ $rval -eq 0 ]
+ then
+ if [ $isadminsslon -eq 0 ]; then
+ $serverroot/stop-admin
+ isadminsslon=1
+ fi
+ sslparams1=`echo $sslparams0 | sed -e 's/\//\\\\\//g'`
+ sslparams=`echo $sslparams1 | sed -e 's/\"/\\\\\"/g'`
+ cat $conffile | sed -e "s/\($sslparams\)/\<\!-- \1 --\>/g" > $conffile.0
+ mv $conffile.0 $conffile
+ echo "$conffile: SSL off ..."
+ fi
+ fi
+}
+
+rm -f dssecure.txt assecure.txt > /dev/null 2>&1
+touch dssecure.txt
+touch assecure.txt
+
+for dir in $serverroot/slapd-* ; do
+ if [ -f $dir/config/dse.ldif ]; then
+ security=`grep -i "^nsslapd-security:" $dir/config/dse.ldif | awk '{print $1}'`
+ issecure=`grep -i "^nsslapd-security:" $dir/config/dse.ldif | awk '{print $2}'`
+ if [ "$issecure" = "on" -o "$issecure" = "ON" -o "$issecure" = "On" -o "$issecure" = "oN" ]
+ then
+ echo $dir >> dssecure.txt
+ $dir/stop-slapd
+ cat $dir/config/dse.ldif | sed -e "s/\($security\) .*/\1 off/g" > $dir/config/dse.ldif.0
+ mv $dir/config/dse.ldif.0 $dir/config/dse.ldif
+ echo "$dir/config/dse.ldif: SSL off ..."
+ $dir/start-slapd
+ fi
+ fi
+done
+
+if [ -d $serverroot/admin-serv/config ]; then
+ adminSSLOff $serverroot/admin-serv/config/adm.conf security: assecure.txt
+ adminSSLOff $serverroot/admin-serv/config/local.conf configuration.nsServerSecurity: assecure.txt
+ adminSSLOff $serverroot/admin-serv/config/magnus.conf Security assecure.txt
+ adminXmlSSLOff $serverroot/admin-serv/config/server.xml security assecure.txt
+
+ if [ $isadminsslon -ne 0 ]; then
+ $serverroot/start-admin
+ fi
+fi
+
+ldaphost=`getValFromAdminConf "ldapHost:" "adm.conf"`
+ldapport=`getValFromAdminConf "ldapPort:" "adm.conf"`
+siepid=`getValFromAdminConf "siepid:" "adm.conf"`
+suitespotuser=`ls -l $dsconffile | awk '{print $3}'`
+suitespotgroup=`ls -l $dsconffile | awk '{print $4}'`
+admindomain=`echo $ldaphost | awk -F. '{if ($5) {print $2 "." $3 "." $4 "." $5} else if ($4) {print $2 "." $3 "." $4} else if ($3) {print $2 "." $3} else if ($2) {print $2} else {print ""}}'`
+if [ "$admindomain" = "" ]; then
+ admindomain=`domainname`
+fi
+
+clear
+
+echo " Fedora Project"
+echo " Directory Installation/Uninstallation"
+echo "-------------------------------------------------------------------------------"
+echo ""
+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=./myinstall.inf
+
+echo "[General]" > $inffile
+echo "FullMachineName= $ldaphost" >> $inffile
+echo "SuiteSpotUserID= $suitespotuser" >> $inffile
+echo "SuitespotGroup= $suitespotgroup" >> $inffile
+echo "ServerRoot= $serverroot" >> $inffile
+echo "ConfigDirectoryLdapURL= ldap://$ldaphost:$ldapport/" >> $inffile
+echo "ConfigDirectoryAdminID= $siepid" >> $inffile
+echo "AdminDomain= $admindomain" >> $inffile
+echo "ConfigDirectoryAdminPwd= $siepasswd" >> $inffile
+echo "Components= slapd-71sp1" >> $inffile
+echo "" >> $inffile
+echo "[slapd-71sp1]" >> $inffile
+echo "Components= slapd-71sp1" >> $inffile
+
+clear
+
+./dssetup -s -f $inffile
+
+adminSSLOn() {
+ conffile=$1
+ confparam=$2
+ if [ -f $conffile ]; then
+ cat $conffile | sed -e "s/^\($confparam\) .*/\1 on/g" > $conffile.0
+ mv $conffile.0 $conffile
+ echo "$conffile $confparam: SSL on ..."
+ fi
+}
+
+adminXmlSSLOn() {
+ conffile=$1
+ if [ -f $conffile ]; then
+ cat $conffile | sed -e "s/\([Ss][Ee][Cc][Uu][Rr][Ii][Tt][Yy]=\)\"[A-Za-z]*\"/\1\"on\"/g" > $conffile.0
+ mv $conffile.0 $conffile
+ fi
+ grep -i "<.*SSLPARAMS " $conffile > /dev/null 2>&1
+ rval=$?
+ if [ $rval -eq 0 ]
+ then
+ cat $conffile | sed -e "s/<\!-- *$sslparams *-->/$sslparams/g" > $conffile.0
+ mv $conffile.0 $conffile
+ fi
+ echo "$conffile: SSL on ..."
+}
+
+for dir in `cat dssecure.txt` ; do
+ clear
+ 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 [ $isadminsslon -ne 0 ]; then
+ $serverroot/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 [ $isadminsslon -ne 0 ]; then
+ echo "Restarting Administration Server: $serverroot/start-admin"
+ $serverroot/start-admin
+fi
+
+rm -f dssecure.txt assecuire.txt
Index: setup
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinst/setup,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- setup 4 Oct 2005 17:03:47 -0000 1.11
+++ setup 25 Oct 2005 16:55:49 -0000 1.12
@@ -195,8 +195,161 @@
askYN "Continue?"
fi
+isadminsslon=0
+sslparams=""
+
+adminSSLOff() {
+ conffile=$1
+ confparam=$2
+ tmpfile=$3
+ if [ -f $conffile ]; then
+ security=`grep -i "^$confparam" $conffile | awk '{print $1}'`
+ issecure=`grep -i "^$confparam" $conffile | awk '{print $2}'`
+ if [ "$issecure" = "on" -o "$issecure" = "ON" -o "$issecure" = "On" -o "$issecure" = "oN" ]
+ then
+ if [ $isadminsslon -eq 0 ]; then
+ $sroot/stop-admin
+ isadminsslon=1
+ fi
+ echo $conffile=$security >> $tmpfile
+ cat $conffile | sed -e "s/^\($security\) .*/\1 off/g" > $conffile.01
+ mv $conffile.01 $conffile
+ echo "$conffile: SSL off ..."
+ fi
+ fi
+}
+
+adminXmlSSLOff() {
+ conffile=$1
+ confparam=$2
+ tmpfile=$3
+ if [ -f $conffile ]; then
+ grep -i "\ /dev/null 2>&1
+ rval=$?
+ if [ $rval -eq 0 ]
+ then
+ if [ $isadminsslon -eq 0 ]; then
+ $sroot/stop-admin
+ isadminsslon=1
+ fi
+ echo $conffile=$confparam >> $tmpfile
+ cat $conffile | sed -e "s/\([Ss][Ee][Cc][Uu][Rr][Ii][Tt][Yy]=\)\"[A-Za-z]*\"/\1\"off\"/g" > $conffile.0
+ mv $conffile.0 $conffile
+ echo "$conffile: SSL off ..."
+ fi
+ sslparams0=`grep -i "<.*SSLPARAMS " $conffile`
+ rval=$?
+ if [ $rval -eq 0 ]
+ then
+ if [ $isadminsslon -eq 0 ]; then
+ $sroot/stop-admin
+ isadminsslon=1
+ fi
+echo adminXmlSSLOff: SSLPARAMS off
+ sslparams1=`echo $sslparams0 | sed -e 's/\//\\\\\//g'`
+ sslparams=`echo $sslparams1 | sed -e 's/\"/\\\\\"/g'`
+ cat $conffile | sed -e "s/\($sslparams\)/\<\!-- \1 --\>/g" > $conffile.1
+ mv $conffile.1 $conffile
+ fi
+ fi
+}
+
+SSLOff() {
+ rm -f dssecure.txt assecure.txt > /dev/null 2>&1
+ touch dssecure.txt
+ touch assecure.txt
+
+ for dir in $sroot/slapd-* ; do
+ if [ -f $dir/config/dse.ldif ]; then
+ security=`grep -i "^nsslapd-security:" $dir/config/dse.ldif | awk '{print $1}'`
+ issecure=`grep -i "^nsslapd-security:" $dir/config/dse.ldif | awk '{print $2}'`
+ if [ "$issecure" = "on" -o "$issecure" = "ON" -o "$issecure" = "On" -o "$issecure" = "oN" ]
+ then
+ echo $dir >> dssecure.txt
+ $dir/stop-slapd
+ cat $dir/config/dse.ldif | sed -e "s/\($security\) .*/\1 off/g" > $dir/config/dse.ldif.0
+ mv $dir/config/dse.ldif.0 $dir/config/dse.ldif
+ echo "$dir/config/dse.ldif: SSL off ..."
+ fi
+ fi
+ done
+ if [ -d $sroot/admin-serv/config ]; then
+ adminSSLOff $sroot/admin-serv/config/adm.conf security: assecure.txt
+ adminSSLOff $sroot/admin-serv/config/local.conf configuration.nsServerSecurity: assecure.txt
+ adminSSLOff $sroot/admin-serv/config/magnus.conf Security assecure.txt
+ adminXmlSSLOff $sroot/admin-serv/config/server.xml security assecure.txt
+
+ if [ $isadminsslon -ne 0 ]; then
+ $sroot/start-admin
+ fi
+ fi
+}
+
+adminSSLOn() {
+ conffile=$1
+ confparam=$2
+ if [ -f $conffile ]; then
+ cat $conffile | sed -e "s/^\($confparam\) .*/\1 on/g" > $conffile.00
+ mv $conffile.00 $conffile
+ echo "$conffile $confparam: SSL on ..."
+ fi
+}
+
+adminXmlSSLOn() {
+ conffile=$1
+ if [ -f $conffile ]; then
+ cat $conffile | sed -e "s/\([Ss][Ee][Cc][Uu][Rr][Ii][Tt][Yy]=\)\"[A-Za-z]*\"/\1\"on\"/g" > $conffile.2
+ mv $conffile.2 $conffile
+ fi
+ grep -i "<.*SSLPARAMS " $conffile > /dev/null 2>&1
+ rval=$?
+ if [ $rval -eq 0 ]
+ then
+ cat $conffile | sed -e "s/<\!-- *$sslparams *-->/$sslparams/g" > $conffile.3
+ mv $conffile.3 $conffile
+ fi
+ echo "$conffile: SSL on ..."
+}
+
+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 [ $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 [ $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
if [ -f $sroot/admin-serv/config/adm.conf ]; then
+ SSLOff
+
dsinst=`getValFromAdminConf "ldapStart:" "adm.conf" | awk -F/ '{print $1}'`
if [ -f $sroot/$dsinst/config/dse.ldif ]; then
# it is an in=place installation
@@ -339,6 +492,8 @@
`pwd`/bin/admin/ns-update $doreconfig $silentarg $myargs -f $inffile | tee -a $logfile || doExit
+SSLOn
+
echo "INFO Finished with setup, logfile is setup/setup.log" | tee -a $logfile
if [ -f setup/setup.log ] ; then
cat $logfile >> setup/setup.log
From fedora-directory-commits at redhat.com Tue Oct 25 17:30:48 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Tue, 25 Oct 2005 13:30:48 -0400
Subject: [Fedora-directory-commits] console build.properties, 1.4,
1.5 build.xml, 1.6, 1.7
Message-ID: <200510251730.j9PHUmoh006673@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/console
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6653
Modified Files:
build.properties build.xml
Log Message:
Bug(s) fixed: 171722
Bug Description: console: build.xml has hardcoded reference to root
directory
Reviewed by: nkinder at redhat.com nhosoi at redhat.com (Thanks!)
Fix Description: Use "." instead of ".." as the console.root. This
allows us to use console.root/buildnum.pl instead of
console.root/console/buildnum.pl. The imports and built dirs are
referenced by console.root/../built e.g. The problem is that when
building from a source tar ball in rpm or gar, it expects the source
directory when unpacked to be the same name as the .tar.gz file e.g.
fedora-console-7.1.1.tar.gz unpacks into fedora-console-7.1.1. If
"/console/" is hard coded, this won't work.
Platforms tested: RHEL4
Flag Day: no
Doc impact: no
Index: build.properties
===================================================================
RCS file: /cvs/dirsec/console/build.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build.properties 15 Sep 2005 22:06:32 -0000 1.4
+++ build.properties 25 Oct 2005 17:30:46 -0000 1.5
@@ -21,7 +21,7 @@
lang=en
-console.root=..
+console.root=.
console.version=71
console.dotversion=7.1
Index: build.xml
===================================================================
RCS file: /cvs/dirsec/console/build.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- build.xml 29 Sep 2005 17:18:23 -0000 1.6
+++ build.xml 25 Oct 2005 17:30:46 -0000 1.7
@@ -24,7 +24,7 @@
-
+
@@ -32,7 +32,7 @@
-
+
@@ -70,12 +70,12 @@
-
+
-
-
+
+
@@ -284,7 +284,7 @@
-
+
From fedora-directory-commits at redhat.com Tue Oct 25 20:37:07 2005
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Tue, 25 Oct 2005 16:37:07 -0400
Subject: [Fedora-directory-commits]
ldapserver/ldap/cm/newinst setup, 1.9.2.4, 1.9.2.5
Message-ID: <200510252037.j9PKb7p2011841@cvs-int.fedora.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/cm/newinst
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11825
Modified Files:
Tag: Directory71RtmBranch
setup
Log Message:
[171656] benign NMC_ messages during SP1 installation
Before running the silent install, setup script starts the server, which is
not necessary.
Index: setup
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinst/setup,v
retrieving revision 1.9.2.4
retrieving revision 1.9.2.5
diff -u -r1.9.2.4 -r1.9.2.5
--- setup 14 Oct 2005 16:08:09 -0000 1.9.2.4
+++ setup 25 Oct 2005 20:37:05 -0000 1.9.2.5
@@ -275,7 +275,6 @@
mv $dir/config/dse.ldif.0 $dir/config/dse.ldif
echo "$dir/config/dse.ldif: SSL off ..."
fi
- $dir/start-slapd
fi
done
if [ -d $sroot/admin-serv/config ]; then
From fedora-directory-commits at redhat.com Tue Oct 25 23:17:12 2005
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Tue, 25 Oct 2005 19:17:12 -0400
Subject: [Fedora-directory-commits] adminserver/mcc Makefile,1.8,1.9
Message-ID: <200510252317.j9PNHCDm017075@cvs-int.fedora.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/adminserver/mcc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17057
Modified Files:
Makefile
Log Message:
[164401] Clean up Admin Server build
We should be using the startconsole script from the console package for all platforms.
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/adminserver/mcc/Makefile,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Makefile 29 Sep 2005 22:12:05 -0000 1.8
+++ Makefile 25 Oct 2005 23:17:09 -0000 1.9
@@ -83,17 +83,6 @@
cd $(MCC_DEST)/dist/$(NSPLATFORM_DIR) ; gzip uxmcc.tar
-ifeq ($(ARCH), SOLARIS)
- cd $(PKGTOP)/base/unzipped/client/; \
- tar cvf ../../../../../$(MCC_DIR)/dist/$(EXTRA_ARCH)/uxmcc.tar java startconsole
- cp -p $(PKGTOP)/base/unzipped/client/startconsole $(PKGTOP)/admin/unzipped/client/startconsole.tmp;
- cp -p $(BUILT_DIR)-admin/install/bin/startmcc $(PKGTOP)/admin/unzipped/client/startconsole;
- cd $(PKGTOP)/admin/unzipped/admin; \
- tar rvf ../../../../../$(MCC_DIR)/dist/$(EXTRA_ARCH)/uxmcc.tar java;
-# $(MV) startconsole.tmp startconsole
- cd $(MCC_DEST)/dist/$(EXTRA_ARCH); compress -f uxmcc.tar
-endif
-
$(PERL) fixPI.pl SETUP_MCC ../include/version.h ../$(BUILD_ARCH)/buildnum.dat $(BUILD_SECURITY) mcc.inf $(MCC_DEST)/mcc.inf
else
From fedora-directory-commits at redhat.com Wed Oct 26 16:31:28 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Wed, 26 Oct 2005 12:31:28 -0400
Subject: [Fedora-directory-commits] adminutil/include version.h,1.1.1.1,1.2
Message-ID: <200510261631.j9QGVSXd014256@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/adminutil/include
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14238/adminutil/include
Modified Files:
version.h
Log Message:
Bug(s) fixed: 171799
Bug Description: Change adminutil version to 1.0
Reviewed by: Noriko (Thanks!)
Fix Description: Your basic standard renumbering.
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: version.h
===================================================================
RCS file: /cvs/dirsec/adminutil/include/version.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- version.h 20 Jul 2005 22:51:31 -0000 1.1.1.1
+++ version.h 26 Oct 2005 16:31:25 -0000 1.2
@@ -34,10 +34,10 @@
#define ADMSDK_FLAGS 0x0L
#endif
-#define ADMSDK_VMAJOR 7
-#define ADMSDK_VMINOR 1
-#define ADMSDK_VERSION "7.1"
-#define ADMSDK_SO_VERSION "71"
+#define ADMSDK_VMAJOR 1
+#define ADMSDK_VMINOR 0
+#define ADMSDK_VERSION "1.0"
+#define ADMSDK_SO_VERSION "10"
#define VI_COMPANYNAME "Fedora Project"
#define VI_COPYRIGHT "Copyright (C) 2005 Red Hat, Inc."
From fedora-directory-commits at redhat.com Wed Oct 26 16:35:31 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Wed, 26 Oct 2005 12:35:31 -0400
Subject: [Fedora-directory-commits]
adminutil nsconfig.mk, 1.2, 1.3 nsdefs.mk,
1.2, 1.3 pkgadminutil.mk, 1.2, 1.3
Message-ID: <200510261635.j9QGZVKc014320@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/adminutil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14296
Modified Files:
nsconfig.mk nsdefs.mk pkgadminutil.mk
Log Message:
Bug(s) fixed: 171799
Bug Description: Change adminutil version to 1.0
Reviewed by: Noriko (Thanks!)
Fix Description: Your basic standard renumbering.
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: nsconfig.mk
===================================================================
RCS file: /cvs/dirsec/adminutil/nsconfig.mk,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nsconfig.mk 21 Jul 2005 21:57:25 -0000 1.2
+++ nsconfig.mk 26 Oct 2005 16:35:28 -0000 1.3
@@ -580,7 +580,7 @@
# ADMINUTIL
########################################
-ADMSDK_SO_VERSION=71
+ADMSDK_SO_VERSION=10
ADMSDKOBJDIR=$(OBJDIR)
ADMSDK_LIBPATH = $(ADMSDKOBJDIR)/lib
ADMSDK_INCLUDE = $(ADMSDKOBJDIR)/include
Index: nsdefs.mk
===================================================================
RCS file: /cvs/dirsec/adminutil/nsdefs.mk,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nsdefs.mk 29 Sep 2005 22:10:09 -0000 1.2
+++ nsdefs.mk 26 Oct 2005 16:35:28 -0000 1.3
@@ -232,9 +232,9 @@
DO_SEARCH=
NODE_FLAG=-DNO_NODELOCK
-MAJOR_VERSION:="7"
-MINOR_VERSION:="1"
-ADMSDK_VERSION:=7.1
+MAJOR_VERSION:="1"
+MINOR_VERSION:="0"
+ADMSDK_VERSION:=1.0
LDAP_NO_LIBLCACHE:=1
DIRVERDIR=$(COMMON_OBJDIR)/include
Index: pkgadminutil.mk
===================================================================
RCS file: /cvs/dirsec/adminutil/pkgadminutil.mk,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pkgadminutil.mk 29 Sep 2005 22:10:09 -0000 1.2
+++ pkgadminutil.mk 26 Oct 2005 16:35:28 -0000 1.3
@@ -51,7 +51,7 @@
# set the values of the macros used by rpmbuild
# name and version of RPM - must correspond to the spec file - these get branded
RPM_BASE_NAME=fedora
-RPM_VERSION=7.1
+RPM_VERSION=1.0
RPM_FILE_BASE=$(RPM_BASE_NAME)-adminutil-devel-$(RPM_VERSION)
RPM_ARCH = $(shell uname -i)
# root dir for RPM built and temp files
From fedora-directory-commits at redhat.com Wed Oct 26 16:38:18 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Wed, 26 Oct 2005 12:38:18 -0400
Subject: [Fedora-directory-commits] setuputil/installer/inf setup.inf,
1.1.1.1, 1.2
Message-ID: <200510261638.j9QGcIZ7014422@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/setuputil/installer/inf
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14326/setuputil/installer/inf
Modified Files:
setup.inf
Log Message:
Bug(s) fixed: 171793
Bug Description: Change setuputil version to 1.0
Reviewed by: Noriko (Thanks!)
Fix Description: Mostly just typical rebranding stuff. I found a couple
of places in installer.cc that were not listed in the branding.dat so I
added them. I also got rid of the webserv version and the enterprise
stuff, which is apparently not used anywhere.
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: setup.inf
===================================================================
RCS file: /cvs/dirsec/setuputil/installer/inf/setup.inf,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- setup.inf 29 Jul 2005 22:16:28 -0000 1.1.1.1
+++ setup.inf 26 Oct 2005 16:38:11 -0000 1.2
@@ -28,7 +28,7 @@
Name = Fedora Server Products
Vendor = Fedora Project
Description = Fedora Server Products Installation
-# Version = 7.1
+# Version = 1.0
Components = svrcore, base, admin, slapd, dssynch, msg, mesg-cntrl, cert, mcc, nda, cal, enterprise, nsperl, perldap
Mode = ALLMODES
ProgramFolder = Fedora Server Products
From fedora-directory-commits at redhat.com Wed Oct 26 16:38:18 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Wed, 26 Oct 2005 12:38:18 -0400
Subject: [Fedora-directory-commits] setuputil/installer/unix installer.cc,
1.1.1.1, 1.2
Message-ID: <200510261638.j9QGcI7a014428@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/setuputil/installer/unix
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14326/setuputil/installer/unix
Modified Files:
installer.cc
Log Message:
Bug(s) fixed: 171793
Bug Description: Change setuputil version to 1.0
Reviewed by: Noriko (Thanks!)
Fix Description: Mostly just typical rebranding stuff. I found a couple
of places in installer.cc that were not listed in the branding.dat so I
added them. I also got rid of the webserv version and the enterprise
stuff, which is apparently not used anywhere.
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: installer.cc
===================================================================
RCS file: /cvs/dirsec/setuputil/installer/unix/installer.cc,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- installer.cc 29 Jul 2005 22:16:31 -0000 1.1.1.1
+++ installer.cc 26 Oct 2005 16:38:16 -0000 1.2
@@ -27,6 +27,20 @@
**
** HISTORY:
** $Log$
+** Revision 1.2 2005/10/26 16:38:16 rmeggins
+** Bug(s) fixed: 171793
+** Bug Description: Change setuputil version to 1.0
+** Reviewed by: Noriko (Thanks!)
+** Fix Description: Mostly just typical rebranding stuff. I found a couple
+** of places in installer.cc that were not listed in the branding.dat so I
+** added them. I also got rid of the webserv version and the enterprise
+** stuff, which is apparently not used anywhere.
+** 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
+**
** Revision 1.1.1.1 2005/07/29 22:16:31 foxworth
** Importing new setup sdk for open source project
**
@@ -634,7 +648,7 @@
}
break;
case 'h':
- printf("%s Setup Program Version 7.1\n", (const char *) getResource(RES_GLOBAL_PRODUCT));
+ printf("%s Setup Program Version 1.0\n", (const char *) getResource(RES_GLOBAL_PRODUCT));
printf("Usage: setup [-options] [argument]\n");
printf("Options:\n");
printf(" -h print out this message\n");
@@ -644,7 +658,7 @@
printf(" -k keep installation cache\n");
exit(0);
case 'v':
- printf("Setup Program Version 7.1 build %s\n", BUILD_NUM);
+ printf("Setup Program Version 1.0 build %s\n", BUILD_NUM);
exit(0);
break;
case 'i':
From fedora-directory-commits at redhat.com Wed Oct 26 16:38:11 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Wed, 26 Oct 2005 12:38:11 -0400
Subject: [Fedora-directory-commits] setuputil nsdefs.mk,1.2,1.3
Message-ID: <200510261638.j9QGcfLm014431@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/setuputil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14326/setuputil
Modified Files:
nsdefs.mk
Log Message:
Bug(s) fixed: 171793
Bug Description: Change setuputil version to 1.0
Reviewed by: Noriko (Thanks!)
Fix Description: Mostly just typical rebranding stuff. I found a couple
of places in installer.cc that were not listed in the branding.dat so I
added them. I also got rid of the webserv version and the enterprise
stuff, which is apparently not used anywhere.
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: nsdefs.mk
===================================================================
RCS file: /cvs/dirsec/setuputil/nsdefs.mk,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nsdefs.mk 29 Sep 2005 22:08:54 -0000 1.2
+++ nsdefs.mk 26 Oct 2005 16:38:09 -0000 1.3
@@ -267,9 +267,9 @@
DO_SEARCH=
NODE_FLAG=-DNO_NODELOCK
-MAJOR_VERSION:="7"
-MINOR_VERSION:="1"
-SETUP_VERSION:=7.1
+MAJOR_VERSION:="1"
+MINOR_VERSION:="0"
+SETUP_VERSION:=1.0
LDAP_NO_LIBLCACHE:=1
DIRVERDIR=$(COMMON_OBJDIR)/include
From fedora-directory-commits at redhat.com Wed Oct 26 16:38:12 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Wed, 26 Oct 2005 12:38:12 -0400
Subject: [Fedora-directory-commits] setuputil/installer Makefile, 1.2,
1.3 svrcore.inf, 1.1.1.1, 1.2
Message-ID: <200510261638.j9QGcg1N014438@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/setuputil/installer
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14326/setuputil/installer
Modified Files:
Makefile svrcore.inf
Log Message:
Bug(s) fixed: 171793
Bug Description: Change setuputil version to 1.0
Reviewed by: Noriko (Thanks!)
Fix Description: Mostly just typical rebranding stuff. I found a couple
of places in installer.cc that were not listed in the branding.dat so I
added them. I also got rid of the webserv version and the enterprise
stuff, which is apparently not used anywhere.
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/setuputil/installer/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile 29 Sep 2005 22:08:59 -0000 1.2
+++ Makefile 26 Oct 2005 16:38:10 -0000 1.3
@@ -63,7 +63,7 @@
# set the values of the macros used by rpmbuild
# name and version of RPM - must correspond to the spec file - these get branded
RPM_BASE_NAME=fedora
- RPM_VERSION=7.1
+ RPM_VERSION=1.0
RPM_FILE_BASE=$(RPM_BASE_NAME)-setuputil-devel-$(RPM_VERSION)
RPM_ARCH = $(shell uname -i)
# root dir for RPM built and temp files
Index: svrcore.inf
===================================================================
RCS file: /cvs/dirsec/setuputil/installer/svrcore.inf,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- svrcore.inf 29 Jul 2005 22:16:18 -0000 1.1.1.1
+++ svrcore.inf 26 Oct 2005 16:38:10 -0000 1.2
@@ -23,7 +23,7 @@
Nickname = svrcore
Version=%%%VERSION%%%
BuildNumber= %%%BUILD_NUM%%%
-Compatible= 4.0
+Compatible= 1.0
SourcePath=svrcore
Archive= nssvrcore.zip
Mandatory= true
From fedora-directory-commits at redhat.com Wed Oct 26 16:38:12 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Wed, 26 Oct 2005 12:38:12 -0400
Subject: [Fedora-directory-commits] setuputil/include version.h,1.1.1.1,1.2
Message-ID: <200510261638.j9QGcgYP014434@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/setuputil/include
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14326/setuputil/include
Modified Files:
version.h
Log Message:
Bug(s) fixed: 171793
Bug Description: Change setuputil version to 1.0
Reviewed by: Noriko (Thanks!)
Fix Description: Mostly just typical rebranding stuff. I found a couple
of places in installer.cc that were not listed in the branding.dat so I
added them. I also got rid of the webserv version and the enterprise
stuff, which is apparently not used anywhere.
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: version.h
===================================================================
RCS file: /cvs/dirsec/setuputil/include/version.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- version.h 29 Jul 2005 22:16:18 -0000 1.1.1.1
+++ version.h 26 Oct 2005 16:38:09 -0000 1.2
@@ -31,20 +31,14 @@
* (miodrag) Note: BASE_VERSION_DEF and MCC_VERSION_DEF are used by SETUPSDK
* build scripts as SETUP_BASE and setup svrcore versions
*/
-#define BASE_VERSION_DEF "7.1"
-#define BASE_VERSION_STRING "Fedora Base components/7.1"
+#define BASE_VERSION_DEF "1.0"
+#define BASE_VERSION_STRING "Fedora Base components/1.0"
-#define MCC_VERSION_DEF "7.1"
-#define MCC_VERSION_STRING "Fedora Console/7.1"
+#define MCC_VERSION_DEF "1.0"
+#define MCC_VERSION_STRING "Fedora Console/1.0"
-#define ADMSERV_VERSION_DEF "7.1"
-#define ADMSERV_VERSION_STRING "Fedora/7.1"
-
-/* (miodrag) Need ENTERPRISE defines for ns/netsite/lib compilation
- * The actual value is not important.
- */
-#define ENTERPRISE_VERSION_DEF "6.2"
-#define ENTERPRISE_VERSION_STRING "Fedora/6.2"
+#define ADMSERV_VERSION_DEF "1.0"
+#define ADMSERV_VERSION_STRING "Fedora/1.0"
#define VI_COMPANYNAME "Fedora Project\0"
#define VI_COPYRIGHT "Copyright (C) 2005 Red Hat, Inc.\0"
From fedora-directory-commits at redhat.com Wed Oct 26 16:38:13 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Wed, 26 Oct 2005 12:38:13 -0400
Subject: [Fedora-directory-commits] setuputil/installer/include setupdefs.h,
1.1.1.1, 1.2
Message-ID: <200510261638.j9QGchXw014441@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/setuputil/installer/include
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14326/setuputil/installer/include
Modified Files:
setupdefs.h
Log Message:
Bug(s) fixed: 171793
Bug Description: Change setuputil version to 1.0
Reviewed by: Noriko (Thanks!)
Fix Description: Mostly just typical rebranding stuff. I found a couple
of places in installer.cc that were not listed in the branding.dat so I
added them. I also got rid of the webserv version and the enterprise
stuff, which is apparently not used anywhere.
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: setupdefs.h
===================================================================
RCS file: /cvs/dirsec/setuputil/installer/include/setupdefs.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- setupdefs.h 29 Jul 2005 22:16:28 -0000 1.1.1.1
+++ setupdefs.h 26 Oct 2005 16:38:10 -0000 1.2
@@ -24,6 +24,20 @@
** Platforms: UNIX and WIN32 **
** Revision History: **
** $Log$
+** Revision 1.2 2005/10/26 16:38:10 rmeggins
+** Bug(s) fixed: 171793
+** Bug Description: Change setuputil version to 1.0
+** Reviewed by: Noriko (Thanks!)
+** Fix Description: Mostly just typical rebranding stuff. I found a couple
+** of places in installer.cc that were not listed in the branding.dat so I
+** added them. I also got rid of the webserv version and the enterprise
+** stuff, which is apparently not used anywhere.
+** 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
+**
** Revision 1.1.1.1 2005/07/29 22:16:28 foxworth
** Importing new setup sdk for open source project
**
@@ -288,7 +302,7 @@
#define SETUP_INF_CONSOLE "console"
#define SETUP_DEFAULTVENDOR "Fedora Project"
-#define SETUP_DEFAULTVERSION "7.1"
+#define SETUP_DEFAULTVERSION "1.0"
#define SETUP_DEFAULTBRAND "Fedora"
#define SETUP_DEFAULTNAME "Fedora Server Products"
#define SETUP_DEFAULTPROGRAMFOLDER "Fedora Server Products"
From fedora-directory-commits at redhat.com Wed Oct 26 23:16:36 2005
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Wed, 26 Oct 2005 19:16:36 -0400
Subject: [Fedora-directory-commits]
console/src/com/netscape/management/client/util
LocalJarClassLoader.java, 1.1.1.1, 1.2
Message-ID: <200510262316.j9QNGaaD026551@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/console/src/com/netscape/management/client/util
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26415/src/com/netscape/management/client/util
Modified Files:
LocalJarClassLoader.java
Log Message:
171830 - Change console version to 1.0
Index: LocalJarClassLoader.java
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/util/LocalJarClassLoader.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- LocalJarClassLoader.java 18 Jul 2005 00:34:27 -0000 1.1.1.1
+++ LocalJarClassLoader.java 26 Oct 2005 23:16:29 -0000 1.2
@@ -45,14 +45,6 @@
static final protected int JAR_FILE_INCLUDE_LIMIT = 100;
- // Flag whether a jar is based on a console version prior to 5.0 (
- // (4.0, 4.1 or 4.2). Denotes that a class needs swing package name
- // conversion and compatibility adjustments
- private boolean isPre50Jar;
-
- // Compatibility jar to be used by all pre 5.0 jars
- private static String console42Jar= "console42.jar";
-
protected Vector jarNames = new Vector(); // A String Vector
protected Vector jarFiles = new Vector(); // A ZipFile Vector
@@ -152,38 +144,13 @@
//
PropertyResourceBundle manifest = getManifest(filename);
if (manifest == null) {
- // Include console42.jar for pre 5.0 jars
- isPre50Jar = true;
- includeConsole42Jar(language);
+ if (Debug.isEnabled()) {
+ Debug.println(3, debugTag + "No manifest file for " + filename);
+ }
return;
}
- // Step 4. Set isPre50Jar flag
- //
- String mccVersion = manifest.getString("mcc-version");
-
- if (mccVersion == null) {
- // 5.0+ manifests must have mcc-version directive
- isPre50Jar = true;
- if (Debug.isEnabled()) {
- Debug.println(2, debugTag + "Bad manifest, no mcc-version directive");
- }
-
- }
- else {
- // Only 4.x jars needs swing package name conversion
- isPre50Jar = mccVersion.startsWith("4");
- }
- if (Debug.isEnabled()) {
- Debug.println(5, debugTag +"isPre50Jar=" + isPre50Jar);
- }
-
- // Include console42.jar for pre 5.0 jars
- if (isPre50Jar) {
- includeConsole42Jar(language);
- }
-
- // Step 5. Include jars specified in the manifest
+ // Step 4. Include jars specified in the manifest
//
String[] list = getManifestJarList(manifest);
for (int i = 0 ; i < list.length; i++) {
@@ -220,33 +187,6 @@
}
}
- /**
- * Backward compatibility jar console42.jar is automatically added to all
- * server jars prior to console 5.0
- */
- private void includeConsole42Jar(String language) throws Exception {
- String path = patchDir + "/" + console42Jar;
- if (!(new File(path)).exists()) {
- return;
- }
- if (Debug.isEnabled()) {
- Debug.println(2, debugTag + "include jar " + console42Jar);
- }
- jarNames.addElement(console42Jar);
- jarFiles.addElement(new ZipFile(path));
-
- String langFile = addL10Nsuffix(console42Jar, "en");
- path = patchDir + "/" + langFile;
- if (!(new File(path)).exists()) {
- return;
- }
- if (Debug.isEnabled()) {
- Debug.println(2, debugTag + "include jar " + langFile);
- }
- jarNames.addElement(langFile);
- jarFiles.addElement(new ZipFile(path));
- }
-
/**
* Processes the manifest PropertyResourceBundle and produces an array
@@ -508,31 +448,7 @@
BufferedInputStream zis =
new BufferedInputStream(f.getInputStream(e));
- // Do swing package name conversion on the fly if necessary
- if (isPre50Jar && path.endsWith(".class")) {
- try {
- if (Debug.isEnabled()) {
- Debug.println(6, debugTag + "converting " + path + " ...");
- }
- ByteArrayOutputStream bos = new ByteArrayOutputStream(512);
- SwingPackageNameConverter.convert(zis,bos);
- bos.close();
- if (Debug.isEnabled()) {
- Debug.println(6, debugTag + "---- Done");
- }
- return bos.toByteArray();
- }
- catch (Exception ex) {
- Debug.println(0, debugTag + "Conversion Exception "+ ex);
- if (Debug.isEnabled()) {
- ex.printStackTrace(System.out);
- }
- throw ex;
- }
-
- }
-
- // Read the content if no swing name conversion
+ // Read the content
int size = (int)(e.getSize());
int cnt = 0;
byte[] storage = new byte[size];
From fedora-directory-commits at redhat.com Wed Oct 26 23:16:17 2005
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Wed, 26 Oct 2005 19:16:17 -0400
Subject: [Fedora-directory-commits] console build.properties, 1.5,
1.6 startconsole, 1.3, 1.4
Message-ID: <200510262316.j9QNGlYG026555@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/console
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26415
Modified Files:
build.properties startconsole
Log Message:
171830 - Change console version to 1.0
Index: build.properties
===================================================================
RCS file: /cvs/dirsec/console/build.properties,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- build.properties 25 Oct 2005 17:30:46 -0000 1.5
+++ build.properties 26 Oct 2005 23:16:14 -0000 1.6
@@ -22,8 +22,8 @@
lang=en
console.root=.
-console.version=71
-console.dotversion=7.1
+console.version=10
+console.dotversion=1.0
mcc.core=mcc
mcc.name=${mcc.core}${console.version}
Index: startconsole
===================================================================
RCS file: /cvs/dirsec/console/startconsole,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- startconsole 9 Sep 2005 20:29:08 -0000 1.3
+++ startconsole 26 Oct 2005 23:16:14 -0000 1.4
@@ -66,4 +66,4 @@
#
# Launch the Console
#
-cd java; $JAVA_HOME/bin/java -ms8m -mx64m -cp .:./base.jar:./mcc71_en.jar:./jss3.jar:./ldapjdk.jar:./mcc71.jar:./nmclf71_en.jar:./nmclf71.jar -Djava.library.path=../lib -Djava.util.prefs.systemRoot=. -Djava.util.prefs.userRoot=. com.netscape.management.client.console.Console $*
+cd java; $JAVA_HOME/bin/java -ms8m -mx64m -cp .:./base.jar:./mcc10_en.jar:./jss3.jar:./ldapjdk.jar:./mcc10.jar:./nmclf10_en.jar:./nmclf10.jar -Djava.library.path=../lib -Djava.util.prefs.systemRoot=. -Djava.util.prefs.userRoot=. com.netscape.management.client.console.Console $*
From fedora-directory-commits at redhat.com Wed Oct 26 23:16:22 2005
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Wed, 26 Oct 2005 19:16:22 -0400
Subject: [Fedora-directory-commits]
console/src/com/netscape/management/client AboutDialog.java,
1.2, 1.3 default.properties, 1.2,
1.3 defaultLicense.properties, 1.2, 1.3
Message-ID: <200510262316.j9QNGrY3026560@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/console/src/com/netscape/management/client
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26415/src/com/netscape/management/client
Modified Files:
AboutDialog.java default.properties defaultLicense.properties
Log Message:
171830 - Change console version to 1.0
Index: AboutDialog.java
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/AboutDialog.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AboutDialog.java 9 Sep 2005 20:29:09 -0000 1.2
+++ AboutDialog.java 26 Oct 2005 23:16:15 -0000 1.3
@@ -180,7 +180,7 @@
AboutDialog dialog = new AboutDialog(f, "Fedora Management Console");
- dialog.setProduct(UIManager.getIcon("OptionPane.warningIcon"), "Fedora Management Console\056 Console 7.1\nCopyright (C) Red Hat, Inc.", "\n\nThis software is subject to the terms of a license agreement. Please do not use the software unless you agree to all the license terms");
+ dialog.setProduct(UIManager.getIcon("OptionPane.warningIcon"), "Fedora Management Console\056 Console 1.0\nCopyright (C) Red Hat, Inc.", "\n\nThis software is subject to the terms of a license agreement. Please do not use the software unless you agree to all the license terms");
dialog.addVendor(UIManager.getIcon("OptionPane.informationIcon"), "Contains Phaos SSL encryption software from Phaos Technology Corporation. Copyright © 1998 Phaos Technology Corporation. All Rights Reserved");
dialog.addVendor(UIManager.getIcon("OptionPane.informationIcon"), "Contains encryption software from RSA Data Security, Inc. Copyright © 1994 RSA Data Security, Inc. All rights reserved.");
Index: default.properties
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/default.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- default.properties 9 Sep 2005 20:29:09 -0000 1.2
+++ default.properties 26 Oct 2005 23:16:15 -0000 1.3
@@ -123,5 +123,5 @@
fontTab-fontProfile=Font Profile
fontTab-table_tt=Font table of screen elements and corresponding sample font
-banner-console=Fedora Management Console 7.1
+banner-console=Fedora Management Console 1.0
Index: defaultLicense.properties
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/defaultLicense.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- defaultLicense.properties 9 Sep 2005 20:29:09 -0000 1.2
+++ defaultLicense.properties 26 Oct 2005 23:16:15 -0000 1.3
@@ -17,7 +17,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# END COPYRIGHT BLOCK
#
-defaultAbout-dialogTitle=Fedora Management Console 7.1
+defaultAbout-dialogTitle=Fedora Management Console 1.0
defaultAbout-productLogo=com/netscape/management/client/images/logo32.gif
defaultAbout-productCopyright=Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.\nCopyright (C) 2005 Red Hat, Inc.\nAll rights reserved.
defaultAbout-productLicense=Fedora is a trademark of Red Hat, Inc. in the United States and other countries and is used by permission.
From fedora-directory-commits at redhat.com Wed Oct 26 23:16:23 2005
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Wed, 26 Oct 2005 19:16:23 -0400
Subject: [Fedora-directory-commits]
console/src/com/netscape/management/client/ace ACIEditor.java,
1.1.1.1, 1.2
Message-ID: <200510262316.j9QNGre5026561@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/console/src/com/netscape/management/client/ace
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26415/src/com/netscape/management/client/ace
Modified Files:
ACIEditor.java
Log Message:
171830 - Change console version to 1.0
Index: ACIEditor.java
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/ace/ACIEditor.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- ACIEditor.java 18 Jul 2005 00:34:09 -0000 1.1.1.1
+++ ACIEditor.java 26 Oct 2005 23:16:20 -0000 1.2
@@ -41,7 +41,7 @@
* 5) Time
*
* Additional tabs may be registered at the following location:
- * cn=ACIEditor, ou=4.0, ou=Global Preferences, ou=[domain], o=NetscapeRoot
+ * cn=ACIEditor, ou=[Console Version], ou=Global Preferences, ou=[domain], o=NetscapeRoot
* which is an entry of this type:
* objectclass nsAdminObject
* superior top
@@ -230,7 +230,7 @@
v.addElement(new TimeTab());
// TODO: load tabs dynamically
- // points to NetscapeRoot\mcom.com\Global Preferences\Admin\4.0
+ // points to NetscapeRoot\mcom.com\Global Preferences\Admin\
String baseDN = "cn=ACIEditor, " + LDAPUtil.getAdminGlobalParameterEntry();
try
{
From fedora-directory-commits at redhat.com Wed Oct 26 23:16:25 2005
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Wed, 26 Oct 2005 19:16:25 -0400
Subject: [Fedora-directory-commits]
console/src/com/netscape/management/client/components
IDirNode.java, 1.1.1.1, 1.2
Message-ID: <200510262316.j9QNGtCg026566@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/console/src/com/netscape/management/client/components
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26415/src/com/netscape/management/client/components
Modified Files:
IDirNode.java
Log Message:
171830 - Change console version to 1.0
Index: IDirNode.java
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/components/IDirNode.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- IDirNode.java 18 Jul 2005 00:34:13 -0000 1.1.1.1
+++ IDirNode.java 26 Oct 2005 23:16:21 -0000 1.2
@@ -23,7 +23,7 @@
import netscape.ldap.LDAPEntry;
/**
- * Netscape Directory Server 4.0 Directory Entry interface.
+ * Directory Server Directory Entry interface.
*
* @author rweltman
* @version %I%, %G%
From fedora-directory-commits at redhat.com Wed Oct 26 23:16:25 2005
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Wed, 26 Oct 2005 19:16:25 -0400
Subject: [Fedora-directory-commits]
console/src/com/netscape/management/client/console
Console.java, 1.1.1.1, 1.2 VersionInfo.java, 1.1.1.1,
1.2 console.properties, 1.2, 1.3
Message-ID: <200510262317.j9QNGt1E026571@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/console/src/com/netscape/management/client/console
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26415/src/com/netscape/management/client/console
Modified Files:
Console.java VersionInfo.java console.properties
Log Message:
171830 - Change console version to 1.0
Index: Console.java
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/console/Console.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- Console.java 18 Jul 2005 00:34:14 -0000 1.1.1.1
+++ Console.java 26 Oct 2005 23:16:23 -0000 1.2
@@ -58,7 +58,7 @@
// preference information
//
public static final String IDENTIFIER = "Console";
- public static final String VERSION = "4.0";
+ public static final String VERSION = "1.0";
public static final String PREFERENCES_LOGIN =
IDENTIFIER + "." + VERSION + ".Login.preferences";
@@ -76,8 +76,6 @@
public static final int MAX_RECENT_URLS = 5;
- protected static final double MIN_CONTEXT_HELP_VERSION = 4.5;
-
//
// global values
//
@@ -942,26 +940,10 @@
userPreferenceDN, true);
_info.setUserPreferenceDN(userPreferenceDN);
}
- checkHelpSystem();
+ // Always enable context help.
+ UtilConsoleGlobals.setContextHelpEnabled( true );
}
- /**
- * Check if the Admin Server version supports context-sensitive
- * Help. That is the case if the version is greater than 4.2.
- */
- protected void checkHelpSystem() {
- boolean hasContextHelp = false;
- if ( _adminVersion != null ) {
- hasContextHelp = ( Double.parseDouble( _adminVersion ) >=
- MIN_CONTEXT_HELP_VERSION );
- Debug.println( "Console.checkHelpSystem: contextHelp=" +
- hasContextHelp );
- } else {
- Debug.println( "Console.checkHelpSystem: cannot determine " +
- "Admin Version" );
- }
- UtilConsoleGlobals.setContextHelpEnabled( hasContextHelp );
- }
/**
* build up the resource editor extension plugin.
Index: VersionInfo.java
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/console/VersionInfo.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- VersionInfo.java 18 Jul 2005 00:34:15 -0000 1.1.1.1
+++ VersionInfo.java 26 Oct 2005 23:16:23 -0000 1.2
@@ -32,33 +32,18 @@
private static ResourceSet _resource = new ResourceSet("com.netscape.management.client.console.versioninfo");
/**
- * Returns version number for the Netacape Console
- * VersionInfo class is introduces in Console 4.1. As 4.1 Netscape Servers
- * may be started under 4.0 console as well, the proper way to test for
- * version is:
- *
- * String version, build;
- * try {
- * version = VersionInfo.getVersionNumber();
- * }
- * // If the class is not found then we are running in 4.0 environment
- * catch (ClassNotFoundException e) {
- * version = "4.0";
- * }
- * Debug.println("version="+version);
+ * Returns version number for the Console.
*
- *
- *
- * @return Netscape Console Version Number
+ * @return Console Version Number
*/
public static String getVersionNumber() {
return _resource.getString("console","versionNumber");
}
/**
- * Returns build number for the Netacape Console.
+ * Returns build number for the Console.
*
- * @return Netscape Console Build Number
+ * @return Console Build Number
*/
public static String getBuildNumber() {
return _resource.getString("console","buildNumber");
Index: console.properties
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/console/console.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- console.properties 9 Sep 2005 20:29:09 -0000 1.2
+++ console.properties 26 Oct 2005 23:16:23 -0000 1.3
@@ -18,7 +18,7 @@
# END COPYRIGHT BLOCK
#
console-title=Fedora Management Console
-console-displayVersion=7.1
+console-displayVersion=1.0
login-username=User ID:
login-password=Password:
From fedora-directory-commits at redhat.com Wed Oct 26 23:16:31 2005
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Wed, 26 Oct 2005 19:16:31 -0400
Subject: [Fedora-directory-commits]
console/src/com/netscape/management/client/topology/ug
IUGToolPlugin.java, 1.1.1.1, 1.2 UGPage.java, 1.1.1.1, 1.2
Message-ID: <200510262317.j9QNH1NT026578@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/console/src/com/netscape/management/client/topology/ug
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26415/src/com/netscape/management/client/topology/ug
Modified Files:
IUGToolPlugin.java UGPage.java
Log Message:
171830 - Change console version to 1.0
Index: IUGToolPlugin.java
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/topology/ug/IUGToolPlugin.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- IUGToolPlugin.java 18 Jul 2005 00:34:20 -0000 1.1.1.1
+++ IUGToolPlugin.java 26 Oct 2005 23:16:29 -0000 1.2
@@ -28,10 +28,10 @@
* the User Group page is selected.
*
* The plugin must be registered in LDAP under this entry:
- * cn=UserGroupTools, ou=4.0, ou=Admin, ou=Global Preferences, ou=, o=NetscapeRoot
+ * cn=UserGroupTools, ou=[AS version], ou=Admin, ou=Global Preferences, ou=[domain], o=NetscapeRoot
*
* For example,
- * dn: cn=UserGroupTools, ou=4.0, ou=Admin, ou=Global Preferences, ou=mcom.com, o=NetscapeRoot
+ * dn: cn=UserGroupTools, ou=1.0, ou=Admin, ou=Global Preferences, ou=mcom.com, o=NetscapeRoot
* cn: UserGroupTools
* objectclass: top
* objectclass: nsAdminObject
Index: UGPage.java
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/topology/ug/UGPage.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- UGPage.java 18 Jul 2005 00:34:21 -0000 1.1.1.1
+++ UGPage.java 26 Oct 2005 23:16:29 -0000 1.2
@@ -211,7 +211,6 @@
public MenuItemCategory createToolsMenu() {
ConsoleInfo ci = Console.getConsoleInfo();
LDAPConnection ldc = ci.getLDAPConnection();
- // String dn = "cn=UserGroupTools,ou=4.0,ou=Admin,ou=Global Preferences,ou=mcom.com,o=NetscapeRoot";
String dn = "cn=UserGroupTools," +
LDAPUtil.getAdminGlobalParameterEntry();
From fedora-directory-commits at redhat.com Wed Oct 26 23:16:31 2005
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Wed, 26 Oct 2005 19:16:31 -0400
Subject: [Fedora-directory-commits]
console/src/com/netscape/management/client/topology
topology.properties, 1.1.1.1, 1.2
Message-ID: <200510262317.j9QNH13o026574@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/console/src/com/netscape/management/client/topology
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26415/src/com/netscape/management/client/topology
Modified Files:
topology.properties
Log Message:
171830 - Change console version to 1.0
Index: topology.properties
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/topology/topology.properties,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- topology.properties 18 Jul 2005 00:34:20 -0000 1.1.1.1
+++ topology.properties 26 Oct 2005 23:16:23 -0000 1.2
@@ -41,9 +41,6 @@
menu-NewSIE=Server Instance
menu-newDomain=C&reate Administration Domain
-menu-AddOldServer=&Add Pre 4.0 Server
-menu-RemoveOldServer=&Remove Pre 4.0 Server
-menu-MigrateServer=&Migrate Pre 4.0 Server Config...
menu-CreateServer=&Create Instance Of
menu-RemoveServer=Remove Server
menu-CloneServer=Clone Server Config...
From fedora-directory-commits at redhat.com Thu Oct 27 06:23:15 2005
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Thu, 27 Oct 2005 02:23:15 -0400
Subject: [Fedora-directory-commits] setuputil Makefile, 1.1.1.1,
1.2 fedora-setuputil.spec.tmpl, 1.1.1.1, 1.2
Message-ID: <200510270623.j9R6NFK5009166@cvs-int.fedora.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/setuputil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9146
Modified Files:
Makefile fedora-setuputil.spec.tmpl
Log Message:
Reset the rpm Version to 1.0
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/setuputil/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- Makefile 29 Jul 2005 22:16:18 -0000 1.1.1.1
+++ Makefile 27 Oct 2005 06:23:11 -0000 1.2
@@ -65,6 +65,7 @@
$(PERL5) $(RELTOOLSPATH)/brandver.pl -i branding/fedora/brandverNT.dat
else
$(PERL5) $(RELTOOLSPATH)/brandver.pl -i branding/fedora/brandver.dat
+ $(PERL5) $(RELTOOLSPATH)/brandver.pl -i branding/fedora/spec.dat
endif
@echo ==== Finished Branding SetupUtil ==========
Index: fedora-setuputil.spec.tmpl
===================================================================
RCS file: /cvs/dirsec/setuputil/fedora-setuputil.spec.tmpl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- fedora-setuputil.spec.tmpl 29 Jul 2005 22:16:18 -0000 1.1.1.1
+++ fedora-setuputil.spec.tmpl 27 Oct 2005 06:23:11 -0000 1.2
@@ -26,7 +26,7 @@
%define __os_install_post %{nil}
Summary: Fedora Setup SDK
Name: fedora-setuputil-devel
-Version: 7.1
+Version: 1.0
Release: 1. at PLATFORM@
License: LGPL
Group: System Environment/Libraries
From fedora-directory-commits at redhat.com Thu Oct 27 14:12:42 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Thu, 27 Oct 2005 10:12:42 -0400
Subject: [Fedora-directory-commits] ldapserver buildpaths.mk, 1.6,
1.7 internal_buildpaths.mk, 1.6, 1.7
Message-ID: <200510271412.j9RECgcP022521@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22474/ldapserver
Modified Files:
buildpaths.mk internal_buildpaths.mk
Log Message:
Bug(s) fixed: 171854
Bug Description: Allow DSMLGW to build with GAR build scripts
Reviewed by: nhosoi at redhat.com (Thanks!)
Fix Description: Add a new macro DSMLGWJARS_BUILD_DIR which defaults to
dist/classes for internal builds. For external builds, the developer
can grab these jars from their respective locations, or grab the bundle
from the fds download site, which is what the GAR builds will do. The
location is then passed in on the make command line as
DSMLGWJARS_BUILD_DIR=/path/to/dsmlgwjars. Regular internal builds
should continue to work as always.
Platforms tested: RHEL4
Flag Day: no
Doc impact: no
Index: buildpaths.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/buildpaths.mk,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- buildpaths.mk 21 Oct 2005 19:21:04 -0000 1.6
+++ buildpaths.mk 27 Oct 2005 14:12:33 -0000 1.7
@@ -135,5 +135,8 @@
# JAF - activation.jar - http://java.sun.com/products/javabeans/glasgow/jaf.html
# JWSDP - jaxrpc-api.jar,jaxrpc.jar,saaj.jar - http://java.sun.com/webservices/downloads/webservicespack.html
# Crimson - crimson.jar - http://xml.apache.org/crimson/
+# Also the ldapjdk.jar
+# all of these files need to be in the following directory
+DSMLGWJARS_BUILD_DIR = $(BUILD_ROOT)/../dsmlgwjars
PERLDAP_SOURCE_ROOT = $(MOZILLA_SOURCE_ROOT)
Index: internal_buildpaths.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/internal_buildpaths.mk,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- internal_buildpaths.mk 3 Oct 2005 19:53:40 -0000 1.6
+++ internal_buildpaths.mk 27 Oct 2005 14:12:33 -0000 1.7
@@ -139,3 +139,5 @@
ifndef ADMINSERVER_SOURCE_ROOT
ADMSERV_DIR=$(ABS_ROOT_PARENT)/dist/$(NSOBJDIR_NAME)/adminserver
endif
+
+DSMLGWJARS_BUILD_DIR = $(CLASS_DEST)
From fedora-directory-commits at redhat.com Thu Oct 27 14:12:42 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Thu, 27 Oct 2005 10:12:42 -0400
Subject: [Fedora-directory-commits] ldapserver/ldap/clients/dsmlgw Makefile,
1.8, 1.9
Message-ID: <200510271412.j9RECgD6022527@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/clients/dsmlgw
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22474/ldapserver/ldap/clients/dsmlgw
Modified Files:
Makefile
Log Message:
Bug(s) fixed: 171854
Bug Description: Allow DSMLGW to build with GAR build scripts
Reviewed by: nhosoi at redhat.com (Thanks!)
Fix Description: Add a new macro DSMLGWJARS_BUILD_DIR which defaults to
dist/classes for internal builds. For external builds, the developer
can grab these jars from their respective locations, or grab the bundle
from the fds download site, which is what the GAR builds will do. The
location is then passed in on the make command line as
DSMLGWJARS_BUILD_DIR=/path/to/dsmlgwjars. Regular internal builds
should continue to work as always.
Platforms tested: RHEL4
Flag Day: no
Doc impact: no
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsmlgw/Makefile,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Makefile 3 Oct 2005 19:53:53 -0000 1.8
+++ Makefile 27 Oct 2005 14:12:40 -0000 1.9
@@ -49,7 +49,7 @@
@if [ ! -f $(CLASS_DEST)/axis.jar ]; then \
cp $(CLASS_DEST)/$(AXIS_REL_DIR)/lib/axis.jar $(CLASS_DEST) ; \
fi
- $(ANT)
+ $(ANT) -Dglobaldist.dir=$(DSMLGWJARS_BUILD_DIR)
clean:
$(ANT) clean
From fedora-directory-commits at redhat.com Thu Oct 27 14:12:43 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Thu, 27 Oct 2005 10:12:43 -0400
Subject: [Fedora-directory-commits] ldapserver/ldap/cm Makefile,1.37,1.38
Message-ID: <200510271412.j9REChoS022533@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/cm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22474/ldapserver/ldap/cm
Modified Files:
Makefile
Log Message:
Bug(s) fixed: 171854
Bug Description: Allow DSMLGW to build with GAR build scripts
Reviewed by: nhosoi at redhat.com (Thanks!)
Fix Description: Add a new macro DSMLGWJARS_BUILD_DIR which defaults to
dist/classes for internal builds. For external builds, the developer
can grab these jars from their respective locations, or grab the bundle
from the fds download site, which is what the GAR builds will do. The
location is then passed in on the make command line as
DSMLGWJARS_BUILD_DIR=/path/to/dsmlgwjars. Regular internal builds
should continue to work as always.
Platforms tested: RHEL4
Flag Day: no
Doc impact: no
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/Makefile,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- Makefile 25 Oct 2005 16:55:48 -0000 1.37
+++ Makefile 27 Oct 2005 14:12:40 -0000 1.38
@@ -349,18 +349,18 @@
$(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/clients/dsmlgw/misc/web-app_2_3.dtd $(RELDIR)/clients/dsmlgw/
# now time to move the necessary jars in place
- $(INSTALL) -m 644 $(NSDIST)/classes/ldapjdk.jar $(RELDIR)/clients/dsmlgw/WEB-INF/lib
- $(INSTALL) -m 644 $(NSDIST)/classes/activation.jar $(RELDIR)/clients/dsmlgw/WEB-INF/lib
+ $(INSTALL) -m 644 $(DSMLGWJARS_BUILD_DIR)/ldapjdk.jar $(RELDIR)/clients/dsmlgw/WEB-INF/lib
+ $(INSTALL) -m 644 $(DSMLGWJARS_BUILD_DIR)/activation.jar $(RELDIR)/clients/dsmlgw/WEB-INF/lib
# if you use the jaxrpc.jar from the axis distribution, you don't need the api file
# or perhaps you need the jaxrpc.jar for building, and jaxrpc-api.jar at runtime, or vice versa
# if so, I'm not sure where to get the implementation
- if [ -f $(NSDIST)/classes/jaxrpc-api.jar ] ; then \
- $(INSTALL) -m 644 $(NSDIST)/classes/jaxrpc-api.jar $(RELDIR)/clients/dsmlgw/WEB-INF/lib ; \
+ if [ -f $(DSMLGWJARS_BUILD_DIR)/jaxrpc-api.jar ] ; then \
+ $(INSTALL) -m 644 $(DSMLGWJARS_BUILD_DIR)/jaxrpc-api.jar $(RELDIR)/clients/dsmlgw/WEB-INF/lib ; \
fi
- $(INSTALL) -m 644 $(NSDIST)/classes/jaxrpc.jar $(RELDIR)/clients/dsmlgw/WEB-INF/lib
- $(INSTALL) -m 644 $(NSDIST)/classes/saaj.jar $(RELDIR)/clients/dsmlgw/WEB-INF/lib
- $(INSTALL) -m 644 $(NSDIST)/classes/xercesImpl.jar $(RELDIR)/clients/dsmlgw/WEB-INF/lib
- $(INSTALL) -m 644 $(NSDIST)/classes/xml-apis.jar $(RELDIR)/clients/dsmlgw/WEB-INF/lib
+ $(INSTALL) -m 644 $(DSMLGWJARS_BUILD_DIR)/jaxrpc.jar $(RELDIR)/clients/dsmlgw/WEB-INF/lib
+ $(INSTALL) -m 644 $(DSMLGWJARS_BUILD_DIR)/saaj.jar $(RELDIR)/clients/dsmlgw/WEB-INF/lib
+ $(INSTALL) -m 644 $(DSMLGWJARS_BUILD_DIR)/xercesImpl.jar $(RELDIR)/clients/dsmlgw/WEB-INF/lib
+ $(INSTALL) -m 644 $(DSMLGWJARS_BUILD_DIR)/xml-apis.jar $(RELDIR)/clients/dsmlgw/WEB-INF/lib
endif # USE_DSMLGW
# PACKAGE_UNDER_JAVA is defined in components.mk - these are component .jar files to install
From fedora-directory-commits at redhat.com Thu Oct 27 17:50:23 2005
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Thu, 27 Oct 2005 13:50:23 -0400
Subject: [Fedora-directory-commits]
ldapserver/ldap/cm/newinst setup, 1.9.2.5,
1.9.2.6 setup.patch, 1.1.2.4, 1.1.2.5
Message-ID: <200510271750.j9RHoNrF028906@cvs-int.fedora.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/cm/newinst
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28847/newinst
Modified Files:
Tag: Directory71RtmBranch
setup setup.patch
Log Message:
[171817] RHEL full install from service pack rpm cannot process security files
dssecure.txt and assecure.txt are the temporary file created in the setup
script, which is generated only when slapd instance and admin server are
installed, respectively. But they were checked even if it was the fresh
install.
Index: setup
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinst/setup,v
retrieving revision 1.9.2.5
retrieving revision 1.9.2.6
diff -u -r1.9.2.5 -r1.9.2.6
--- setup 25 Oct 2005 20:37:05 -0000 1.9.2.5
+++ setup 27 Oct 2005 17:50:16 -0000 1.9.2.6
@@ -316,38 +316,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
setup.patch:
Index: setup.patch
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinst/setup.patch,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- setup.patch 17 Oct 2005 18:07:11 -0000 1.1.2.4
+++ setup.patch 27 Oct 2005 17:50:16 -0000 1.1.2.5
@@ -272,36 +272,41 @@
echo "$conffile: SSL on ..."
}
-for dir in `cat dssecure.txt` ; do
- clear
- 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
+ clear
+ 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
+fi
if [ $isadminsslon -ne 0 ]; then
$serverroot/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 assecuire.txt
+fi
if [ $isadminsslon -ne 0 ]; then
echo "Restarting Administration Server: $serverroot/start-admin"
$serverroot/start-admin
fi
-rm -f dssecure.txt assecuire.txt
From fedora-directory-commits at redhat.com Fri Oct 28 01:58:02 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Thu, 27 Oct 2005 21:58:02 -0400
Subject: [Fedora-directory-commits] mod_admserv aclocal.m4, 1.4,
1.5 Makefile.am, 1.7, 1.8 Makefile.in, 1.10, 1.11 configure.in,
1.9, 1.10 configure, 1.11, 1.12
Message-ID: <200510280158.j9S1w2pO010071@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/mod_admserv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10047
Modified Files:
aclocal.m4 Makefile.am Makefile.in configure.in configure
Log Message:
This allows the mod_admserv configure to figure out what adminutil
version to use. It looks in the given directory and extracts the
version number from the end of the first matching libadminutil.
Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/mod_admserv/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Makefile.am 19 Aug 2005 14:49:57 -0000 1.7
+++ Makefile.am 28 Oct 2005 01:57:54 -0000 1.8
@@ -6,7 +6,7 @@
## Set the includes and libraries needed
INCLUDES = -I at apache_inc@ @apr_inc@ @adminutil_inc@ @nspr_inc@ @ldapsdk_inc@ @nss_inc@
-LIBS = @adminutil_lib@ -ladminutil71 -ladmsslutil71 @ldapsdk_lib@ -lssldap50 -lprldap50 -lldap50 @nss_lib@ -lssl3 -lnss3
+LIBS = @adminutil_lib@ -ladminutil at adminutil_ver@ -ladmsslutil at adminutil_ver@ @ldapsdk_lib@ -lssldap50 -lprldap50 -lldap50 @nss_lib@ -lssl3 -lnss3
install-libLTLIBRARIES: libmodadmserv.la
@APXS@ -i -a -n admserv libmodadmserv.la
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/mod_admserv/Makefile.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Makefile.in 26 Sep 2005 19:52:01 -0000 1.10
+++ Makefile.in 28 Oct 2005 01:57:54 -0000 1.11
@@ -85,6 +85,7 @@
VERSION = @VERSION@
adminutil_inc = @adminutil_inc@
adminutil_lib = @adminutil_lib@
+adminutil_ver = @adminutil_ver@
am__include = @am__include@
am__quote = @am__quote@
apache_bin = @apache_bin@
@@ -103,7 +104,7 @@
libmodadmserv_la_SOURCES = mod_admserv.c
INCLUDES = -I at apache_inc@ @apr_inc@ @adminutil_inc@ @nspr_inc@ @ldapsdk_inc@ @nss_inc@
-LIBS = @adminutil_lib@ -ladminutil71 -ladmsslutil71 @ldapsdk_lib@ -lssldap50 -lprldap50 -lldap50 @nss_lib@ -lssl3 -lnss3
+LIBS = @adminutil_lib@ -ladminutil at adminutil_ver@ -ladmsslutil at adminutil_ver@ @ldapsdk_lib@ -lssldap50 -lprldap50 -lldap50 @nss_lib@ -lssl3 -lnss3
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
Index: configure.in
===================================================================
RCS file: /cvs/dirsec/mod_admserv/configure.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- configure.in 26 Sep 2005 19:40:08 -0000 1.9
+++ configure.in 28 Oct 2005 01:57:54 -0000 1.10
@@ -225,6 +225,13 @@
ADMINUTILDIR=$withval
adminutil_inc="-I$ADMINUTILDIR/include"
adminutil_lib="-L$ADMINUTILDIR/lib"
+ for file in $ADMINUTILDIR/lib/* ; do
+ echo $file | grep 'libadminutil[0-9][0-9]' && adminutil_ver=`echo $file | sed -e 's/.*libadminutil\([0-9][0-9]\).*/\1/'` ; break
+ done
+ if test -z "$adminutil_ver"
+ then
+ adminutil_ver=10
+ fi
else
echo
AC_MSG_ERROR([$withval not found])
@@ -313,6 +320,7 @@
AC_SUBST(ldapsdk_lib)
AC_SUBST(adminutil_inc)
AC_SUBST(adminutil_lib)
+AC_SUBST(adminutil_ver)
AC_SUBST(nss_inc)
AC_SUBST(nss_lib)
Index: configure
===================================================================
RCS file: /cvs/dirsec/mod_admserv/configure,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- configure 26 Sep 2005 19:52:01 -0000 1.11
+++ configure 28 Oct 2005 01:57:54 -0000 1.12
@@ -466,7 +466,7 @@
# include
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO RANLIB ac_ct_RANLIB CPP EGREP LIBTOOL APR_CONFIG APXS PKG_CONFIG apr_inc apache_inc apache_conf apache_prefix apache_bin nspr_inc ldapsdk_inc ldapsdk_lib adminutil_inc adminutil_lib nss_inc nss_lib LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO RANLIB ac_ct_RANLIB CPP EGREP LIBTOOL APR_CONFIG APXS PKG_CONFIG apr_inc apache_inc apache_conf apache_prefix apache_bin nspr_inc ldapsdk_inc ldapsdk_lib adminutil_inc adminutil_lib adminutil_ver nss_inc nss_lib LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -8588,6 +8588,13 @@
ADMINUTILDIR=$withval
adminutil_inc="-I$ADMINUTILDIR/include"
adminutil_lib="-L$ADMINUTILDIR/lib"
+ for file in $ADMINUTILDIR/lib/* ; do
+ echo $file | grep 'libadminutil0-90-9' && adminutil_ver=`echo $file | sed -e 's/.*libadminutil\(0-90-9\).*/\1/'` ; break
+ done
+ if test -z "$adminutil_ver"
+ then
+ adminutil_ver=10
+ fi
else
echo
{ { echo "$as_me:$LINENO: error: $withval not found" >&5
@@ -8758,6 +8765,7 @@
+
# Write config.status and the Makefile
ac_config_files="$ac_config_files Makefile"
cat >confcache <<\_ACEOF
@@ -9472,6 +9480,7 @@
s, at ldapsdk_lib@,$ldapsdk_lib,;t t
s, at adminutil_inc@,$adminutil_inc,;t t
s, at adminutil_lib@,$adminutil_lib,;t t
+s, at adminutil_ver@,$adminutil_ver,;t t
s, at nss_inc@,$nss_inc,;t t
s, at nss_lib@,$nss_lib,;t t
s, at LIBOBJS@,$LIBOBJS,;t t
From fedora-directory-commits at redhat.com Fri Oct 28 18:01:47 2005
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Fri, 28 Oct 2005 14:01:47 -0400
Subject: [Fedora-directory-commits]
directoryconsole/src/com/netscape/admin/dirserv DSAdmin.java,
1.1.1.1, 1.2 about.properties, 1.1.1.1, 1.2 dirserv.properties,
1.1.1.1, 1.2
Message-ID: <200510281801.j9SI1vpA007380@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7298/src/com/netscape/admin/dirserv
Modified Files:
DSAdmin.java about.properties dirserv.properties
Log Message:
171941 - Adjusted the version number and branding. I had to modify the checkVersion method to deal with running in Console 1.0. I also cleaned up references to consolesdk in the Ant build files. They should be console instead since we dropped the consolesdk naming. The external and internal imports files were adjusted to pick up the new 1.0 Console component.
Index: DSAdmin.java
===================================================================
RCS file: /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/DSAdmin.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- DSAdmin.java 18 Jul 2005 00:55:34 -0000 1.1.1.1
+++ DSAdmin.java 28 Oct 2005 18:01:34 -0000 1.2
@@ -1231,25 +1231,19 @@
private boolean checkVersion(ConsoleInfo info) {
String version = null;
JFrame frame = UtilConsoleGlobals.getActivatedFrame();
- try {
- version = VersionInfo.getVersionNumber();
- }
- // If the class is not found then we are running in 4.0 environment
- catch (Exception e) {
- DSUtil.showErrorDialog(frame, "neednewconsole", "4.0");
- return false;
- }
+ version = VersionInfo.getVersionNumber();
try {
Float f = new Float(version);
- // this version of the console is compatible with any kingpin
- // console version greater than 4.0 e.g. 4.1, 4.2, 5.0, etc.
- return (f != null) && (f.floatValue() > 4.0);
+ // Check if the console meets the minimum version requirement
+ if ((f != null) && (f.floatValue() > MINIMUM_VERSION)) {
+ return true;
+ } else {
+ DSUtil.showErrorDialog(frame, "neednewconsole", version);
+ }
} catch (Exception e) { // could not parse version as float
}
- DSUtil.showErrorDialog(frame, "neednewconsole", version);
-
return false;
}
@@ -1274,6 +1268,9 @@
static public int SECURITY_DISABLE = 1;
static public int SECURITY_ENABLE = 2;
+ // Minimum required console version
+ private static final float MINIMUM_VERSION = 1.0f;
+
// Icon for the console
private static final String _imageName = "directory.gif";
private static final String AUTH_ICON = "face.gif";
Index: about.properties
===================================================================
RCS file: /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/about.properties,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- about.properties 18 Jul 2005 00:55:43 -0000 1.1.1.1
+++ about.properties 28 Oct 2005 18:01:34 -0000 1.2
@@ -19,7 +19,7 @@
#
# Strings and logos used by the DSAboutDialog
-aboutDialog-dialogTitle=Fedora Directory Server 7.1
+aboutDialog-dialogTitle=Fedora Directory Server 1.0
aboutDialog-productLogo=com/netscape/management/client/images/logo32.gif
aboutDialog-productCopyright=Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.\nCopyright (C) 2005 Red Hat, Inc.\nAll rights reserved.
aboutDialog-productLicense=Fedora is a trademark of Red Hat, Inc. in the United States and other countries and is used by permission.
Index: dirserv.properties
===================================================================
RCS file: /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/dirserv.properties,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- dirserv.properties 18 Jul 2005 00:55:45 -0000 1.1.1.1
+++ dirserv.properties 28 Oct 2005 18:01:34 -0000 1.2
@@ -164,9 +164,9 @@
#
dialog-configtitle=Fedora Directory Server
dsAdmin-title=Fedora Directory Server
-dsAdmin-version=Version 7.1
+dsAdmin-version=Version 1.0
dsAdmin-nsServerPort=Port
-dsAdmin-framework-description=Fedora Directory Server Console 7.1
+dsAdmin-framework-description=Fedora Directory Server Console 1.0
dsAdmin-remove-server-cgi-failed=ds_remove failure
#
From fedora-directory-commits at redhat.com Fri Oct 28 18:01:36 2005
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Fri, 28 Oct 2005 14:01:36 -0400
Subject: [Fedora-directory-commits] directoryconsole build.properties,
1.1.1.1, 1.2 build.xml, 1.1.1.1, 1.2 imports.FC2, 1.1.1.1,
1.2 imports.FC3, 1.1.1.1, 1.2 imports.HP-UX11i, 1.1.1.1,
1.2 imports.Solaris9, 1.1.1.1, 1.2
Message-ID: <200510281802.j9SI2Jpe007386@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/directoryconsole
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7298
Modified Files:
build.properties build.xml imports.FC2 imports.FC3
imports.HP-UX11i imports.Solaris9
Log Message:
171941 - Adjusted the version number and branding. I had to modify the checkVersion method to deal with running in Console 1.0. I also cleaned up references to consolesdk in the Ant build files. They should be console instead since we dropped the consolesdk naming. The external and internal imports files were adjusted to pick up the new 1.0 Console component.
Index: build.properties
===================================================================
RCS file: /cvs/dirsec/directoryconsole/build.properties,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- build.properties 18 Jul 2005 00:55:31 -0000 1.1.1.1
+++ build.properties 28 Oct 2005 18:01:11 -0000 1.2
@@ -21,5 +21,5 @@
lang=en
ldapconsole.root=..
-ldapconsole.version=71
+ldapconsole.version=10
ldapconsole.name=ds${ldapconsole.version}
Index: build.xml
===================================================================
RCS file: /cvs/dirsec/directoryconsole/build.xml,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- build.xml 18 Jul 2005 00:55:32 -0000 1.1.1.1
+++ build.xml 28 Oct 2005 18:01:11 -0000 1.2
@@ -47,7 +47,7 @@
-
+
-
-
-
-
-
+
+
+
+
-
-
+
+
-
+
-
+
Index: imports.FC2
===================================================================
RCS file: /cvs/dirsec/directoryconsole/imports.FC2,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- imports.FC2 18 Jul 2005 00:55:32 -0000 1.1.1.1
+++ imports.FC2 28 Oct 2005 18:01:11 -0000 1.2
@@ -19,5 +19,5 @@
# Defines component import locations for FC2
# Console SDK
-consolesdk.import.location=http://directory.fedora.redhat.com/built/components/consolesdk/70/20050714/RHEL3_x86_gcc3_OPT.OBJ
-consolesdk.import=consolesdk70.tar.gz
+console.import.location=http://directory.fedora.redhat.com/built/components/console/1.0/20051027/RHEL3_x86_gcc3_OPT.OBJ
+console.import=console10.tar.gz
Index: imports.FC3
===================================================================
RCS file: /cvs/dirsec/directoryconsole/imports.FC3,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- imports.FC3 18 Jul 2005 00:55:32 -0000 1.1.1.1
+++ imports.FC3 28 Oct 2005 18:01:11 -0000 1.2
@@ -19,5 +19,5 @@
# Defines component import locations for FC3
# Console SDK
-consolesdk.import.location=http://directory.fedora.redhat.com/built/components/consolesdk/70/20050714/RHEL4_x86_gcc3_OPT.OBJ
-consolesdk.import=consolesdk70.tar.gz
+console.import.location=http://directory.fedora.redhat.com/built/components/console/1.0/20051027/RHEL4_x86_gcc3_OPT.OBJ
+console.import=console10.tar.gz
Index: imports.HP-UX11i
===================================================================
RCS file: /cvs/dirsec/directoryconsole/imports.HP-UX11i,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- imports.HP-UX11i 18 Jul 2005 00:55:32 -0000 1.1.1.1
+++ imports.HP-UX11i 28 Oct 2005 18:01:11 -0000 1.2
@@ -19,5 +19,5 @@
# Defines component import locations for FC2
# Console SDK
-consolesdk.import.location=http://directory.fedora.redhat.com/built/components/consolesdk/70/20050714/HP-UXB.11.11_OPT.OBJ
-consolesdk.import=consolesdk70.tar.gz
+console.import.location=http://directory.fedora.redhat.com/built/components/console/1.0/20051027/HP-UXB.11.11_OPT.OBJ
+console.import=console10.tar.gz
Index: imports.Solaris9
===================================================================
RCS file: /cvs/dirsec/directoryconsole/imports.Solaris9,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- imports.Solaris9 18 Jul 2005 00:55:32 -0000 1.1.1.1
+++ imports.Solaris9 28 Oct 2005 18:01:11 -0000 1.2
@@ -19,5 +19,5 @@
# Defines component import locations for FC2
# Console SDK
-consolesdk.import.location=http://directory.fedora.redhat.com/built/components/consolesdk/70/20050714/SunOS5.9_OPT.OBJ
-consolesdk.import=consolesdk70.tar.gz
+console.import.location=http://directory.fedora.redhat.com/built/components/console/1.0/20051027/SunOS5.9_OPT.OBJ
+console.import=console10.tar.gz
From fedora-directory-commits at redhat.com Fri Oct 28 18:20:08 2005
From: fedora-directory-commits at redhat.com (Robert Crittenden (rcritten))
Date: Fri, 28 Oct 2005 14:20:08 -0400
Subject: [Fedora-directory-commits] mod_nss nss_engine_init.c,1.15,1.16
Message-ID: <200510281820.j9SIK8cx007478@cvs-int.fedora.redhat.com>
Author: rcritten
Update of /cvs/dirsec/mod_nss
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7458
Modified Files:
nss_engine_init.c
Log Message:
Add in check to be sure that the same server isn't initialized with SSL
more than once. This avoids a crash during shutdown where the same
certificates and keys will try to be released multiple times. This is
based on ssl_init_server_check() from mod_ssl.
Index: nss_engine_init.c
===================================================================
RCS file: /cvs/dirsec/mod_nss/nss_engine_init.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- nss_engine_init.c 11 Oct 2005 15:01:34 -0000 1.15
+++ nss_engine_init.c 28 Oct 2005 18:20:01 -0000 1.16
@@ -717,6 +717,19 @@
}
}
+static void nss_init_server_check(server_rec *s,
+ apr_pool_t *p,
+ apr_pool_t *ptemp,
+ modnss_ctx_t *mctx)
+{
+ if (mctx->servercert != NULL || mctx->serverkey != NULL) {
+ ap_log_error(APLOG_MARK, APLOG_ERR, 0, s,
+ "Illegal attempt to re-initialise SSL for server "
+ "(theoretically shouldn't happen!)");
+ nss_die();
+ }
+}
+
static void nss_init_ctx(server_rec *s,
apr_pool_t *p,
apr_pool_t *ptemp,
@@ -895,6 +908,8 @@
apr_pool_t *ptemp,
SSLSrvConfigRec *sc)
{
+ nss_init_server_check(s, p, ptemp, sc->server);
+
nss_init_ctx(s, p, ptemp, sc->server);
nss_init_server_certs(s, p, ptemp, sc->server);
From fedora-directory-commits at redhat.com Fri Oct 28 22:18:24 2005
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Fri, 28 Oct 2005 18:18:24 -0400
Subject: [Fedora-directory-commits]
directoryconsole/src/com/netscape/admin/dirserv DSAdmin.java,
1.2, 1.3
Message-ID: <200510282218.j9SMIO5L014291@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14275
Modified Files:
DSAdmin.java
Log Message:
171941 - checkVersion was comparing versions with greater than when it should have been using greater than or equal to
Index: DSAdmin.java
===================================================================
RCS file: /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/DSAdmin.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DSAdmin.java 28 Oct 2005 18:01:34 -0000 1.2
+++ DSAdmin.java 28 Oct 2005 22:18:17 -0000 1.3
@@ -1236,7 +1236,7 @@
try {
Float f = new Float(version);
// Check if the console meets the minimum version requirement
- if ((f != null) && (f.floatValue() > MINIMUM_VERSION)) {
+ if ((f != null) && (f.floatValue() >= MINIMUM_VERSION)) {
return true;
} else {
DSUtil.showErrorDialog(frame, "neednewconsole", version);
From fedora-directory-commits at redhat.com Fri Oct 28 22:45:14 2005
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Fri, 28 Oct 2005 18:45:14 -0400
Subject: [Fedora-directory-commits] adminserver/mcc mcc.inf,1.4,1.5
Message-ID: <200510282245.j9SMjE0g014754@cvs-int.fedora.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/adminserver/mcc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14435/mcc
Modified Files:
mcc.inf
Log Message:
171942 ??? Change Admin Server version to 1.0
1) changing Admin Server version to 1.0 including ou in the Global preferences
2) picking up Console 1.0, AdminUtil 1.0, SetupUtil 1.0, and mod_admserv
3) removing failover support checking which checks if SIE_VERSION is 4.0 or not.
Index: mcc.inf
===================================================================
RCS file: /cvs/dirsec/adminserver/mcc/mcc.inf,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mcc.inf 18 Aug 2005 19:21:14 -0000 1.4
+++ mcc.inf 28 Oct 2005 22:45:07 -0000 1.5
@@ -25,7 +25,7 @@
Nickname = mcc
Version=%%%VERSION%%%
BuildNumber= %%%BUILD_NUM%%%
-Compatible= 4.0
+Compatible= 1.0
Security=%%%SECURITY%%%
SourcePath=mcc
Archive= nsmcc.zip
From fedora-directory-commits at redhat.com Fri Oct 28 22:44:14 2005
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Fri, 28 Oct 2005 18:44:14 -0400
Subject: [Fedora-directory-commits] adminserver/admserv/newinst/common
setup.inf, 1.5, 1.6
Message-ID: <200510282245.j9SMjEJU014757@cvs-int.fedora.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/adminserver/admserv/newinst/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14435/admserv/newinst/common
Modified Files:
setup.inf
Log Message:
171942 ??? Change Admin Server version to 1.0
1) changing Admin Server version to 1.0 including ou in the Global preferences
2) picking up Console 1.0, AdminUtil 1.0, SetupUtil 1.0, and mod_admserv
3) removing failover support checking which checks if SIE_VERSION is 4.0 or not.
Index: setup.inf
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/common/setup.inf,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- setup.inf 9 Sep 2005 18:48:15 -0000 1.5
+++ setup.inf 28 Oct 2005 22:44:07 -0000 1.6
@@ -30,12 +30,12 @@
Name = Fedora Server Products
Vendor = Fedora Project
Description = Fedora Server Products Installation
-Version = 7.1
+Version = 1.0
Components = svrcore, base, admin, slapd, dssynch, msg, mesg-cntrl, cert, mcc, nda, cal
Mode = ALLMODES
ProgramFolder = Fedora Server Products
#DefaultInstallDirectory works for NT and Unix, NT will set the drive letter to WINDISK
-#DefaultInstallDirectory = /opt/fedora
+#DefaultInstallDirectory = /opt/fedora-ds
# Package Contents
[svrcore]
From fedora-directory-commits at redhat.com Fri Oct 28 22:43:47 2005
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Fri, 28 Oct 2005 18:43:47 -0400
Subject: [Fedora-directory-commits] adminserver/admserv/console/cmdln
admconfig, 1.4, 1.5 admconfig_testscript.bat, 1.2, 1.3
Message-ID: <200510282245.j9SMjH0f014763@cvs-int.fedora.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/adminserver/admserv/console/cmdln
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14435/admserv/console/cmdln
Modified Files:
admconfig admconfig_testscript.bat
Log Message:
171942 ??? Change Admin Server version to 1.0
1) changing Admin Server version to 1.0 including ou in the Global preferences
2) picking up Console 1.0, AdminUtil 1.0, SetupUtil 1.0, and mod_admserv
3) removing failover support checking which checks if SIE_VERSION is 4.0 or not.
Index: admconfig
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/console/cmdln/admconfig,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- admconfig 9 Sep 2005 18:46:23 -0000 1.4
+++ admconfig 28 Oct 2005 22:43:40 -0000 1.5
@@ -35,7 +35,7 @@
SHLIB_PATH=$SRVROOT/lib/jss:$SRVROOT/lib
LIBPATH=$SRVROOT/lib/jss:$SRVROOT/lib
JAVAOPTIONS=-Djava.library.path=$LD_LIBRARY_PATH
-CLASSPATH=./java/nmclf71.jar:./java/ldapjdk.jar:./java/jss3.jar:./java/base.jar:./java/mcc71.jar:./java/jars/admserv71.jar
+CLASSPATH=./java/nmclf10.jar:./java/ldapjdk.jar:./java/jss3.jar:./java/base.jar:./java/mcc10.jar:./java/jars/admserv10.jar
MAINCLASS=com.netscape.management.admserv.cmdln.CommandLine
PLATFORM=`uname`
Index: admconfig_testscript.bat
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/console/cmdln/admconfig_testscript.bat,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- admconfig_testscript.bat 18 Aug 2005 18:59:53 -0000 1.2
+++ admconfig_testscript.bat 28 Oct 2005 22:43:40 -0000 1.3
@@ -22,7 +22,7 @@
REM
REM This batch file can be run from anywhere. The only stipulation is that
REM the and must be provided as the first two
-REM arguments. For example, admconfig_testscript h: as4.0\test
+REM arguments. For example, admconfig_testscript h: asX.X\test
REM
From fedora-directory-commits at redhat.com Fri Oct 28 22:44:47 2005
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Fri, 28 Oct 2005 18:44:47 -0400
Subject: [Fedora-directory-commits] adminserver/base base.inf, 1.5,
1.6 svrcore.inf, 1.4, 1.5
Message-ID: <200510282245.j9SMjHYi014761@cvs-int.fedora.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/adminserver/base
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14435/base
Modified Files:
base.inf svrcore.inf
Log Message:
171942 ??? Change Admin Server version to 1.0
1) changing Admin Server version to 1.0 including ou in the Global preferences
2) picking up Console 1.0, AdminUtil 1.0, SetupUtil 1.0, and mod_admserv
3) removing failover support checking which checks if SIE_VERSION is 4.0 or not.
Index: base.inf
===================================================================
RCS file: /cvs/dirsec/adminserver/base/base.inf,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- base.inf 18 Aug 2005 19:11:42 -0000 1.5
+++ base.inf 28 Oct 2005 22:44:40 -0000 1.6
@@ -30,7 +30,7 @@
Vendor= Fedora Project
Version= %%%VERSION%%%
BuildNumber= %%%BUILD_NUM%%%
-Compatible= 4.0
+Compatible= 1.0
SourcePath=base
Archive=nsclient.zip
Mandatory= true
Index: svrcore.inf
===================================================================
RCS file: /cvs/dirsec/adminserver/base/svrcore.inf,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- svrcore.inf 18 Aug 2005 19:11:42 -0000 1.4
+++ svrcore.inf 28 Oct 2005 22:44:40 -0000 1.5
@@ -25,7 +25,7 @@
Nickname = svrcore
Version=%%%VERSION%%%
BuildNumber= %%%BUILD_NUM%%%
-Compatible= 4.0
+Compatible= 1.0
SourcePath=svrcore
Archive= nssvrcore.zip
Mandatory= true
From fedora-directory-commits at redhat.com Fri Oct 28 22:44:20 2005
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Fri, 28 Oct 2005 18:44:20 -0400
Subject: [Fedora-directory-commits] adminserver/admserv/newinst/insadm
admin.inf, 1.4, 1.5 admin.txt, 1.4, 1.5 config.c, 1.5,
1.6 insadm.c, 1.5, 1.6
Message-ID: <200510282245.j9SMjKPw014769@cvs-int.fedora.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/adminserver/admserv/newinst/insadm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14435/admserv/newinst/insadm
Modified Files:
admin.inf admin.txt config.c insadm.c
Log Message:
171942 ??? Change Admin Server version to 1.0
1) changing Admin Server version to 1.0 including ou in the Global preferences
2) picking up Console 1.0, AdminUtil 1.0, SetupUtil 1.0, and mod_admserv
3) removing failover support checking which checks if SIE_VERSION is 4.0 or not.
Index: admin.inf
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/insadm/admin.inf,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- admin.inf 18 Aug 2005 19:06:21 -0000 1.4
+++ admin.inf 28 Oct 2005 22:44:12 -0000 1.5
@@ -34,7 +34,7 @@
Dependencies=base/%%%VERSION%%%
Version= %%%VERSION%%%
Revision=
-Compatible= 4.0
+Compatible= 1.0
Security=%%%SECURITY%%%
BuildNumber= %%%BUILD_NUM%%%
Registration=FALSE
@@ -65,7 +65,7 @@
Name=Management Console
Description=Used by system administrators to manage other server products.
Version=%%%VERSION%%%
-Compatible= 4.0
+Compatible= 1.0
BuildNumber=%%%BUILD_NUM%%%
IsMCC=TRUE
Checked=TRUE
Index: admin.txt
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/insadm/admin.txt,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- admin.txt 9 Sep 2005 18:48:37 -0000 1.4
+++ admin.txt 28 Oct 2005 22:44:12 -0000 1.5
@@ -1,12 +1,13 @@
-Fedora SuiteSpot 7.1 Administration Server
-Copyright (c) 1996, 1997 by Netscape Communications Corporation
-All Rights Reserved
-
+Fedora Administration Server 1.0
+# BEGIN COPYRIGHT BLOCK
+# Copyright (C) 2005 Red Hat, Inc.
+# All rights reserved.
+# END COPYRIGHT BLOCK
Internal Release Only
---------------------
-This is a developer build of the Administration Server 7.1.
+Fedora Administration Server 1.0
For more information see the release notes at:
http://nightmare/admin-server/admin40/relnote ## obsolete (02/04/2005 at Red
Index: config.c
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/insadm/config.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- config.c 9 Sep 2005 18:48:37 -0000 1.5
+++ config.c 28 Oct 2005 22:44:12 -0000 1.6
@@ -20,6 +20,9 @@
* END COPYRIGHT BLOCK **/
//--------------------------------------------------------------------------//
// //
+// NOTE: This code is for Windows only. This file should be updated //
+// when Windows is supported, again. //
+// //
// Name: Administration Server Configuration //
// Platforms: WIN32 //
// ...................................................................... //
@@ -61,7 +64,6 @@
#include "../common/include/acidef.h"
#define DEFAULT_SYSUSER "root"
-#define DEFAULT_OLDROOT "/usr/ns-home"
#define DEFAULT_TASKCONF "admin-serv/ldif/tasks.ldif"
#define DEFAULT_GLOBALCONF "admin-serv/ldif/global.ldif"
@@ -82,8 +84,8 @@
#define ADM61_ID_SERVICE "admin61-serv" /* old */
#define ADM70_KEY_ROOT "Administration\\7.0" /* prev */
#define ADM70_ID_SERVICE "admin70-serv" /* prev */
-#define ADM71_KEY_ROOT "Administration\\7.1" /* current */
-#define ADM71_ID_SERVICE "admin71-serv" /* current */
+#define ADM10_KEY_ROOT "Administration\\1.0" /* current */
+#define ADM10_ID_SERVICE "admin10-serv" /* current */
/*
@@ -332,7 +334,7 @@
"nsInstalledLocation: %s\n"
"nsExpirationDate: %s\n"
"nsBuildSecurity: %s\n"
- "nsServerMigrationClassname: com.netscape.management.admserv.AdminServerProduct at admserv71.jar\n",
+ "nsServerMigrationClassname: com.netscape.management.admserv.AdminServerProduct at admserv10.jar\n",
cd.szVendor,
cd.szDescription,
cd.szName,
@@ -376,7 +378,7 @@
"nsAdminAccessAddresses: *\n"
"nsAdminOneACLDir: adminacl\n"
"nsDefaultAcceptLanguage: %s\n"
- "nsClassName: com.netscape.management.admserv.AdminServer at admserv71.jar@%s\n"
+ "nsClassName: com.netscape.management.admserv.AdminServer at admserv10.jar@%s\n"
"nsServerPort: %d\n"
"nsSuiteSpotUser: nobody\n"
"nsAdminUsers: admin-serv/config/admpw\n"
@@ -394,7 +396,7 @@
);
sprintf(szUpgrade,
- "nsClassName: com.netscape.management.admserv.AdminServer at admserv71.jar@%s\n"
+ "nsClassName: com.netscape.management.admserv.AdminServer at admserv10.jar@%s\n"
"nsServerPort: %d\n"
"nsSuiteSpotUser: nobody\n",
szTemp,
@@ -796,17 +798,17 @@
char szPath[MAX_PATH];
char szName[MAX_PATH];
- if (cd.nReplaceVersion == 71) /* The current version;
+ if (cd.nReplaceVersion == 10) /* The current version;
target of brandAdminServer */
{
LoadString(mi.m_hModule, IDS_START_ADMINSERVER, szName, sizeof(szName));
- strcat(szName, " 7.1"); /* current */
+ strcat(szName, " 1.0"); /* current */
strcpy(szPath, "\"");
strcpy(szPath, TARGETDIR);
strcat(szPath, "\\start-admin.cmd\"");
RemoveProgramFolderItem(PROGRAM_GROUP_NAME, szName);
- DeleteServer("admin71-serv"); /* current */
- DeleteServerRegistryKeys(ADM71_KEY_ROOT, ADM71_ID_SERVICE); /* current */
+ DeleteServer("admin10-serv"); /* current */
+ DeleteServerRegistryKeys(ADM10_KEY_ROOT, ADM10_ID_SERVICE); /* current */
}
else if (cd.nReplaceVersion == 1)
{
Index: insadm.c
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/insadm/insadm.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- insadm.c 9 Sep 2005 18:48:37 -0000 1.5
+++ insadm.c 28 Oct 2005 22:44:12 -0000 1.6
@@ -20,6 +20,9 @@
* END COPYRIGHT BLOCK **/
//--------------------------------------------------------------------------//
// //
+// NOTE: This code is for Windows only. This file should be updated //
+// when Windows is supported, again. //
+// //
// Name: Administration Server Configuration //
// Platforms: WIN32 //
// Revision History: //
@@ -617,11 +620,11 @@
szVer = setupGetInfString("admin", SETUP_INF_VERSION, NULL, szFilePath);
if (szVer)
{
- if (strcmp(szVer, "7.1") == 0) /* The current version;
- target of brandAdminServer */
+ if (strcmp(szVer, "1.0") == 0) /* The current version;
+ target of brandAdmin */
{
- cd.nReplaceVersion = 71; /* current */
- sprintf(szService, "admin71-serv"); /* current */
+ cd.nReplaceVersion = 10; /* current */
+ sprintf(szService, "admin10-serv"); /* current */
}
else if (strcmp(szVer, "4.0") == 0)
{
@@ -962,10 +965,10 @@
else if (strcmp(f, "jss3.jar") == 0) {
return 1;
}
- else if (strstr(f, "mcc71") == f) {
+ else if (strstr(f, "mcc10") == f) {
return 1;
}
- else if (strstr(f, "nmclf71") == f) {
+ else if (strstr(f, "nmclf10") == f) {
return 1;
}
return 0;
@@ -1079,17 +1082,17 @@
FindClose(hFile);
}
- if (cd.nReplaceVersion == 71) /* The current version;
+ if (cd.nReplaceVersion == 10) /* The current version;
target of brandAdminServer */
{
LoadString(mi.m_hModule, IDS_README, szTemp, sizeof(szTemp));
- strcpy(szName, "Fedora Server Products 7.1"); /* current */
+ strcpy(szName, "Fedora Server Products 1.0"); /* current */
strcat(szName, " ");
strcat(szName, szTemp);
RemoveProgramFolderItem(PROGRAM_GROUP_NAME, szName);
LoadString(mi.m_hModule, IDS_START_ADMINSERVER, szName, sizeof(szName));
strcat(szName, " ");
- strcat(szName, "7.1"); /* current */
+ strcat(szName, "1.0"); /* current */
strcpy(szPath, "\"");
strcpy(szPath, TARGETDIR);
strcat(szPath, "\\start-admin.cmd\"");
@@ -1461,10 +1464,10 @@
szVer = setupGetInfString("admin-client", SETUP_INF_VERSION, NULL, szFile);
if (szVer)
{
- if (strcmp(szVer, "7.1") == 0) /* The current version;
+ if (strcmp(szVer, "1.0") == 0) /* The current version;
target of brandAdminServer */
{
- cd.nReplaceVersion = 71; /* current */
+ cd.nReplaceVersion = 10; /* current */
}
else if (strcmp(szVer, "4.0") == 0)
{
@@ -1507,21 +1510,21 @@
// Create the program manager group icons
//
- if (cd.nReplaceVersion == 71) /* The current version;
+ if (cd.nReplaceVersion == 10) /* The current version;
target of brandAdminServer */
{
- //delete 7.1 readme (current)
+ //delete 1.0 readme (current)
LoadString(mi.m_hModule, IDS_README, szTemp, sizeof(szTemp));
- strcpy(szName, "Fedora Server Products 7.1"); /* current */
+ strcpy(szName, "Fedora Server Products 1.0"); /* current */
strcat(szName, " ");
strcat(szName, szTemp);
RemoveProgramFolderItem(PROGRAM_GROUP_NAME, szName);
- //delete 7.1 console icon (current)
+ //delete 1.0 console icon (current)
strcpy(szPath, "\"");
strcat(szPath, TARGETDIR);
strcat(szPath, "\\startconsole.exe\"");
LoadString(mi.m_hModule, IDS_NETSCAPE_CONSOLE, szName, sizeof(szName));
- strcat(szName, "7.1"); /* current */
+ strcat(szName, "1.0"); /* current */
RemoveProgramFolderItem(PROGRAM_GROUP_NAME, szName);
if (IsProgramFolderEmpty(PROGRAM_GROUP_NAME))
{
From fedora-directory-commits at redhat.com Fri Oct 28 22:44:52 2005
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Fri, 28 Oct 2005 18:44:52 -0400
Subject: [Fedora-directory-commits] adminserver/base/nt base.inf,1.5,1.6
Message-ID: <200510282245.j9SMjN0h014772@cvs-int.fedora.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/adminserver/base/nt
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14435/base/nt
Modified Files:
base.inf
Log Message:
171942 ??? Change Admin Server version to 1.0
1) changing Admin Server version to 1.0 including ou in the Global preferences
2) picking up Console 1.0, AdminUtil 1.0, SetupUtil 1.0, and mod_admserv
3) removing failover support checking which checks if SIE_VERSION is 4.0 or not.
Index: base.inf
===================================================================
RCS file: /cvs/dirsec/adminserver/base/nt/base.inf,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- base.inf 18 Aug 2005 19:12:05 -0000 1.5
+++ base.inf 28 Oct 2005 22:44:45 -0000 1.6
@@ -31,7 +31,7 @@
Description=Shared Files used by Server Products
Vendor= Fedora Project
Version=%%%VERSION%%%
-Compatible=4.0
+Compatible=1.0
BuildNumber=%%%BUILD_NUM%%%
Dependencies=svrcore/6.0
Security=%%%SECURITY%%%
@@ -48,7 +48,7 @@
Name= Core Java Classes
Description=Core Java Classes
Version= %%%VERSION%%%
-Compatible=4.0
+Compatible=1.0
Dependencies=svrcore/6.0
BuildNumber=%%%BUILD_NUM%%%
Security=%%%SECURITY%%%
From fedora-directory-commits at redhat.com Fri Oct 28 22:44:31 2005
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Fri, 28 Oct 2005 18:44:31 -0400
Subject: [Fedora-directory-commits] adminserver/admserv/schema/ldif
global.ldif, 1.5, 1.6 tasks.ldif, 1.5, 1.6 unixtasks.ldif, 1.4, 1.5
Message-ID: <200510282245.j9SMjVPT014802@cvs-int.fedora.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/adminserver/admserv/schema/ldif
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14435/admserv/schema/ldif
Modified Files:
global.ldif tasks.ldif unixtasks.ldif
Log Message:
171942 ??? Change Admin Server version to 1.0
1) changing Admin Server version to 1.0 including ou in the Global preferences
2) picking up Console 1.0, AdminUtil 1.0, SetupUtil 1.0, and mod_admserv
3) removing failover support checking which checks if SIE_VERSION is 4.0 or not.
Index: global.ldif
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/schema/ldif/global.ldif,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- global.ldif 18 Aug 2005 19:08:38 -0000 1.5
+++ global.ldif 28 Oct 2005 22:44:23 -0000 1.6
@@ -33,11 +33,11 @@
ou: admin
nsmerge: ADD_IF_EMPTY
-dn: ou=4.0, ou=Admin, ou=Global Preferences
+dn: ou=1.0, ou=Admin, ou=Global Preferences
objectclass: top
objectclass: organizationalunit
objectclass: extensibleObject
-ou: 4.0
+ou: 1.0
nsmerge: ADD_IF_EMPTY
dn: cn=Common, ou=Global Preferences
@@ -77,25 +77,25 @@
nsmerge: {nsadminenduserhtmlindex}MULTI_MERGE
nsmerge: {nsnickname}MULTI_MERGE
-dn: cn=PublicViews, ou=4.0, ou=Admin, ou=Global Preferences
+dn: cn=PublicViews, ou=1.0, ou=Admin, ou=Global Preferences
objectclass: top
objectclass: nsAdminConsoleUser
cn: PublicViews
aci: (targetattr = "*")(version 3.0; acl "Allow Authenticated Users to Save Public Views"; allow (all) userdn = "ldap:///all";)
-dn: cn=CustomView, ou=4.0, ou=Admin, ou=Global Preferences
+dn: cn=CustomView, ou=1.0, ou=Admin, ou=Global Preferences
objectclass: top
objectclass: nsResourceRef
cn: CustomView
-dn: cn=ResourceEditorExtension, ou=4.0, ou=Admin, ou=Global Preferences
+dn: cn=ResourceEditorExtension, ou=1.0, ou=Admin, ou=Global Preferences
objectclass: top
objectclass: nsResourceRef
objectclass: extensibleObject
cn: ResourceEditorExtension
nsmerge: ADD_IF_EMPTY
-dn: cn=inetorgPerson, cn=ResourceEditorExtension, ou=4.0, ou=Admin, ou=Global Preferences
+dn: cn=inetorgPerson, cn=ResourceEditorExtension, ou=1.0, ou=Admin, ou=Global Preferences
cn: inetorgPerson
objectclass: nsResourceRef
objectclass: nsAdminResourceEditorExtension
@@ -108,7 +108,7 @@
nsclassname: com.netscape.management.client.ug.ResEditorPosixUser
nsmerge: {nsclassname}MULTI_MERGE
-dn: cn=organizationalPerson, cn=ResourceEditorExtension, ou=4.0, ou=Admin, ou=Global Preferences
+dn: cn=organizationalPerson, cn=ResourceEditorExtension, ou=1.0, ou=Admin, ou=Global Preferences
cn: organizationalPerson
objectclass: nsResourceRef
objectclass: nsAdminResourceEditorExtension
@@ -119,7 +119,7 @@
nsclassname: com.netscape.management.client.ug.LanguagePage
nsmerge: {nsclassname}MULTI_MERGE
-dn: cn=groupofuniquenames, cn=ResourceEditorExtension, ou=4.0, ou=Admin, ou=Global Preferences
+dn: cn=groupofuniquenames, cn=ResourceEditorExtension, ou=1.0, ou=Admin, ou=Global Preferences
cn: groupofuniquenames
objectclass: nsResourceRef
objectclass: nsAdminResourceEditorExtension
@@ -135,7 +135,7 @@
nsclassname: com.netscape.management.client.ug.LanguagePage
nsmerge: {nsclassname}MULTI_MERGE
-dn: cn=organizationalunit, cn=ResourceEditorExtension, ou=4.0, ou=Admin, ou=Global Preferences
+dn: cn=organizationalunit, cn=ResourceEditorExtension, ou=1.0, ou=Admin, ou=Global Preferences
cn: organizationalunit
objectclass: nsResourceRef
objectclass: nsAdminResourceEditorExtension
@@ -145,12 +145,12 @@
nsclassname: com.netscape.management.client.ug.LanguagePage
nsmerge: {nsclassname}MULTI_MERGE
-dn: cn=defaultObjectClassesContainer, ou=4.0, ou=Admin, ou=Global Preferences
+dn: cn=defaultObjectClassesContainer, ou=1.0, ou=Admin, ou=Global Preferences
objectclass: top
objectclass: nsResourceRef
cn: DefaultObjectClassesContainer
-dn: cn=user, cn=defaultObjectClassesContainer, ou=4.0, ou=Admin, ou=Global Preferences
+dn: cn=user, cn=defaultObjectClassesContainer, ou=1.0, ou=Admin, ou=Global Preferences
objectclass: top
objectclass: nsResourceRef
objectclass: nsdefaultObjectClasses
@@ -160,7 +160,7 @@
nsdefaultObjectClass: organizationalPerson
nsdefaultObjectClass: inetorgperson
-dn: cn=group, cn=defaultObjectClassesContainer, ou=4.0, ou=Admin, ou=Global Preferences
+dn: cn=group, cn=defaultObjectClassesContainer, ou=1.0, ou=Admin, ou=Global Preferences
objectclass: top
objectclass: nsResourceRef
objectclass: nsdefaultObjectClasses
@@ -168,7 +168,7 @@
nsdefaultObjectClass: top
nsdefaultObjectClass: groupofuniquenames
-dn: cn=ou, cn=defaultObjectClassesContainer, ou=4.0, ou=Admin, ou=Global Preferences
+dn: cn=ou, cn=defaultObjectClassesContainer, ou=1.0, ou=Admin, ou=Global Preferences
objectclass: top
objectclass: nsResourceRef
objectclass: nsdefaultObjectClasses
@@ -176,14 +176,14 @@
nsdefaultObjectClass: top
nsdefaultObjectClass: organizationalunit
-dn: cn=topologyplugin, ou=4.0, ou=Admin, ou=Global Preferences
+dn: cn=topologyplugin, ou=1.0, ou=Admin, ou=Global Preferences
objectclass: top
objectclass: nsResourceRef
objectclass: extensibleObject
cn: topologyplugin
nsmerge: ADD_IF_EMPTY
-dn: cn=defaultplugin, cn=topologyplugin, ou=4.0, ou=Admin, ou=Global Preferences
+dn: cn=defaultplugin, cn=topologyplugin, ou=1.0, ou=Admin, ou=Global Preferences
objectclass: top
objectclass: nstopologyplugin
objectclass: extensibleObject
Index: tasks.ldif
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/schema/ldif/tasks.ldif,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- tasks.ldif 21 Oct 2005 19:19:11 -0000 1.5
+++ tasks.ldif 28 Oct 2005 22:44:23 -0000 1.6
@@ -39,7 +39,7 @@
objectclass: nsAdminObject
nshelpref: admin/stopadm.html
nsexecref: stopsrv
-nsclassname: com.netscape.management.admserv.task.Stop at admserv71.jar
+nsclassname: com.netscape.management.admserv.task.Stop at admserv10.jar
dn: cn=Restart, cn=Operation, cn=Tasks
objectclass: top
@@ -47,7 +47,7 @@
objectclass: nsAdminObject
nshelpref: admin/restartadm.html
nsexecref: restartsrv
-nsclassname: com.netscape.management.admserv.task.Restart at admserv71.jar
+nsclassname: com.netscape.management.admserv.task.Restart at admserv10.jar
dn: cn=Authenticate, cn=Operation, cn=Tasks
objectclass: top
@@ -104,7 +104,7 @@
objectclass: nsAdminObject
nshelpref:
nsexecref: config
-nsclassname: com.netscape.management.admserv.task.ServerSetup at admserv71.jar
+nsclassname: com.netscape.management.admserv.task.ServerSetup at admserv10.jar
dn: cn=DirectorySetup, cn=configuration, cn=Tasks
objectclass: top
@@ -133,7 +133,7 @@
objectclass: nsAdminObject
nshelpref: admin/logging.html
nsexecref: config
-nsclassname: com.netscape.management.admserv.task.Logging at admserv71.jar
+nsclassname: com.netscape.management.admserv.task.Logging at admserv10.jar
dn: cn=SecurityOp, cn=configuration, cn=Tasks
objectclass: top
@@ -148,7 +148,7 @@
objectclass: nsAdminObject
nshelpref: admin/certrequest.html
nsexecref:
-nsclassname: com.netscape.management.admserv.task.CertSetup at admserv71.jar
+nsclassname: com.netscape.management.admserv.task.CertSetup at admserv10.jar
dn: cn=SSLActivate, cn=configuration, cn=Tasks
objectclass: top
Index: unixtasks.ldif
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/schema/ldif/unixtasks.ldif,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- unixtasks.ldif 9 Sep 2005 18:49:22 -0000 1.4
+++ unixtasks.ldif 28 Oct 2005 22:44:23 -0000 1.5
@@ -35,5 +35,5 @@
objectclass: nsAdminObject
nshelpref:
nsexecref: snmpconf
-nsclassname: com.netscape.management.admserv.task.SNMPSetup at admserv71.jar
+nsclassname: com.netscape.management.admserv.task.SNMPSetup at admserv10.jar
From fedora-directory-commits at redhat.com Fri Oct 28 22:43:53 2005
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Fri, 28 Oct 2005 18:43:53 -0400
Subject: [Fedora-directory-commits] adminserver/admserv/console/smartupdate
Makefile, 1.7, 1.8 start.html, 1.5, 1.6
Message-ID: <200510282245.j9SMjNOq014778@cvs-int.fedora.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/adminserver/admserv/console/smartupdate
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14435/admserv/console/smartupdate
Modified Files:
Makefile start.html
Log Message:
171942 ??? Change Admin Server version to 1.0
1) changing Admin Server version to 1.0 including ou in the Global preferences
2) picking up Console 1.0, AdminUtil 1.0, SetupUtil 1.0, and mod_admserv
3) removing failover support checking which checks if SIE_VERSION is 4.0 or not.
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/console/smartupdate/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Makefile 29 Sep 2005 22:11:59 -0000 1.7
+++ Makefile 28 Oct 2005 22:43:45 -0000 1.8
@@ -36,7 +36,7 @@
FIND = /bin/find
endif
-JARVERSION = 71
+JARVERSION = 10
LANGUAGE = en
SMARTUPDATE_DIR = $(PACKAGE_DIR)/..
Index: start.html
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/console/smartupdate/start.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- start.html 9 Sep 2005 18:46:45 -0000 1.5
+++ start.html 28 Oct 2005 22:43:45 -0000 1.6
@@ -23,7 +23,7 @@
-Fedora Management Console 7.1
+Fedora Management Console 1.0
From fedora-directory-commits at redhat.com Fri Oct 28 22:43:58 2005
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Fri, 28 Oct 2005 18:43:58 -0400
Subject: [Fedora-directory-commits]
adminserver/admserv/console/src/com/netscape/management/admserv
AdminServer.java, 1.3, 1.4 AdminServerProduct.java, 1.4,
1.5 admserv.properties, 1.3, 1.4 classes.env, 1.5, 1.6
Message-ID: <200510282245.j9SMjSqb014797@cvs-int.fedora.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/adminserver/admserv/console/src/com/netscape/management/admserv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14435/admserv/console/src/com/netscape/management/admserv
Modified Files:
AdminServer.java AdminServerProduct.java admserv.properties
classes.env
Log Message:
171942 ??? Change Admin Server version to 1.0
1) changing Admin Server version to 1.0 including ou in the Global preferences
2) picking up Console 1.0, AdminUtil 1.0, SetupUtil 1.0, and mod_admserv
3) removing failover support checking which checks if SIE_VERSION is 4.0 or not.
Index: AdminServer.java
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/console/src/com/netscape/management/admserv/AdminServer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AdminServer.java 18 Aug 2005 19:01:02 -0000 1.3
+++ AdminServer.java 28 Oct 2005 22:43:51 -0000 1.4
@@ -37,7 +37,7 @@
import netscape.ldap.*;
/**
- * Netscape admin server 4.0 configuration entry point. The directory
+ * Netscape admin server configuration entry point. The directory
* server needs to contain the name of this class in order for the topology
* view to load this class.
*/
@@ -402,14 +402,6 @@
}
/**
- * Override Migration menu enabled/disabled state.
- * @return true if server is not 4.0 version
- */
- public boolean isMigrationEnabled() {
- return !getProductVersion().equals("4.0");
- }
-
- /**
* Number of entries for this node.
* Implements INodeInfo
*
@@ -421,6 +413,10 @@
return adminUrlNodeDataIndex + 1;
}
+ public boolean isCloningEnabled()
+ {
+ return false;
+ }
/**
* Return node entry at specified index.
Index: AdminServerProduct.java
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/console/src/com/netscape/management/admserv/AdminServerProduct.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AdminServerProduct.java 18 Aug 2005 19:01:03 -0000 1.4
+++ AdminServerProduct.java 28 Oct 2005 22:43:51 -0000 1.5
@@ -45,7 +45,7 @@
/**
- * Netscape admin server 4.0 migration entry point. The directory server
+ * Netscape admin server migration entry point. The directory server
* needs to contain the name of this class in order for the topology
* view to load this class for migrating the admin server.
*
Index: admserv.properties
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/console/src/com/netscape/management/admserv/admserv.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- admserv.properties 18 Aug 2005 19:01:03 -0000 1.3
+++ admserv.properties 28 Oct 2005 22:43:51 -0000 1.4
@@ -22,7 +22,7 @@
# Admin Server Component Localization file
admin-title=Administration Server
-admin-version=Version 6.2
+admin-version=Version 1.0
admin-smallIcon=com/netscape/management/admserv/images/AdminServer.gif
admin-largeIcon=com/netscape/management/admserv/images/AdminServerL.gif
Index: classes.env
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/console/src/com/netscape/management/admserv/classes.env,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- classes.env 9 Sep 2005 18:47:08 -0000 1.5
+++ classes.env 28 Oct 2005 22:43:51 -0000 1.6
@@ -42,7 +42,7 @@
#
#jdk-version=1.2.2 not used? too obsolete. the current version is 1.4.2!
#jfc-version=1.1.1 not used?
-mcc-version=7.1
+mcc-version=1.0
#include-jar0=
#include-jar1=
#backward-compatible=
From fedora-directory-commits at redhat.com Fri Oct 28 22:44:25 2005
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Fri, 28 Oct 2005 18:44:25 -0400
Subject: [Fedora-directory-commits] adminserver/admserv/newinst/src
admin.inf, 1.5, 1.6 ux-config.cc, 1.6, 1.7 ux-config.h, 1.5,
1.6 ux-dialog.cc, 1.8, 1.9 ux-update.cc, 1.12, 1.13
Message-ID: <200510282245.j9SMjQ8E014783@cvs-int.fedora.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/adminserver/admserv/newinst/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14435/admserv/newinst/src
Modified Files:
admin.inf ux-config.cc ux-config.h ux-dialog.cc ux-update.cc
Log Message:
171942 ??? Change Admin Server version to 1.0
1) changing Admin Server version to 1.0 including ou in the Global preferences
2) picking up Console 1.0, AdminUtil 1.0, SetupUtil 1.0, and mod_admserv
3) removing failover support checking which checks if SIE_VERSION is 4.0 or not.
Index: admin.inf
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/admin.inf,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- admin.inf 18 Aug 2005 19:06:43 -0000 1.5
+++ admin.inf 28 Oct 2005 22:44:18 -0000 1.6
@@ -30,7 +30,7 @@
Version= %%%VERSION%%%
NickName= admin
BuildNumber= %%%BUILD_NUM%%%
-Compatible= 4.0
+Compatible= 1.0
Security= %%%SECURITY%%%
Dependencies=base/%%%VERSION%%%
Checked=True
@@ -49,7 +49,7 @@
NickName= admin-client
Version= %%%VERSION%%%
BuildNumber= %%%BUILD_NUM%%%
-Compatible= 4.0
+Compatible= 1.0
Checked=True
Security= %%%SECURITY%%%
Mandatory=False
Index: ux-config.cc
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/ux-config.cc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ux-config.cc 18 Aug 2005 19:06:43 -0000 1.6
+++ ux-config.cc 28 Oct 2005 22:44:18 -0000 1.7
@@ -45,8 +45,6 @@
#include "ux-dialog.h"
extern const char *DEFAULT_SYSUSER = "root";
-extern const char *DEFAULT_OLDROOT = "/usr/ns-home";
-
/*********************************************************************
**
Index: ux-config.h
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/ux-config.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ux-config.h 18 Aug 2005 19:06:43 -0000 1.5
+++ ux-config.h 28 Oct 2005 22:44:18 -0000 1.6
@@ -30,6 +30,12 @@
**
** HISTORY:
** $Log$
+** Revision 1.6 2005/10/28 22:44:18 nhosoi
+** 171942 ??? Change Admin Server version to 1.0
+** 1) changing Admin Server version to 1.0 including ou in the Global preferences
+** 2) picking up Console 1.0, AdminUtil 1.0, SetupUtil 1.0, and mod_admserv
+** 3) removing failover support checking which checks if SIE_VERSION is 4.0 or not.
+**
** Revision 1.5 2005/08/18 19:06:43 rmeggins
** Bug(s) fixed: 166273
** Bug Description: Admin Server: fix copyrights, licensing
@@ -94,7 +100,6 @@
#include "dialog.h"
#include "ux-util.h"
extern const char *DEFAULT_SYSUSER;
-extern const char *DEFAULT_OLDROOT;
class AdminPreInstall:public DialogManager
{
Index: ux-dialog.cc
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/ux-dialog.cc,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ux-dialog.cc 18 Aug 2005 19:06:43 -0000 1.8
+++ ux-dialog.cc 28 Oct 2005 22:44:18 -0000 1.9
@@ -300,7 +300,7 @@
DialogInput askLdapInfo(
"The Administration Server requires the use of an LDAP-based\n"
-"directory server such as the Red Hat Directory Server for \n"
+"directory server such as the Fedora Directory Server for \n"
"resource administration.\n"
"\n"
"Enter the URL of an existing LDAP-based directory server\n"
Index: ux-update.cc
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/ux-update.cc,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ux-update.cc 26 Sep 2005 23:37:45 -0000 1.12
+++ ux-update.cc 28 Oct 2005 22:44:18 -0000 1.13
@@ -64,7 +64,6 @@
#define EPOCH_32BIT_END_TIME "20380118031417" /* minus 1 day */
const char *DEFAULT_SYSUSER = "root";
-const char *DEFAULT_OLDROOT = "/opt/rhserver";
const char *DEFAULT_TASKCONF = "admin-serv/ldif/tasks.ldif";
const char *DEFAULT_GLOBALCONF = "admin-serv/ldif/global.ldif";
@@ -793,7 +792,7 @@
appEntry->addAttribute("installationTimeStamp", adminInfo->timeStamp());
appEntry->addAttribute("nsExpirationDate", adminInfo->get(PKG_EXPIRY));
appEntry->addAttribute("nsBuildSecurity", adminInfo->get(PKG_SECURITY));
- appEntry->addAttribute("nsServerMigrationClassName", "com.netscape.management.admserv.AdminServerProduct at admserv71.jar");
+ appEntry->addAttribute("nsServerMigrationClassName", "com.netscape.management.admserv.AdminServerProduct at admserv10.jar");
sieEntry->clear();
@@ -904,7 +903,7 @@
configEntry->addAttribute ("nsDefaultAcceptLanguage", adminInfo->get(PKG_DEFAULT_LANGUAGE));
- sprintf(tstr, "com.netscape.management.admserv.AdminServer at admserv71.jar@%s", sieDN.data());
+ sprintf(tstr, "com.netscape.management.admserv.AdminServer at admserv10.jar@%s", sieDN.data());
configEntry->addAttribute ("nsClassname", tstr);
// Set the appropriate ACI on for this branch
@@ -915,7 +914,7 @@
else
{
const char *s;
- sprintf(tstr, "com.netscape.management.admserv.AdminServer at admserv71.jar@%s", sieDN.data());
+ sprintf(tstr, "com.netscape.management.admserv.AdminServer at admserv10.jar@%s", sieDN.data());
configEntry->setAttribute ("nsClassname", tstr);
configEntry->setAttribute ("nsServerPort", dir);
configEntry->setAttribute ("nsSuiteSpotUser", adminUser);
From fedora-directory-commits at redhat.com Fri Oct 28 22:43:31 2005
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Fri, 28 Oct 2005 18:43:31 -0400
Subject: [Fedora-directory-commits] adminserver/admserv/cfgstuff
admserv.conf, 1.7, 1.8
Message-ID: <200510282245.j9SMjVK7014803@cvs-int.fedora.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/adminserver/admserv/cfgstuff
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14435/admserv/cfgstuff
Modified Files:
admserv.conf
Log Message:
171942 ??? Change Admin Server version to 1.0
1) changing Admin Server version to 1.0 including ou in the Global preferences
2) picking up Console 1.0, AdminUtil 1.0, SetupUtil 1.0, and mod_admserv
3) removing failover support checking which checks if SIE_VERSION is 4.0 or not.
Index: admserv.conf
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cfgstuff/admserv.conf,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- admserv.conf 9 Sep 2005 19:02:07 -0000 1.7
+++ admserv.conf 28 Oct 2005 22:43:23 -0000 1.8
@@ -25,7 +25,7 @@
SetEnv ADMSERV_ROOT %%%sroot%%%/admin-serv/config/
ADMCacheLifeTime 600
-ADMServerVersionString "Fedora-Administrator/7.1"
+ADMServerVersionString "Fedora-Administrator/1.0"
ScriptAlias /clients/orgchart/bin/ "%%%sroot%%%/clients/orgchart/bin/"
ScriptAlias /clients/dsgw/bin/ "%%%sroot%%%/clients/dsgw/bin/"
From fedora-directory-commits at redhat.com Fri Oct 28 22:44:58 2005
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Fri, 28 Oct 2005 18:44:58 -0400
Subject: [Fedora-directory-commits] adminserver/i18npkg/apollo server.flt,
1.5, 1.6
Message-ID: <200510282245.j9SMjSVp014791@cvs-int.fedora.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/adminserver/i18npkg/apollo
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14435/i18npkg/apollo
Modified Files:
server.flt
Log Message:
171942 ??? Change Admin Server version to 1.0
1) changing Admin Server version to 1.0 including ou in the Global preferences
2) picking up Console 1.0, AdminUtil 1.0, SetupUtil 1.0, and mod_admserv
3) removing failover support checking which checks if SIE_VERSION is 4.0 or not.
Index: server.flt
===================================================================
RCS file: /cvs/dirsec/adminserver/i18npkg/apollo/server.flt,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- server.flt 9 Sep 2005 18:49:44 -0000 1.5
+++ server.flt 28 Oct 2005 22:44:50 -0000 1.6
@@ -19,7 +19,7 @@
#
# END COPYRIGHT BLOCK
-$servername = "Fedora Server 7.1";
+$servername = "Fedora Server 1.0";
# These are subdirectories should be ignored
@ignore_dirs = (
'bin/base/jre/.*',
From fedora-directory-commits at redhat.com Fri Oct 28 22:44:03 2005
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Fri, 28 Oct 2005 18:44:03 -0400
Subject: [Fedora-directory-commits]
adminserver/admserv/console/src/com/netscape/management/admserv/panel
UGDirectoryConfigPanel.java, 1.3, 1.4 panel.properties, 1.3, 1.4
Message-ID: <200510282245.j9SMjYWx014812@cvs-int.fedora.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/adminserver/admserv/console/src/com/netscape/management/admserv/panel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14435/admserv/console/src/com/netscape/management/admserv/panel
Modified Files:
UGDirectoryConfigPanel.java panel.properties
Log Message:
171942 ??? Change Admin Server version to 1.0
1) changing Admin Server version to 1.0 including ou in the Global preferences
2) picking up Console 1.0, AdminUtil 1.0, SetupUtil 1.0, and mod_admserv
3) removing failover support checking which checks if SIE_VERSION is 4.0 or not.
Index: UGDirectoryConfigPanel.java
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/console/src/com/netscape/management/admserv/panel/UGDirectoryConfigPanel.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- UGDirectoryConfigPanel.java 18 Aug 2005 19:02:32 -0000 1.3
+++ UGDirectoryConfigPanel.java 28 Oct 2005 22:43:56 -0000 1.4
@@ -338,16 +338,6 @@
boolean ssl = _cbSSL.isSelected();
int portNum = -1;
- // 4.0 Servers do not support failover. Make sure that
- // a single host:port pair is specified
- if (host.indexOf(" ") != -1) { // space is the list entry delimiter
- ConsoleInfo consoleInfo = ((AdminConfigData)_configData).getConsoleInfo();
- String version = (String) consoleInfo.get("SIE_VERSION");
- if (version.equals("4.0")) {
- String msg = _resource.getString("ldapds","FailoverSupport");
- throw new ValidationException("", msg);
- }
- }
try {
LDAPUtil.validateLDAPParams(host, portNum, ssl, bindDN,
bindPWD, baseDN);
Index: panel.properties
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/console/src/com/netscape/management/admserv/panel/panel.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- panel.properties 18 Aug 2005 19:02:32 -0000 1.3
+++ panel.properties 28 Oct 2005 22:43:56 -0000 1.4
@@ -146,7 +146,6 @@
ldapds-ChangedInfo=You must shutdown and restart your Administration Server and all the\nservers in the Server Group for directory service changes to take effect.
ldapds-WarnMigrate=If you are switching to a new configuration directory, you must first migrate your server configuration from the current directory to the new one. See Directory Server documentation for more information.
ldapds-WarnCert=If you choose to use LDAP with SSL, you must first install a Trusted CA certificate for each server involved. Use the Certificate Setup Wizard to install a Trusted CA certificate.
-ldapds-FailoverSupport=Administration Server 4.0 does not support failover.\nPlease enter a single host:port value
#
# Network panel
From fedora-directory-commits at redhat.com Fri Oct 28 22:45:09 2005
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Fri, 28 Oct 2005 18:45:09 -0400
Subject: [Fedora-directory-commits] adminserver/include/nt regparms.h, 1.6,
1.7
Message-ID: <200510282245.j9SMjdih014823@cvs-int.fedora.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/adminserver/include/nt
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14435/include/nt
Modified Files:
regparms.h
Log Message:
171942 ??? Change Admin Server version to 1.0
1) changing Admin Server version to 1.0 including ou in the Global preferences
2) picking up Console 1.0, AdminUtil 1.0, SetupUtil 1.0, and mod_admserv
3) removing failover support checking which checks if SIE_VERSION is 4.0 or not.
Index: regparms.h
===================================================================
RCS file: /cvs/dirsec/adminserver/include/nt/regparms.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- regparms.h 9 Sep 2005 18:50:29 -0000 1.6
+++ regparms.h 28 Oct 2005 22:45:01 -0000 1.7
@@ -46,19 +46,19 @@
/* Admin IDs */
#define ADM_ID_PRODUCT "admin"
#define ADM_NAME_SHORT "Administration"
-#define ADM_VERSION "7.1"
-#define ADM_NAME_VERSION "Administration 7.1"
+#define ADM_VERSION "1.0"
+#define ADM_NAME_VERSION "Administration 1.0"
#define ADM_NAME_SERVER "Administration Server"
#define ADM_NAME_FULL "Fedora Administration Server"
-#define ADM_NAME_FULL_VERSION "Fedora Administration Server 7.1"
-#define ADM_NAME_SERVICE "Fedora Administration 7.1"
+#define ADM_NAME_FULL_VERSION "Fedora Administration Server 1.0"
+#define ADM_NAME_SERVICE "Fedora Administration 1.0"
#define ADM_EXE "ns-admin.exe"
#define ADM_EXE_START "admin.exe"
-#define ADM_ID_SERVICE "admin71"
-#define ADM_KEY_ROOT "Administration\\7.1"
+#define ADM_ID_SERVICE "admin10"
+#define ADM_KEY_ROOT "Administration\\1.0"
#define ADM_SERVER_LST_NAME "adm:Netscape Enterprise Server"
#define ADM_DIR_ROOT "admin"
-#define ADM_NAME_UNINSTALL "Uninstall Administration Server 7.1"
+#define ADM_NAME_UNINSTALL "Uninstall Administration Server 1.0"
/* original definitions */
// Upper-level registry parameters
From fedora-directory-commits at redhat.com Fri Oct 28 22:43:25 2005
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Fri, 28 Oct 2005 18:43:25 -0400
Subject: [Fedora-directory-commits] adminserver Makefile, 1.14,
1.15 components.mk, 1.37, 1.38 nsconfig.mk, 1.16, 1.17
Message-ID: <200510282245.j9SMjQXM014786@cvs-int.fedora.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/adminserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14435
Modified Files:
Makefile components.mk nsconfig.mk
Log Message:
171942 ??? Change Admin Server version to 1.0
1) changing Admin Server version to 1.0 including ou in the Global preferences
2) picking up Console 1.0, AdminUtil 1.0, SetupUtil 1.0, and mod_admserv
3) removing failover support checking which checks if SIE_VERSION is 4.0 or not.
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/adminserver/Makefile,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Makefile 29 Sep 2005 22:11:57 -0000 1.14
+++ Makefile 28 Oct 2005 22:43:18 -0000 1.15
@@ -107,9 +107,9 @@
@echo ==== Finished Branding Administration Server ==========
versionAdmin: $(RELTOOLS)
- @echo ==== Branding Administration Server ==========
+ @echo ==== Versioning Administration Server ==========
$(PERL5) $(RELTOOLS)/brandver.pl -i branding/fedora/brandver.dat
- @echo ==== Finished Branding Administration Server ==========
+ @echo ==== Finished Versioning Administration Server ==========
normalizeAdmin: $(RELTOOLS)
@echo ==== Normalizing Administration Server ==========
Index: components.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/components.mk,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- components.mk 25 Oct 2005 15:29:07 -0000 1.37
+++ components.mk 28 Oct 2005 22:43:18 -0000 1.38
@@ -158,9 +158,9 @@
# SETUPUTIL
##############################################################
-SETUPUTIL_RELDATE = 20050831
+SETUPUTIL_RELDATE = 20051027
SETUPUTIL_FILE = setuputil.tar.gz
-SETUPUTIL_COMPNAME = setuputil/7.1
+SETUPUTIL_COMPNAME = setuputil/1.0
SETUPUTIL_ROOT = $(NSCP_COMPDIR)/setuputil
@@ -196,11 +196,11 @@
# ADMINUTIL Library
###############################################################
-ADMINUTIL_SUF = 71
-ADMINUTIL_RELDATE = 20050721
+ADMINUTIL_SUF = 10
+ADMINUTIL_RELDATE = 20051026
ADMINUTIL_VERSION = $(ADMINUTIL_RELDATE)
ADMINUTIL_ROOT = $(NSCP_COMPDIR)/adminutil
-ADMINUTIL_COMPNAME = adminutil/7.1
+ADMINUTIL_COMPNAME = adminutil/1.0
ADMINUTILOBJDIR = $(NSOBJDIR_NAME)
@@ -233,8 +233,8 @@
# DOCS
################################################################
-ADMDOC_SUF = 7.1$(BUILD_MODE)
-ADMDOC_RELDATE = 20050309
+ADMDOC_SUF = 1.0$(BUILD_MODE)
+ADMDOC_RELDATE = 20050930
ADMDOC_VERSION = $(ADMDOC_RELDATE)
ADMDOC_PATH = $(NSCP_COMPDIR)/admservdoc
ADMDOC_ABSPATH = $(ABS_ROOT)/components/admservdoc
@@ -313,10 +313,10 @@
# Console java classes
#############################################################
-NMCJDK_SUF = 71
-NMCJDK_RELDATE = 20051024
+NMCJDK_SUF = 10
+NMCJDK_RELDATE = 20051027
-NMCJDK_COMP = console/7.1
+NMCJDK_COMP = console/1.0
NMCJDK_VERSION = $(NMCJDK_RELDATE)
@@ -420,10 +420,10 @@
###########################################################
# mod_admserv #############################################
-MOD_ADMSERV_RELDATE = 20050819
+MOD_ADMSERV_RELDATE = 20051028
#BASE_MOD_ADMSERV = $(COMPONENTS_DIR)/mod_admserv/$(MOD_ADMSERV_RELDATE)/$(NSOBJDIR_NAME)
-BASE_MOD_ADMSERV = $(INT_DIR)/mod_admserv/$(MOD_ADMSERV_RELDATE)/$(NSOBJDIR_NAME)
+BASE_MOD_ADMSERV = $(FED_COMPONENTS_DIR)/mod_admserv/1.0/$(MOD_ADMSERV_RELDATE)/$(NSOBJDIR_NAME)
MOD_ADMSERV = $(MOD_ADMSERV_LIBPATH)/libmodadmserv.$(DLL_SUFFIX)
Index: nsconfig.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/nsconfig.mk,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- nsconfig.mk 7 Oct 2005 21:49:29 -0000 1.16
+++ nsconfig.mk 28 Oct 2005 22:43:18 -0000 1.17
@@ -499,7 +499,7 @@
endif
endif
-ADM_SUF=71
+ADM_SUF=10
# CLEAN THIS UP
@@ -784,7 +784,7 @@
# ADMINUTIL
########################################
-ADMINUTIL_LIB_VERSION=71
+ADMINUTIL_LIB_VERSION=10
ifdef ADMINUTIL_SOURCE_ROOT
ADMINUTIL_LIBPATH = $(ADMINUTIL_SOURCE_ROOT)/built/adminutil/$(PLATFORM_DEST)/lib
ADMINUTIL_INCLUDE = $(ADMINUTIL_SOURCE_ROOT)/built/adminutil/$(PLATFORM_DEST)/include
@@ -841,7 +841,7 @@
# NMCSDK
#########################################
-NMCJDK_JAR_VERSION = 71
+NMCJDK_JAR_VERSION = 10
NMCJDK_JARS = base.jar mcc$(NMCJDK_JAR_VERSION).jar mcc$(NMCJDK_JAR_VERSION)_en.jar nmclf$(NMCJDK_JAR_VERSION).jar nmclf$(NMCJDK_JAR_VERSION)_en.jar
#########################################
From fedora-directory-commits at redhat.com Fri Oct 28 22:43:36 2005
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Fri, 28 Oct 2005 18:43:36 -0400
Subject: [Fedora-directory-commits] adminserver/admserv/cgi-src40
NTRestartService.c, 1.5, 1.6 NTStopService.c, 1.5,
1.6 ugdsconfig.c, 1.4, 1.5
Message-ID: <200510282245.j9SMjb4Q014818@cvs-int.fedora.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/adminserver/admserv/cgi-src40
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14435/admserv/cgi-src40
Modified Files:
NTRestartService.c NTStopService.c ugdsconfig.c
Log Message:
171942 ??? Change Admin Server version to 1.0
1) changing Admin Server version to 1.0 including ou in the Global preferences
2) picking up Console 1.0, AdminUtil 1.0, SetupUtil 1.0, and mod_admserv
3) removing failover support checking which checks if SIE_VERSION is 4.0 or not.
Index: NTRestartService.c
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/NTRestartService.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- NTRestartService.c 9 Sep 2005 18:45:39 -0000 1.5
+++ NTRestartService.c 28 Oct 2005 22:43:29 -0000 1.6
@@ -46,5 +46,5 @@
//--------------------------------------------------------------------------//
int main(int argc, char *argv[])
{
- RestartService("admin71-serv");
+ RestartService("admin10-serv");
}
Index: NTStopService.c
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/NTStopService.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- NTStopService.c 9 Sep 2005 18:45:39 -0000 1.5
+++ NTStopService.c 28 Oct 2005 22:43:29 -0000 1.6
@@ -43,5 +43,5 @@
//--------------------------------------------------------------------------//
int main(int argc, char *argv[])
{
- StopService("admin71-serv");
+ StopService("admin10-serv");
}
Index: ugdsconfig.c
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/ugdsconfig.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ugdsconfig.c 18 Aug 2005 18:59:03 -0000 1.4
+++ ugdsconfig.c 28 Oct 2005 22:43:29 -0000 1.5
@@ -390,7 +390,7 @@
* The name is extractioned from the sie DN. The domain name is the second
* RDN in the sie DN from right to left.
*
- * Example: sie dn="admin-serv-goo,ou=Netscape Adminstration Server,cn=SuiteSpot 4.0,
+ * Example: sie dn="admin-serv-goo,ou=Netscape Adminstration Server,cn=SuiteSpot,
* cn=goo.mcom.com, ou=Netscape SuiteSpot, o=NetscapeRoot"
* The admin domain name is "Netscape SuiteSpot"
* Returning cn=UserDirectory, ou=Globalpreferences,ou=Netscape SuiteSpot,o=NetscapeSuiteSpot
From fedora-directory-commits at redhat.com Fri Oct 28 22:45:03 2005
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Fri, 28 Oct 2005 18:45:03 -0400
Subject: [Fedora-directory-commits] adminserver/include version.h,1.5,1.6
Message-ID: <200510282245.j9SMjXiC014806@cvs-int.fedora.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/adminserver/include
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14435/include
Modified Files:
version.h
Log Message:
171942 ??? Change Admin Server version to 1.0
1) changing Admin Server version to 1.0 including ou in the Global preferences
2) picking up Console 1.0, AdminUtil 1.0, SetupUtil 1.0, and mod_admserv
3) removing failover support checking which checks if SIE_VERSION is 4.0 or not.
Index: version.h
===================================================================
RCS file: /cvs/dirsec/adminserver/include/version.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- version.h 9 Sep 2005 18:50:06 -0000 1.5
+++ version.h 28 Oct 2005 22:44:56 -0000 1.6
@@ -32,14 +32,14 @@
* (miodrag) Note: BASE_VERSION_DEF and MCC_VERSION_DEF are used by SETUPSDK
* build scripts as SETUP_BASE and setup svrcore versions
*/
-#define BASE_VERSION_DEF "7.1"
-#define BASE_VERSION_STRING "Fedora Base components/7.1"
+#define BASE_VERSION_DEF "1.0"
+#define BASE_VERSION_STRING "Fedora Base components/1.0"
-#define MCC_VERSION_DEF "7.1"
-#define MCC_VERSION_STRING "Fedora Management Console/7.1"
+#define MCC_VERSION_DEF "1.0"
+#define MCC_VERSION_STRING "Fedora Management Console/1.0"
-#define ADMSERV_VERSION_DEF "7.1"
-#define ADMSERV_VERSION_STRING "Fedora-Administrator/7.1"
+#define ADMSERV_VERSION_DEF "1.0"
+#define ADMSERV_VERSION_STRING "Fedora-Administrator/1.0"
#define ADMSERV_NAME Fedora Administration Server
#define VI_COMPANYNAME "Fedora Project\0"
From fedora-directory-commits at redhat.com Fri Oct 28 22:44:09 2005
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Fri, 28 Oct 2005 18:44:09 -0400
Subject: [Fedora-directory-commits] adminserver/admserv/constart/nt
constart.cpp, 1.5, 1.6 constart.h, 1.3, 1.4
Message-ID: <200510282245.j9SMjdl3014827@cvs-int.fedora.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/adminserver/admserv/constart/nt
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14435/admserv/constart/nt
Modified Files:
constart.cpp constart.h
Log Message:
171942 ??? Change Admin Server version to 1.0
1) changing Admin Server version to 1.0 including ou in the Global preferences
2) picking up Console 1.0, AdminUtil 1.0, SetupUtil 1.0, and mod_admserv
3) removing failover support checking which checks if SIE_VERSION is 4.0 or not.
Index: constart.cpp
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/constart/nt/constart.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- constart.cpp 9 Sep 2005 18:47:52 -0000 1.5
+++ constart.cpp 28 Oct 2005 22:44:01 -0000 1.6
@@ -311,7 +311,7 @@
GetStartupInfo(&si);
si.dwFlags = STARTF_USESHOWWINDOW;
si.wShowWindow = SW_SHOWDEFAULT;
- si.lpTitle = "Fedora Management Console 7.1 Information Window";
+ si.lpTitle = "Fedora Management Console 1.0 Information Window";
if (bDebugWindow)
{
bSuccess = CreateProcess(
Index: constart.h
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/constart/nt/constart.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- constart.h 18 Aug 2005 19:03:19 -0000 1.3
+++ constart.h 28 Oct 2005 22:44:01 -0000 1.4
@@ -27,8 +27,8 @@
#include "resource.h" // main symbols
#define CONSOLE_CLASSES "\\java"
-#define ADM_ID_SERVICE "admin40"
-#define ADM_KEY_ROOT "Administration\\4.0"
+#define ADM_ID_SERVICE "admin10"
+#define ADM_KEY_ROOT "Administration\\1.0"
#define VALUE_ROOT_PATH "RootPath"
#define KEY_SOFTWARE_NETSCAPE "SOFTWARE\\Netscape"
#define SVR_KEY_ROOT ADM_KEY_ROOT
From fedora-directory-commits at redhat.com Fri Oct 28 22:44:36 2005
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Fri, 28 Oct 2005 18:44:36 -0400
Subject: [Fedora-directory-commits]
adminserver/admserv/sdk40/console/customview customview.ldif,
1.1.1.1, 1.2
Message-ID: <200510282245.j9SMjaHm014815@cvs-int.fedora.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/adminserver/admserv/sdk40/console/customview
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14435/admserv/sdk40/console/customview
Modified Files:
customview.ldif
Log Message:
171942 ??? Change Admin Server version to 1.0
1) changing Admin Server version to 1.0 including ou in the Global preferences
2) picking up Console 1.0, AdminUtil 1.0, SetupUtil 1.0, and mod_admserv
3) removing failover support checking which checks if SIE_VERSION is 4.0 or not.
Index: customview.ldif
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/sdk40/console/customview/customview.ldif,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- customview.ldif 1 Feb 2005 23:14:51 -0000 1.1.1.1
+++ customview.ldif 28 Oct 2005 22:44:29 -0000 1.2
@@ -1,4 +1,4 @@
-dn: cn=SuperMail, cn=CustomView, ou=4.0, ou=Admin, ou=Global Preferences, ou=mcom.com, o=NetscapeRoot
+dn: cn=SuperMail, cn=CustomView, ou=1.0, ou=Admin, ou=Global Preferences, ou=mcom.com, o=NetscapeRoot
cn: SuperMail
objectclass: top
objectclass: nsCustomView
From fedora-directory-commits at redhat.com Fri Oct 28 22:43:42 2005
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Fri, 28 Oct 2005 18:43:42 -0400
Subject: [Fedora-directory-commits] adminserver/admserv/console
build.properties, 1.7, 1.8
Message-ID: <200510282245.j9SMjhU1014830@cvs-int.fedora.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/adminserver/admserv/console
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14435/admserv/console
Modified Files:
build.properties
Log Message:
171942 ??? Change Admin Server version to 1.0
1) changing Admin Server version to 1.0 including ou in the Global preferences
2) picking up Console 1.0, AdminUtil 1.0, SetupUtil 1.0, and mod_admserv
3) removing failover support checking which checks if SIE_VERSION is 4.0 or not.
Index: build.properties
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/console/build.properties,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- build.properties 26 Sep 2005 14:07:18 -0000 1.7
+++ build.properties 28 Oct 2005 22:43:34 -0000 1.8
@@ -21,7 +21,7 @@
# END COPYRIGHT BLOCK
adminconsole.root=../..
-mcc.version=71
+mcc.version=10
admin.core=admserv
admin.console=${admin.core}${mcc.version}
From fedora-directory-commits at redhat.com Fri Oct 28 22:44:42 2005
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Fri, 28 Oct 2005 18:44:42 -0400
Subject: [Fedora-directory-commits]
adminserver/admserv/sdk40/console/topologyplugin
topologyplugin.ldif, 1.1.1.1, 1.2
Message-ID: <200510282245.j9SMjhat014831@cvs-int.fedora.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/adminserver/admserv/sdk40/console/topologyplugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14435/admserv/sdk40/console/topologyplugin
Modified Files:
topologyplugin.ldif
Log Message:
171942 ??? Change Admin Server version to 1.0
1) changing Admin Server version to 1.0 including ou in the Global preferences
2) picking up Console 1.0, AdminUtil 1.0, SetupUtil 1.0, and mod_admserv
3) removing failover support checking which checks if SIE_VERSION is 4.0 or not.
Index: topologyplugin.ldif
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/sdk40/console/topologyplugin/topologyplugin.ldif,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- topologyplugin.ldif 1 Feb 2005 23:14:51 -0000 1.1.1.1
+++ topologyplugin.ldif 28 Oct 2005 22:44:34 -0000 1.2
@@ -1,4 +1,4 @@
-dn: cn=supermailplugin, cn=topologyplugin, ou=4.0, ou=Admin, ou=Global Preferenc
+dn: cn=supermailplugin, cn=topologyplugin, ou=1.0, ou=Admin, ou=Global Preferenc
es, ou=mcom.com, o=NetscapeRoot
objectclass: top
objectclass: nstopologyplugin
From fedora-directory-commits at redhat.com Sat Oct 29 02:21:59 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Fri, 28 Oct 2005 22:21:59 -0400
Subject: [Fedora-directory-commits] ldapserver/ldap/cm Makefile,1.38,1.39
Message-ID: <200510290221.j9T2Lxsh021439@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/cm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21391/ldapserver/ldap/cm
Modified Files:
Makefile
Log Message:
Bug(s) fixed: 171892
Bug Description: parameterize ldapjdk and crimson jar locations
Reviewed by: Noriko, Nathan (Thanks!)
Fix Description: This is also needed for GAR. The xmltools also
ldapjdk.jar, and needs crimson.jar. DSMLGW does not need crimson.jar.
It makes sense to separate these out of the dsmlgw jars. I changed the
dsmlgw build.xml to be able to pickup ldapjdk.jar from a different
location - defaults to the usual dist/classes.
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
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/cm/Makefile,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- Makefile 27 Oct 2005 14:12:40 -0000 1.38
+++ Makefile 29 Oct 2005 02:21:51 -0000 1.39
@@ -106,9 +106,9 @@
endif
ifdef USE_64
-VERSION=-ver 7.1-64bit
+VERSION=-ver 1.0-64bit
else
-VERSION=-ver 7.1
+VERSION=-ver 1.0
endif
ifeq ($(ARCH), HPUX)
@@ -185,10 +185,6 @@
PACKAGE_STAGE_DIR=$(OBJDIR)/package
endif
-ifdef INTERNAL_BUILD
- PERLDAP := perldap
-endif
-
# 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
# symlink to
@@ -225,7 +221,7 @@
ifdef BUILD_PATCH
PATCHINSTDIR = $(ABS_INSTDIR)-SP
-SLAPDSP = slapd-71
+SLAPDSP = slapd-10
endif
INST_TARGET_RESKIT=$(INSTDIR)/reskit
@@ -261,7 +257,7 @@
ifdef BUILD_RPM
# name and version of RPM - must correspond to the spec file - these get branded
RPM_BASE_NAME=fedora
- RPM_VERSION=7.1
+ RPM_VERSION=1.0
RPM_FILE_BASE=$(RPM_BASE_NAME)-ds-$(RPM_VERSION)
RPM_ARCH = $(shell uname -i)
# root dir for RPM built and temp files
@@ -340,8 +336,8 @@
# install the DSMLGW into the client directory
ifeq ($(USE_DSMLGW), 1)
$(MKDIR) $(RELDIR)/clients/dsmlgw
- if [ -d $(NSDIST)/classes/$(AXIS_REL_DIR)/webapps/axis ] ; then \
- $(CP) -R $(NSDIST)/classes/$(AXIS_REL_DIR)/webapps/axis/* $(RELDIR)/clients/dsmlgw/ ; \
+ if [ -d $(DSMLGWJARS_BUILD_DIR)/$(AXIS_REL_DIR)/webapps/axis ] ; then \
+ $(CP) -R $(DSMLGWJARS_BUILD_DIR)/$(AXIS_REL_DIR)/webapps/axis/* $(RELDIR)/clients/dsmlgw/ ; \
fi
$(INSTALL) -m 644 $(NSDIST)/dsmlgw/dsmlgw.jar $(RELDIR)/clients/dsmlgw/WEB-INF/lib
@@ -349,7 +345,7 @@
$(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/clients/dsmlgw/misc/web-app_2_3.dtd $(RELDIR)/clients/dsmlgw/
# now time to move the necessary jars in place
- $(INSTALL) -m 644 $(DSMLGWJARS_BUILD_DIR)/ldapjdk.jar $(RELDIR)/clients/dsmlgw/WEB-INF/lib
+ $(INSTALL) -m 644 $(LDAPJARFILE) $(RELDIR)/clients/dsmlgw/WEB-INF/lib
$(INSTALL) -m 644 $(DSMLGWJARS_BUILD_DIR)/activation.jar $(RELDIR)/clients/dsmlgw/WEB-INF/lib
# if you use the jaxrpc.jar from the axis distribution, you don't need the api file
# or perhaps you need the jaxrpc.jar for building, and jaxrpc-api.jar at runtime, or vice versa
@@ -473,9 +469,9 @@
endif
ifeq ($(USE_JAVATOOLS), 1)
$(INSTALL) -m 644 $(DS_JAR_SRC_PATH)/$(XMLTOOLS_JAR_FILE) $(RELDIR)/$(DS_JAR_DEST_PATH)
- $(INSTALL) -m 644 $(NSDIST)/classes/$(CRIMSONJAR) $(RELDIR)/$(DS_JAR_DEST_PATH)
- if [ -f $(NSDIST)/classes/$(CRIMSON_LICENSE) ] ; then \
- $(INSTALL) -m 644 $(NSDIST)/classes/$(CRIMSON_LICENSE) $(RELDIR)/$(DS_JAR_DEST_PATH) ; \
+ $(INSTALL) -m 644 $(CRIMSONJAR_FILE) $(RELDIR)/$(DS_JAR_DEST_PATH)
+ if [ -f $(CRIMSON_BUILD_DIR)/$(CRIMSON_LICENSE) ] ; then \
+ $(INSTALL) -m 644 $(CRIMSON_BUILD_DIR)/$(CRIMSON_LICENSE) $(RELDIR)/$(DS_JAR_DEST_PATH) ; \
fi
endif
@@ -552,25 +548,6 @@
# For security reason, it's readable only by the owner
chmod 700 $(RELDIR)/bin/slapd/server
-# this is the rule to pull PerLDAP
-ifndef PERLDAP_PULL_METHOD
-PERLDAP_PULL_METHOD = FTP
-endif
-
-$(INSTDIR)/perldap/$(PERLDAP_ZIP_FILE):
-ifdef INTERNAL_BUILD
- $(RM) $@
- $(FTP_PULL) -method $(PERLDAP_PULL_METHOD) \
- -objdir $(dir $@) \
- -componentdir $(PERLDAP_COMPONENT_DIR) \
- -files $(notdir $@),perldap.inf
- @if [ ! -f $@ ] ; \
- then echo "Error: could not get component PERLDAP file $@" ; \
- exit 1 ; \
- fi
- $(PERL) -w fixPerlDAPInf.pl $(dir $@)/perldap.inf
-endif
-
$(INSTDIR)/slapd:
$(MKDIR) -p $@
@@ -580,7 +557,6 @@
# ---THE UNIX PACKAGE---
packageDirectory: $(INSTDIR)/slapd \
- $(INSTDIR)/perldap/$(PERLDAP_ZIP_FILE) \
$(ADMSERV_DEP)
# this gets setup, setup.inf, silent.inf, the zip wrapper, and svrcore, among others
@@ -675,6 +651,7 @@
for file in $(ADMINSERVER_SUBCOMPS) ; \
do rm -rf $(INSTDIR)/$$file ; \
cp -r $(ADMSERV_DIR)/$$file $(INSTDIR)/$$file ; \
+ rm -rf $(INSTDIR)/$$file/unzipped ; \
done ; \
fi
@@ -702,14 +679,14 @@
ifdef BUILD_SHIP
ifndef BUILD_PATCH
cd $(INSTDIR); $(TAR) cvfh - setup.inf setup slapd \
- $(PERLDAP) dsktune $(ADMIN_IMPORTS) | gzip -f > $(BUILD_SHIP)/$(FTPNAMEGZ)
+ dsktune $(ADMIN_IMPORTS) | gzip -f > $(BUILD_SHIP)/$(FTPNAMEGZ)
endif
ifeq ($(DEBUG), optimize)
# $(REMSH) "/u/svbld/bin/preRtm $(BUILD_SHIP) $(FTPNAMEGZ) svbld"
endif
else
cd $(INSTDIR); $(TAR) cvfh - setup.inf setup slapd \
- $(PERLDAP) dsktune $(ADMIN_IMPORTS) | gzip -f > ../all$(NS_BUILD_FLAVOR).tar.gz
+ dsktune $(ADMIN_IMPORTS) | gzip -f > ../all$(NS_BUILD_FLAVOR).tar.gz
endif # BUILD_SHIP
#cp $(INSTDIR).tar.gz $(BUILD_SHIP)
#cp $(INSTDIR)/all$(NS_BUILD_FLAVOR).tar.gz $(BUILD_SHIP)
@@ -882,11 +859,9 @@
SLAPD_DIR=slapd
-_perl: $(INSTDIR)/perldap/$(PERLDAP_ZIP_FILE)
-
# ------------------------- all below this line is packageDirectory --------------------------
-packageDirectory: $(INSTDIR)/$(SLAPD_DIR) _admserv_files _perl _slapd_files _setup_files make_zip
+packageDirectory: $(INSTDIR)/$(SLAPD_DIR) _admserv_files _slapd_files _setup_files make_zip
#-------------------------- admserv rules ----------------------------------------------------
_admserv_files: $(INSTDIR) $(ADMSERV_DEP)
From fedora-directory-commits at redhat.com Sat Oct 29 02:21:48 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Fri, 28 Oct 2005 22:21:48 -0400
Subject: [Fedora-directory-commits] ldapserver buildpaths.mk, 1.7,
1.8 components.mk, 1.33, 1.34 internal_buildpaths.mk, 1.7, 1.8
Message-ID: <200510290222.j9T2MIBk021444@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21391/ldapserver
Modified Files:
buildpaths.mk components.mk internal_buildpaths.mk
Log Message:
Bug(s) fixed: 171892
Bug Description: parameterize ldapjdk and crimson jar locations
Reviewed by: Noriko, Nathan (Thanks!)
Fix Description: This is also needed for GAR. The xmltools also
ldapjdk.jar, and needs crimson.jar. DSMLGW does not need crimson.jar.
It makes sense to separate these out of the dsmlgw jars. I changed the
dsmlgw build.xml to be able to pickup ldapjdk.jar from a different
location - defaults to the usual dist/classes.
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
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: buildpaths.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/buildpaths.mk,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- buildpaths.mk 27 Oct 2005 14:12:33 -0000 1.7
+++ buildpaths.mk 29 Oct 2005 02:21:40 -0000 1.8
@@ -122,7 +122,10 @@
SETUPUTIL_SOURCE_ROOT = $(BUILD_ROOT)/../setuputil
#SETUPUTIL_BUILD_DIR = $(NSCP_DISTDIR_FULL_RTL)/setuputil
-LDAPJDK_SOURCE_DIR = $(MOZILLA_SOURCE_ROOT)
+# it's customary and easier to use the pre-built jars
+#LDAPJDK_SOURCE_DIR = $(MOZILLA_SOURCE_ROOT)
+# Crimson - crimson.jar - http://xml.apache.org/crimson/
+#CRIMSON_SOURCE_DIR = $(BUILD_ROOT)/../crimson
ADMINSERVER_SOURCE_ROOT = $(BUILD_ROOT)/../adminserver
@@ -134,9 +137,7 @@
# Xerces-J - xercesImpl.jar, xml-apis.jar http://xml.apache.org/xerces2-j/download.cgi
# JAF - activation.jar - http://java.sun.com/products/javabeans/glasgow/jaf.html
# JWSDP - jaxrpc-api.jar,jaxrpc.jar,saaj.jar - http://java.sun.com/webservices/downloads/webservicespack.html
-# Crimson - crimson.jar - http://xml.apache.org/crimson/
-# Also the ldapjdk.jar
-# all of these files need to be in the following directory
+# all of these files need to be in the following directory:
DSMLGWJARS_BUILD_DIR = $(BUILD_ROOT)/../dsmlgwjars
PERLDAP_SOURCE_ROOT = $(MOZILLA_SOURCE_ROOT)
Index: components.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/components.mk,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- components.mk 21 Oct 2005 19:21:04 -0000 1.33
+++ components.mk 29 Oct 2005 02:21:40 -0000 1.34
@@ -538,7 +538,8 @@
LDAPJDK = ldapjdk.jar
ifdef LDAPJDK_SOURCE_DIR
LDAPJDK_DIR = $(LDAPJDK_SOURCE_DIR)/directory/java-sdk/dist/packages
-else
+endif
+ifndef LDAPJDK_DIR
LDAPJDK_DIR = $(CLASS_DEST)
endif
LDAPJARFILE=$(LDAPJDK_DIR)/ldapjdk.jar
@@ -552,7 +553,13 @@
CRIMSON_LICENSE = LICENSE.crimson
CRIMSONJAR = crimson.jar
-CRIMSONJAR_FILE = $(CLASS_DEST)/$(CRIMSONJAR)
+ifdef CRIMSON_SOURCE_DIR
+ CRIMSONJAR_BUILD_DIR = $(CRIMSON_SOURCE_DIR)
+endif
+ifndef CRIMSONJAR_BUILD_DIR
+ CRIMSONJAR_BUILD_DIR = $(CLASS_DEST)
+endif
+CRIMSONJAR_FILE = $(CRIMSONJAR_BUILD_DIR)/$(CRIMSONJAR)
ifdef ADMINSERVER_SOURCE_ROOT
ADMSERV_DIR = $(ADMINSERVER_SOURCE_ROOT)/built/package/$(COMPONENT_OBJDIR)
@@ -744,12 +751,13 @@
########### PerLDAP #############
ifdef PERLDAP_SOURCE_ROOT
PERLDAP_BUILT_DIR = $(PERLDAP_SOURCE_ROOT)/directory/perldap/blib
- 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
-# else we're using the pre-built zip file - see ldap/cm/Makefile
+# 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_buildpaths.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/internal_buildpaths.mk,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- internal_buildpaths.mk 27 Oct 2005 14:12:33 -0000 1.7
+++ internal_buildpaths.mk 29 Oct 2005 02:21:40 -0000 1.8
@@ -141,3 +141,11 @@
endif
DSMLGWJARS_BUILD_DIR = $(CLASS_DEST)
+
+LDAPJDK_DIR = $(CLASS_DEST)
+
+CRIMSON_BUILD_DIR = $(CLASS_DEST)
+
+ifndef PERLDAP_SOURCE_ROOT
+PERLDAP_BUILT_DIR = $(NSCP_DISTDIR_FULL_RTL)/perldap
+endif
From fedora-directory-commits at redhat.com Sat Oct 29 02:21:53 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Fri, 28 Oct 2005 22:21:53 -0400
Subject: [Fedora-directory-commits] ldapserver/ldap/clients/dsmlgw Makefile,
1.9, 1.10 build.xml, 1.6, 1.7
Message-ID: <200510290222.j9T2MNYY021448@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/clients/dsmlgw
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21391/ldapserver/ldap/clients/dsmlgw
Modified Files:
Makefile build.xml
Log Message:
Bug(s) fixed: 171892
Bug Description: parameterize ldapjdk and crimson jar locations
Reviewed by: Noriko, Nathan (Thanks!)
Fix Description: This is also needed for GAR. The xmltools also
ldapjdk.jar, and needs crimson.jar. DSMLGW does not need crimson.jar.
It makes sense to separate these out of the dsmlgw jars. I changed the
dsmlgw build.xml to be able to pickup ldapjdk.jar from a different
location - defaults to the usual dist/classes.
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
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/clients/dsmlgw/Makefile,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Makefile 27 Oct 2005 14:12:40 -0000 1.9
+++ Makefile 29 Oct 2005 02:21:46 -0000 1.10
@@ -46,10 +46,10 @@
include $(BUILD_ROOT)/ldap/javarules.mk
all: $(ANT_DEP) $(LDAPJDK_DEP)
- @if [ ! -f $(CLASS_DEST)/axis.jar ]; then \
+ @if [ ! -f $(DSMLGWJARS_BUILD_DIR)/axis.jar ]; then \
cp $(CLASS_DEST)/$(AXIS_REL_DIR)/lib/axis.jar $(CLASS_DEST) ; \
fi
- $(ANT) -Dglobaldist.dir=$(DSMLGWJARS_BUILD_DIR)
+ $(ANT) -Dglobaldist.dir=$(DSMLGWJARS_BUILD_DIR) -Dldapdist.dir=$(LDAPJDK_DIR)
clean:
$(ANT) clean
Index: build.xml
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsmlgw/build.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- build.xml 19 Apr 2005 22:07:19 -0000 1.6
+++ build.xml 29 Oct 2005 02:21:46 -0000 1.7
@@ -45,10 +45,11 @@
+
-
+
From fedora-directory-commits at redhat.com Sat Oct 29 02:28:31 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Fri, 28 Oct 2005 22:28:31 -0400
Subject: [Fedora-directory-commits] ldapserver/ldap/servers/snmp/ntagt
Makefile, 1.5, 1.6 nsldapagt_nt.c, 1.7, 1.8
Message-ID: <200510290228.j9T2SVRl021887@cvs-int.fedora.redhat.com>
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");
From fedora-directory-commits at redhat.com Sat Oct 29 02:27:31 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Fri, 28 Oct 2005 22:27:31 -0400
Subject: [Fedora-directory-commits]
ldapserver/ldap/servers/plugins/referint referint.def, 1.6, 1.7
Message-ID: <200510290228.j9T2SWoD021891@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/referint
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21454/ldapserver/ldap/servers/plugins/referint
Modified Files:
referint.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: referint.def
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/referint/referint.def,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- referint.def 19 Apr 2005 22:07:32 -0000 1.6
+++ referint.def 29 Oct 2005 02:27:24 -0000 1.7
@@ -36,7 +36,7 @@
; All rights reserved.
; END COPYRIGHT BLOCK
;
-DESCRIPTION 'Fedora Directory Server 7 Referint Plugin'
+DESCRIPTION 'Fedora Directory Server 1.0 Referint Plugin'
CODE SHARED READ EXECUTE
DATA SHARED READ WRITE
EXPORTS
From fedora-directory-commits at redhat.com Sat Oct 29 02:26:36 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Fri, 28 Oct 2005 22:26:36 -0400
Subject: [Fedora-directory-commits] ldapserver/ldap/docs README.txt,1.2,1.3
Message-ID: <200510290228.j9T2Sb4b021903@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/docs
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21454/ldapserver/ldap/docs
Modified Files:
README.txt
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.txt
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/docs/README.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- README.txt 5 Apr 2005 00:35:09 -0000 1.2
+++ README.txt 29 Oct 2005 02:26:29 -0000 1.3
@@ -1,5 +1,5 @@
=======================================================================
- Fedora Directory Server 7.1
+ Fedora Directory Server 1.0
=======================================================================
The Fedora Directory Server is subject to the terms detailed in the
@@ -8,4 +8,4 @@
Late-breaking news and information on the Fedora Directory Server is
available at the following location:
- http://fedora.redhat.com/
+ http://directory.fedora.redhat.com
From fedora-directory-commits at redhat.com Sat Oct 29 02:26:08 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Fri, 28 Oct 2005 22:26:08 -0400
Subject: [Fedora-directory-commits] ldapserver/include/nt regparms.h, 1.6,
1.7
Message-ID: <200510290228.j9T2ScdW021907@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/include/nt
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21454/ldapserver/include/nt
Modified Files:
regparms.h
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: regparms.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/include/nt/regparms.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- regparms.h 19 Apr 2005 22:06:47 -0000 1.6
+++ regparms.h 29 Oct 2005 02:26:01 -0000 1.7
@@ -77,19 +77,19 @@
/* Admin IDs */
#define ADM_ID_PRODUCT "admin"
#define ADM_NAME_SHORT "Administration"
-#define ADM_VERSION "7.0"
-#define ADM_NAME_VERSION "Administration 7.0"
+#define ADM_VERSION "1.0"
+#define ADM_NAME_VERSION "Administration 1.0"
#define ADM_NAME_SERVER "Administration Server"
#define ADM_NAME_FULL "Fedora Administration Server"
-#define ADM_NAME_FULL_VERSION "Fedora Administration Server 7.0"
-#define ADM_NAME_SERVICE "Fedora Administration 7.0"
+#define ADM_NAME_FULL_VERSION "Fedora Administration Server 1.0"
+#define ADM_NAME_SERVICE "Fedora Administration 1.0"
#define ADM_EXE "ns-admin.exe"
#define ADM_EXE_START "admin.exe"
-#define ADM_ID_SERVICE "admin70"
-#define ADM_KEY_ROOT "Administration\\7.0"
+#define ADM_ID_SERVICE "admin10"
+#define ADM_KEY_ROOT "Administration\\1.0"
#define ADM_SERVER_LST_NAME "adm:Netscape Enterprise Server"
#define ADM_DIR_ROOT "admin"
-#define ADM_NAME_UNINSTALL "Uninstall Administration Server 7.0"
+#define ADM_NAME_UNINSTALL "Uninstall Administration Server 1.0"
#if defined( NS_DS )
#define ADMIN_SERVICE_NAME "Admin Server"
@@ -249,15 +249,15 @@
/* Synchronization Service IDs */
#define DSS_SHORT_NAME "Directory Synchronization Service"
#define DSS_SERVER_NAME "Fedora Directory Synchronization Service"
-#define DSS_SERVER_VERSION "7"
+#define DSS_SERVER_VERSION "1"
#define DSS_SETUP_SHORT_NAME "Fedora Synchronization Service"
-#define DSS_SETUP_NAME "Fedora Directory Synchronization Service 7"
+#define DSS_SETUP_NAME "Fedora Directory Synchronization Service 1"
#define DSS_REGISTRY_ROOT_KEY "Directory Synchronization Service"
#define DSS_EXE "dssynch.exe"
#define DSS_DIR_ROOT "dssynch"
#define DSS_APP_PATH_KEY "dssynch.exe"
#define DSS_CONFIG_TOOL "synchcfg.exe"
-#define DSS_UNINSTALL_KEY "SynchronizationV7"
+#define DSS_UNINSTALL_KEY "SynchronizationV1"
#define DSS_SERVER_LST_NAME "dssynch:Netscape Directory Synchronization Service"
#define DSS_SERVICE_PREFIX "Fedora Directory Synchronization Service "
#define DSS_README_ICON_NAME "Directory Synchronization Service README"
@@ -378,35 +378,35 @@
*/
#define DS_SHORT_NAME "Directory Server"
#define DS_SERVER_NAME "Fedora Directory Server"
-#define DS_SERVER_VERSION "7"
+#define DS_SERVER_VERSION "1"
#define DS_SETUP_SHORT_NAME "Directory Server"
-#define DS_SETUP_NAME "Fedora Directory Server 7"
+#define DS_SETUP_NAME "Fedora Directory Server 1"
#define DS_REGISTRY_ROOT_KEY "Directory Server"
#define DS_APP_PATH_KEY "ns-slapd.exe"
-#define DS_UNINSTALL_KEY "DirectoryV7"
+#define DS_UNINSTALL_KEY "DirectoryV1"
#define DS_SERVICE_PREFIX "Fedora Directory Server "
-#define DS_README_ICON_NAME "Directory Server 7 README"
-#define DS_UNINSTALL_ICON_NAME "Uninstall Directory Server 7"
+#define DS_README_ICON_NAME "Directory Server 1 README"
+#define DS_UNINSTALL_ICON_NAME "Uninstall Directory Server 1"
#define DS_PRODUCT_NAME "slapd"
#define DS_ID_PRODUCT "slapd"
#define DS_NAME_SHORT "Directory"
#define DS_VERSION_OLD "3.0"
#undef DS_VERSION
-#define DS_VERSION "7"
-#define DS_NAME_VERSION "Directory 7"
+#define DS_VERSION "1"
+#define DS_NAME_VERSION "Directory 1"
#define DS_NAME_SERVER "Directory Server"
#define DS_NAME_FULL "Fedora Directory Server"
-#define DS_NAME_FULL_VERSION "Fedora Directory Server 7"
-#define DS_NAME_SERVICE "Fedora Directory 7"
+#define DS_NAME_FULL_VERSION "Fedora Directory Server 1"
+#define DS_NAME_SERVICE "Fedora Directory 1"
#define DS_EXE "ns-slapd.exe"
#define DS_EXE_START "slapd.exe"
#define DS_ID_SERVICE "slapd"
-#define DS_KEY_ROOT "Directory\\7"
+#define DS_KEY_ROOT "Directory\\1"
#define DS_KEY_ROOT_OLD "Directory\\3.0"
#define DS_SERVER_LST_NAME "slapd:Fedora Directory Server"
#define DS_DIR_ROOT "slapd"
-#define DS_NAME_UNINSTALL "Uninstall Directory Server 7"
+#define DS_NAME_UNINSTALL "Uninstall Directory Server 1"
#define DS_SNMP_PATH "bin\\slapd\\server\\ns-ldapagt.dll"
#define DS_OPTIONS "Select the installation option from below"
#define DS_OPTIONS_TITLE "Directory Server Installions Options"
From fedora-directory-commits at redhat.com Sat Oct 29 02:26:03 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Fri, 28 Oct 2005 22:26:03 -0400
Subject: [Fedora-directory-commits] ldapserver/include version.h,1.6,1.7
Message-ID: <200510290228.j9T2SXoL021894@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/include
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21454/ldapserver/include
Modified Files:
version.h
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: version.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/include/version.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- version.h 19 Apr 2005 22:06:43 -0000 1.6
+++ version.h 29 Oct 2005 02:25:55 -0000 1.7
@@ -44,18 +44,18 @@
exist, the PRODUCT_VERSION define has _DEF appended.
*/
-#define DIRECTORY_VERSION_DEF "7.1"
+#define DIRECTORY_VERSION_DEF "1.0"
#define DIRECTORY_COMPATIBLE "3.0"
-#define DIRECTORY_VERSION_STRING "Fedora-DirServer/7.1"
+#define DIRECTORY_VERSION_STRING "Fedora-DirServer/1.0"
#define DS_VERSION_DEF DIRECTORY_VERSION_DEF
#define DS_VERSION_STRING DIRECTORY_VERSION_STRING
#define DSS_VERSION_DEF DIRECTORY_VERSION_DEF
-#define DSS_VERSION_STRING "Fedora-DirSynchService/7.1"
+#define DSS_VERSION_STRING "Fedora-DirSynchService/1.0"
-#define ADMSERV_VERSION_DEF "7.0"
-#define ADMSERV_VERSION_STRING "Fedora-Administrator/7.0"
+#define ADMSERV_VERSION_DEF "1.0"
+#define ADMSERV_VERSION_STRING "Fedora-Administrator/1.0"
/* supposedly the trunk is currently the home of 3.x development */
#define ENTERPRISE_VERSION_DEF "3.01"
From fedora-directory-commits at redhat.com Sat Oct 29 02:28:04 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Fri, 28 Oct 2005 22:28:04 -0400
Subject: [Fedora-directory-commits] ldapserver/ldap/servers/plugins/uiduniq
libuiduniq.def, 1.6, 1.7
Message-ID: <200510290228.j9T2SYIR021897@cvs-int.fedora.redhat.com>
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
From fedora-directory-commits at redhat.com Sat Oct 29 02:26:31 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Fri, 28 Oct 2005 22:26:31 -0400
Subject: [Fedora-directory-commits] ldapserver/ldap/cm/newinstnt dsinst.rc,
1.7, 1.8
Message-ID: <200510290228.j9T2SV2b021890@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/cm/newinstnt
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21454/ldapserver/ldap/cm/newinstnt
Modified Files:
dsinst.rc
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: dsinst.rc
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinstnt/dsinst.rc,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- dsinst.rc 1 Sep 2005 01:11:20 -0000 1.7
+++ dsinst.rc 29 Oct 2005 02:26:22 -0000 1.8
@@ -83,13 +83,13 @@
BLOCK "040904b0"
BEGIN
VALUE "CompanyName", "Fedora\0"
- VALUE "FileDescription", "Directory Server 7.1\0"
+ VALUE "FileDescription", "Directory Server 1.0\0"
VALUE "FileVersion", "1, 0, 0, 1\0"
- VALUE "InternalName", "Directory Server 7.1\0"
+ VALUE "InternalName", "Directory Server 1.0\0"
VALUE "LegalCopyright", "Copyright 2001 Sun Microsystems, Inc. Portions copyright 1999, 2002 Netscape Communications Corporation. All rights reserved.\0"
VALUE "OriginalFilename", "\0"
VALUE "ProductName", "Fedora Server Products\0"
- VALUE "ProductVersion", "7, 1, 0, 0\0"
+ VALUE "ProductVersion", "1, 0, 0, 0\0"
END
END
BLOCK "VarFileInfo"
@@ -134,7 +134,7 @@
IDD_MCC_SETTINGS DIALOG DISCARDABLE 0, 0, 297, 163
STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Directory Server 7.1"
+CAPTION "Directory Server 1.0"
FONT 8, "MS Sans Serif"
BEGIN
EDITTEXT IDC_EDIT_HOST,158,68,103,13,ES_AUTOHSCROLL | WS_DISABLED
@@ -165,7 +165,7 @@
IDD_ROOTDN DIALOG DISCARDABLE 0, 0, 297, 163
STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Directory Server 7.1 Directory Manager Settings"
+CAPTION "Directory Server 1.0 Directory Manager Settings"
FONT 8, "MS Sans Serif"
BEGIN
CONTROL 102,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,0,0,85,160
@@ -190,7 +190,7 @@
IDD_SUITESPOTID DIALOG DISCARDABLE 0, 0, 297, 163
STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
CAPTION
-"Directory Server 7.1 Fedora configuration directory server administrator "
+"Directory Server 1.0 Fedora configuration directory server administrator "
FONT 8, "MS Sans Serif"
BEGIN
@@ -212,7 +212,7 @@
IDD_SERVER_SETTINGS DIALOG DISCARDABLE 0, 0, 297, 163
STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Directory Server 7.1 Server Settings"
+CAPTION "Directory Server 1.0 Server Settings"
FONT 8, "MS Sans Serif"
BEGIN
GROUPBOX "General Settings",IDC_STATIC_GENERAL_SETTINGS,97,33,194,
@@ -234,7 +234,7 @@
IDD_SAMPLE_ENTRIES_ORG DIALOG DISCARDABLE 0, 0, 377, 179
STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Directory Server 7.1 Populate Database"
+CAPTION "Directory Server 1.0 Populate Database"
FONT 8, "MS Sans Serif"
BEGIN
GROUPBOX "Sample Organizational Structure",
@@ -266,7 +266,7 @@
IDD_CONSUMER_REPLICATION_SETTINGS DIALOG DISCARDABLE 0, 0, 297, 163
STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Directory Server 7.1 Consumer Replication Settings"
+CAPTION "Directory Server 1.0 Consumer Replication Settings"
FONT 8, "MS Sans Serif"
BEGIN
CONTROL 102,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,0,0,85,160
@@ -289,7 +289,7 @@
IDD_SUPPLIER_REPLICATION_SETTINGS DIALOG DISCARDABLE 0, 0, 297, 163
STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Directory Server 7.1 Supplier Replication Settings"
+CAPTION "Directory Server 1.0 Supplier Replication Settings"
FONT 8, "MS Sans Serif"
BEGIN
CONTROL 102,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,0,0,85,160
@@ -307,7 +307,7 @@
IDD_CONSUMER_DN DIALOG DISCARDABLE 0, 0, 297, 163
STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Directory Server 7.1 Consumer DN Settings "
+CAPTION "Directory Server 1.0 Consumer DN Settings "
FONT 8, "MS Sans Serif"
BEGIN
CONTROL 102,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,0,0,85,160
@@ -332,7 +332,7 @@
IDD_REPLICATION_AGREEMENT DIALOG DISCARDABLE 0, 0, 297, 163
STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Directory Server 7.1 Configure Replication Agreement"
+CAPTION "Directory Server 1.0 Configure Replication Agreement"
FONT 8, "MS Sans Serif"
BEGIN
EDITTEXT IDC_EDIT_HOST,159,13,80,13,ES_AUTOHSCROLL
@@ -388,7 +388,7 @@
IDD_CHOOSE_REPLICATION_SETUP DIALOG DISCARDABLE 0, 0, 297, 163
STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Directory Server 7.1 Configure Server for Replication"
+CAPTION "Directory Server 1.0 Configure Server for Replication"
FONT 8, "MS Sans Serif"
BEGIN
CONTROL "A Consumer that will pull updates",
@@ -426,7 +426,7 @@
IDD_DISABLE_SCHEMA_CHECKING DIALOG DISCARDABLE 0, 0, 297, 163
STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Directory Server 7.1 Disable Schema Checking"
+CAPTION "Directory Server 1.0 Disable Schema Checking"
FONT 8, "MS Sans Serif"
BEGIN
CONTROL 102,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,0,0,85,160
@@ -443,7 +443,7 @@
IDD_ADMIN_DOMAIN DIALOG DISCARDABLE 0, 0, 297, 163
STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Directory Server 7.1 Administration Domain"
+CAPTION "Directory Server 1.0 Administration Domain"
FONT 8, "MS Sans Serif"
BEGIN
CONTROL 102,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,0,0,85,160
@@ -462,7 +462,7 @@
IDD_REINSTALL_CONFIG DIALOG DISCARDABLE 0, 0, 297, 163
STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Directory Server 7.1 Reinstall Settings"
+CAPTION "Directory Server 1.0 Reinstall Settings"
FONT 8, "MS Sans Serif"
BEGIN
CONTROL 102,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,0,0,85,160
@@ -489,7 +489,7 @@
IDD_ADMIN_ID_ONLY DIALOG DISCARDABLE 0, 0, 297, 163
STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
CAPTION
-"Directory Server 7.1 Fedora configuration directory server administrator "
+"Directory Server 1.0 Fedora configuration directory server administrator "
FONT 8, "MS Sans Serif"
BEGIN
From fedora-directory-commits at redhat.com Sat Oct 29 02:27:37 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Fri, 28 Oct 2005 22:27:37 -0400
Subject: [Fedora-directory-commits]
ldapserver/ldap/servers/plugins/replication replication.def,
1.6, 1.7
Message-ID: <200510290228.j9T2SbH7021906@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/replication
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21454/ldapserver/ldap/servers/plugins/replication
Modified Files:
replication.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: replication.def
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/replication.def,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- replication.def 19 Apr 2005 22:07:33 -0000 1.6
+++ replication.def 29 Oct 2005 02:27:29 -0000 1.7
@@ -38,7 +38,7 @@
;
;
;
-DESCRIPTION 'Fedora Directory Server 7.1 Replication Plugin'
+DESCRIPTION 'Fedora Directory Server 1.0 Replication Plugin'
;CODE SHARED READ EXECUTE
;DATA SHARED READ WRITE
EXPORTS
From fedora-directory-commits at redhat.com Sat Oct 29 02:26:42 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Fri, 28 Oct 2005 22:26:42 -0400
Subject: [Fedora-directory-commits] ldapserver/ldap/ldif roledit.ldif, 1.5,
1.6 tasks.ldif, 1.6, 1.7
Message-ID: <200510290228.j9T2Sgdi021920@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/ldif
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21454/ldapserver/ldap/ldif
Modified Files:
roledit.ldif tasks.ldif
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: roledit.ldif
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/ldif/roledit.ldif,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- roledit.ldif 19 Apr 2005 22:07:26 -0000 1.5
+++ roledit.ldif 29 Oct 2005 02:26:34 -0000 1.6
@@ -44,39 +44,39 @@
ou: admin
nsmerge: ADD_IF_EMPTY
-dn: ou=4.0, ou=Admin, ou=Global Preferences
+dn: ou=1.0, ou=Admin, ou=Global Preferences
objectclass: top
objectclass: organizationalunit
objectclass: extensibleObject
-ou: 4.0
+ou: 1.0
nsmerge: ADD_IF_EMPTY
-dn: cn=ResourceEditorExtension, ou=4.0, ou=Admin, ou=Global Preferences
+dn: cn=ResourceEditorExtension, ou=1.0, ou=Admin, ou=Global Preferences
objectclass: top
objectclass: nsResourceRef
objectclass: extensibleObject
cn: ResourceEditorExtension
nsmerge: ADD_IF_EMPTY
-dn: cn=nsroledefinition, cn=ResourceEditorExtension, ou=4.0, ou=Admin, ou=Global Preferences
+dn: cn=nsroledefinition, cn=ResourceEditorExtension, ou=1.0, ou=Admin, ou=Global Preferences
cn: nsroledefinition
objectclass: top
objectclass: extensibleObject
objectclass: nsResourceRef
objectclass: nsAdminResourceEditorExtension
-nsclassname: com.netscape.admin.dirserv.roledit.ResEditorRoleInfo at ds71.jar
-nsclassname: com.netscape.admin.dirserv.roledit.ResEditorRoleMembers at ds71.jar
-nsclassname: com.netscape.admin.dirserv.roledit.ResEditorRoleAccountPage at ds71.jar
+nsclassname: com.netscape.admin.dirserv.roledit.ResEditorRoleInfo at ds10.jar
+nsclassname: com.netscape.admin.dirserv.roledit.ResEditorRoleMembers at ds10.jar
+nsclassname: com.netscape.admin.dirserv.roledit.ResEditorRoleAccountPage at ds10.jar
nsmerge: {nsclassname}MULTI_MERGE
-dn: cn=cossuperdefinition, cn=ResourceEditorExtension, ou=4.0, ou=Admin, ou=Global Preferences
+dn: cn=cossuperdefinition, cn=ResourceEditorExtension, ou=1.0, ou=Admin, ou=Global Preferences
cn: cossuperdefinition
objectclass: top
objectclass: extensibleObject
objectclass: nsResourceRef
objectclass: nsAdminResourceEditorExtension
-nsclassname: com.netscape.admin.dirserv.cosedit.ResEditorCosInfo at ds71.jar
-nsclassname: com.netscape.admin.dirserv.cosedit.ResEditorCosAttributes at ds71.jar
-nsclassname: com.netscape.admin.dirserv.cosedit.ResEditorCosTemplate at ds71.jar
+nsclassname: com.netscape.admin.dirserv.cosedit.ResEditorCosInfo at ds10.jar
+nsclassname: com.netscape.admin.dirserv.cosedit.ResEditorCosAttributes at ds10.jar
+nsclassname: com.netscape.admin.dirserv.cosedit.ResEditorCosTemplate at ds10.jar
nsmerge: {nsclassname}MULTI_MERGE
Index: tasks.ldif
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/ldif/tasks.ldif,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- tasks.ldif 21 Oct 2005 19:21:19 -0000 1.6
+++ tasks.ldif 29 Oct 2005 02:26:34 -0000 1.7
@@ -62,60 +62,60 @@
objectclass: top
objectclass: nstask
objectclass: nsAdminObject
-nsClassname: com.netscape.admin.dirserv.task.Start at ds71.jar
+nsClassname: com.netscape.admin.dirserv.task.Start at ds10.jar
nsexecref: start
dn: cn=stop, cn=Operation, cn=Tasks
objectclass: top
objectclass: nstask
objectclass: nsAdminObject
-nsClassname: com.netscape.admin.dirserv.task.Stop at ds71.jar
+nsClassname: com.netscape.admin.dirserv.task.Stop at ds10.jar
nsexecref: shutdown
dn: cn=restart, cn=Operation, cn=Tasks
objectclass: top
objectclass: nstask
objectclass: nsAdminObject
-nsClassname: com.netscape.admin.dirserv.task.Restart at ds71.jar
+nsClassname: com.netscape.admin.dirserv.task.Restart at ds10.jar
nsexecref: restart
dn: cn=Backup, cn=operation, cn=Tasks
objectclass: top
objectclass: nstask
objectclass: nsAdminObject
-nsClassname: com.netscape.admin.dirserv.task.Backup at ds71.jar
+nsClassname: com.netscape.admin.dirserv.task.Backup at ds10.jar
nsexecref: ds_db2bak
dn: cn=Restore, cn=operation, cn=Tasks
objectclass: top
objectclass: nstask
objectclass: nsAdminObject
-nsClassname: com.netscape.admin.dirserv.task.Restore at ds71.jar
+nsClassname: com.netscape.admin.dirserv.task.Restore at ds10.jar
nsexecref: ds_bak2db
dn: cn=KeyCert, cn=operation, cn=Tasks
objectclass: top
objectclass: nstask
objectclass: nsAdminObject
-nsClassname: com.netscape.admin.dirserv.task.KeyCert at ds71.jar
+nsClassname: com.netscape.admin.dirserv.task.KeyCert at ds10.jar
dn: cn=Authenticate, cn=operation, cn=Tasks
objectclass: top
objectclass: nstask
objectclass: nsAdminObject
-nsClassname: com.netscape.admin.dirserv.task.Authenticate at ds71.jar
+nsClassname: com.netscape.admin.dirserv.task.Authenticate at ds10.jar
dn: cn=CompleteImport, cn=operation, cn=Tasks
objectclass: top
objectclass: nstask
objectclass: nsAdminObject
-nsClassname: com.netscape.admin.dirserv.task.CompleteImport at ds71.jar
+nsClassname: com.netscape.admin.dirserv.task.CompleteImport at ds10.jar
dn: cn=CompleteExport, cn=operation, cn=Tasks
objectclass: top
objectclass: nstask
objectclass: nsAdminObject
-nsClassname: com.netscape.admin.dirserv.task.CompleteExport at ds71.jar
+nsClassname: com.netscape.admin.dirserv.task.CompleteExport at ds10.jar
dn: cn=Export, cn=operation, cn=Tasks
objectclass: top
From fedora-directory-commits at redhat.com Sat Oct 29 02:26:13 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Fri, 28 Oct 2005 22:26:13 -0400
Subject: [Fedora-directory-commits] ldapserver/ldap/admin/src
configure_instance.cpp, 1.8, 1.9 updatedsgw, 1.7, 1.8
Message-ID: <200510290228.j9T2Sior021935@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/admin/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21454/ldapserver/ldap/admin/src
Modified Files:
configure_instance.cpp updatedsgw
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: configure_instance.cpp
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/configure_instance.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- configure_instance.cpp 21 Oct 2005 19:21:10 -0000 1.8
+++ configure_instance.cpp 29 Oct 2005 02:26:06 -0000 1.9
@@ -133,7 +133,7 @@
// name of script file to generate relative to slapd instance directory
#define SCRIPT_FILE_NAME "start-console"
-#define DS_JAR_FILE_NAME "ds71.jar"
+#define DS_JAR_FILE_NAME "ds10.jar"
#define DS_CONSOLE_CLASS_NAME "com.netscape.admin.dirserv.DSAdmin"
#ifdef XP_WIN32
Index: updatedsgw
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/updatedsgw,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- updatedsgw 21 Oct 2005 19:21:10 -0000 1.7
+++ updatedsgw 29 Oct 2005 02:26:06 -0000 1.8
@@ -50,7 +50,7 @@
if (!getopts('h:i:d:e:s:t:n:') || !$opt_n || !$opt_h ) {
print "usage: " . $0 . " -n nshome -h current_slapd_host:current_slapd_port [options]\n";
print "\nrequired:\n";
- print " -n directory\tthe directory where 7.1 is installed (NS-HOME)\n";
+ print " -n directory\tthe directory where 1.0 is installed (NS-HOME)\n";
print " -h host[:port]\tthe current host and port of the directory server\n";
print " \tto which the gateway connects.\n";
print "\noptions:\n";
@@ -59,7 +59,7 @@
print " -t suffix\t\tthe new ESCAPED suffix of the directory server\n";
print " -d dirmgrdn\t\tthe old manager dn of the directory server\n";
print " -e dirmgrdn\t\tthe new manager dn of the directory server\n";
- print "\nexample:\n " . $0 . " -n /home/servers/ds71/ -h gargoyle:1974 -i brooklyn -s \"dc=example,dc=com\" -t \"o%3Dredhat.com\" -d \"cn=directory manager\" -e \"cn=directory guru\"\n";
+ print "\nexample:\n " . $0 . " -n /home/servers/ds10/ -h gargoyle:1974 -i brooklyn -s \"dc=example,dc=com\" -t \"o%3Ddirectory.fedora.redhat.com\" -d \"cn=directory manager\" -e \"cn=directory guru\"\n";
exit;
}
From fedora-directory-commits at redhat.com Sat Oct 29 02:27:04 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Fri, 28 Oct 2005 22:27:04 -0400
Subject: [Fedora-directory-commits] ldapserver/ldap/servers/plugins/cos
cos.def, 1.6, 1.7
Message-ID: <200510290228.j9T2SYuK021898@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/cos
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21454/ldapserver/ldap/servers/plugins/cos
Modified Files:
cos.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: cos.def
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/cos/cos.def,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- cos.def 19 Apr 2005 22:07:29 -0000 1.6
+++ cos.def 29 Oct 2005 02:26:56 -0000 1.7
@@ -36,7 +36,7 @@
; All rights reserved.
; END COPYRIGHT BLOCK
;
-DESCRIPTION 'Fedora Directory Server 7 Class Of Service Plugin'
+DESCRIPTION 'Fedora Directory Server 1.0 Class Of Service Plugin'
EXPORTS
cos_init @2
plugin_init_debug_level @3
From fedora-directory-commits at redhat.com Sat Oct 29 02:28:09 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Fri, 28 Oct 2005 22:28:09 -0400
Subject: [Fedora-directory-commits] ldapserver/ldap/servers/plugins/views
views.def, 1.6, 1.7
Message-ID: <200510290228.j9T2SdCN021912@cvs-int.fedora.redhat.com>
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
From fedora-directory-commits at redhat.com Sat Oct 29 02:28:15 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Fri, 28 Oct 2005 22:28:15 -0400
Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd
libslapd.def, 1.13, 1.14
Message-ID: <200510290228.j9T2SjPg021940@cvs-int.fedora.redhat.com>
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
From fedora-directory-commits at redhat.com Sat Oct 29 02:26:47 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Fri, 28 Oct 2005 22:26:47 -0400
Subject: [Fedora-directory-commits] ldapserver/ldap/servers/plugins/acl
libacl.def, 1.6, 1.7
Message-ID: <200510290228.j9T2Slw6021944@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/acl
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21454/ldapserver/ldap/servers/plugins/acl
Modified Files:
libacl.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: libacl.def
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/acl/libacl.def,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libacl.def 19 Apr 2005 22:07:28 -0000 1.6
+++ libacl.def 29 Oct 2005 02:26:40 -0000 1.7
@@ -38,7 +38,7 @@
;
;
;
-DESCRIPTION 'Fedora Directory Server 7.1 ACL Plugin'
+DESCRIPTION 'Fedora Directory Server 1.0 ACL Plugin'
;CODE SHARED READ EXECUTE
;DATA SHARED READ WRITE
EXPORTS
From fedora-directory-commits at redhat.com Sat Oct 29 02:26:19 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Fri, 28 Oct 2005 22:26:19 -0400
Subject: [Fedora-directory-commits]
ldapserver/ldap/cm fixPerlDAPInf.pl, 1.5, 1.6
Message-ID: <200510290228.j9T2SnAO021948@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/cm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21454/ldapserver/ldap/cm
Modified Files:
fixPerlDAPInf.pl
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: fixPerlDAPInf.pl
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/fixPerlDAPInf.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fixPerlDAPInf.pl 19 Apr 2005 22:07:20 -0000 1.5
+++ fixPerlDAPInf.pl 29 Oct 2005 02:26:11 -0000 1.6
@@ -53,7 +53,7 @@
s/The Sun \| Netscape Alliance/Fedora/g;
}
print OUT;
- if (/^Archive=perldap14.zip/) {
+ if (/^Archive=perldap.*\.zip/) {
print OUT "Visible=FALSE\n";
}
}
From fedora-directory-commits at redhat.com Sat Oct 29 02:27:09 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Fri, 28 Oct 2005 22:27:09 -0400
Subject: [Fedora-directory-commits] ldapserver/ldap/servers/plugins/distrib
README, 1.6, 1.7 libdistrib.def, 1.6, 1.7
Message-ID: <200510290228.j9T2Se57021916@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/distrib
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21454/ldapserver/ldap/servers/plugins/distrib
Modified Files:
README libdistrib.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: README
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/distrib/README,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- README 19 Apr 2005 22:07:30 -0000 1.6
+++ README 29 Oct 2005 02:27:02 -0000 1.7
@@ -42,7 +42,7 @@
----------------------------
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: libdistrib.def
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/distrib/libdistrib.def,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libdistrib.def 19 Apr 2005 22:07:30 -0000 1.6
+++ libdistrib.def 29 Oct 2005 02:27:02 -0000 1.7
@@ -35,7 +35,7 @@
; Copyright (C) 2005 Red Hat, Inc.
; All rights reserved.
; --- END COPYRIGHT BLOCK ---
-DESCRIPTION 'Fedora Directory Server 7 distribution logic example'
+DESCRIPTION 'Fedora Directory Server 1.0 distribution logic example'
EXPORTS
alpha_distribution @1
hash_distribution @2
From fedora-directory-commits at redhat.com Sat Oct 29 02:27:42 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Fri, 28 Oct 2005 22:27:42 -0400
Subject: [Fedora-directory-commits] ldapserver/ldap/servers/plugins/retrocl
retrocl.def, 1.6, 1.7
Message-ID: <200510290228.j9T2Sg20021923@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/retrocl
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21454/ldapserver/ldap/servers/plugins/retrocl
Modified Files:
retrocl.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: retrocl.def
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/retrocl/retrocl.def,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- retrocl.def 19 Apr 2005 22:07:34 -0000 1.6
+++ retrocl.def 29 Oct 2005 02:27:35 -0000 1.7
@@ -38,7 +38,7 @@
;
;
-DESCRIPTION 'Fedora Directory Server 7.1 Retro-Changelog Plugin'
+DESCRIPTION 'Fedora Directory Server 1.0 Retro-Changelog Plugin'
;CODE SHARED READ EXECUTE
;DATA SHARED READ WRITE
EXPORTS
From fedora-directory-commits at redhat.com Sat Oct 29 02:27:15 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Fri, 28 Oct 2005 22:27:15 -0400
Subject: [Fedora-directory-commits]
ldapserver/ldap/servers/plugins/passthru libpassthru.def, 1.6, 1.7
Message-ID: <200510290228.j9T2Sjoo021941@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/passthru
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21454/ldapserver/ldap/servers/plugins/passthru
Modified Files:
libpassthru.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: libpassthru.def
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/passthru/libpassthru.def,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libpassthru.def 19 Apr 2005 22:07:31 -0000 1.6
+++ libpassthru.def 29 Oct 2005 02:27:07 -0000 1.7
@@ -38,7 +38,7 @@
;
;
;
-DESCRIPTION 'Fedora Directory Server 7 Pass Through Authentication Plugin'
+DESCRIPTION 'Fedora Directory Server 1.0 Pass Through Authentication Plugin'
;CODE SHARED READ EXECUTE
;DATA SHARED READ WRITE
EXPORTS
From fedora-directory-commits at redhat.com Sat Oct 29 02:27:20 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Fri, 28 Oct 2005 22:27:20 -0400
Subject: [Fedora-directory-commits]
ldapserver/ldap/servers/plugins/presence presence.def, 1.5, 1.6
Message-ID: <200510290228.j9T2Sp3n021957@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/presence
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21454/ldapserver/ldap/servers/plugins/presence
Modified Files:
presence.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: presence.def
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/presence/presence.def,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- presence.def 19 Apr 2005 22:07:31 -0000 1.5
+++ presence.def 29 Oct 2005 02:27:13 -0000 1.6
@@ -36,7 +36,7 @@
; All rights reserved.
; END COPYRIGHT BLOCK
;
-DESCRIPTION 'Fedora Directory Server 7 Presence Plugin'
+DESCRIPTION 'Fedora Directory Server 1.0 Presence Plugin'
EXPORTS
presence_init @2
plugin_init_debug_level @3
From fedora-directory-commits at redhat.com Sat Oct 29 02:28:26 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Fri, 28 Oct 2005 22:28:26 -0400
Subject: [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
Message-ID: <200510290228.j9T2SuUv021975@cvs-int.fedora.redhat.com>
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
#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
#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
#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
#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" };
From fedora-directory-commits at redhat.com Sat Oct 29 02:27:48 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Fri, 28 Oct 2005 22:27:48 -0400
Subject: [Fedora-directory-commits] ldapserver/ldap/servers/plugins/roles
roles.def, 1.6, 1.7
Message-ID: <200510290228.j9T2SmCk021947@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/roles
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21454/ldapserver/ldap/servers/plugins/roles
Modified Files:
roles.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: roles.def
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/roles/roles.def,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- roles.def 19 Apr 2005 22:07:34 -0000 1.6
+++ roles.def 29 Oct 2005 02:27:40 -0000 1.7
@@ -36,7 +36,7 @@
; All rights reserved.
; END COPYRIGHT BLOCK
;
-DESCRIPTION 'Fedora Directory Server 7.1 Roles Plugin'
+DESCRIPTION 'Fedora Directory Server 1.0 Roles Plugin'
EXPORTS
roles_init @2
plugin_init_debug_level @3
From fedora-directory-commits at redhat.com Sat Oct 29 02:27:53 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Fri, 28 Oct 2005 22:27:53 -0400
Subject: [Fedora-directory-commits]
ldapserver/ldap/servers/plugins/statechange statechange.def,
1.6, 1.7
Message-ID: <200510290228.j9T2Sr0c021962@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/statechange
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21454/ldapserver/ldap/servers/plugins/statechange
Modified Files:
statechange.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: statechange.def
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/statechange/statechange.def,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- statechange.def 19 Apr 2005 22:07:35 -0000 1.6
+++ statechange.def 29 Oct 2005 02:27:46 -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
statechange_init @2
plugin_init_debug_level @3
From fedora-directory-commits at redhat.com Sat Oct 29 02:26:53 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Fri, 28 Oct 2005 22:26:53 -0400
Subject: [Fedora-directory-commits]
ldapserver/ldap/servers/plugins/chainingdb libcb.def, 1.6, 1.7
Message-ID: <200510290228.j9T2Srch021963@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/chainingdb
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21454/ldapserver/ldap/servers/plugins/chainingdb
Modified Files:
libcb.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: libcb.def
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/chainingdb/libcb.def,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libcb.def 19 Apr 2005 22:07:29 -0000 1.6
+++ libcb.def 29 Oct 2005 02:26:45 -0000 1.7
@@ -38,7 +38,7 @@
;
;
;
-DESCRIPTION 'Fedora Directory Server 7 Chaining Database Plugin'
+DESCRIPTION 'Fedora Directory Server 1.0 Chaining Database Plugin'
;CODE SHARED READ EXECUTE
;DATA SHARED READ WRITE
EXPORTS
From fedora-directory-commits at redhat.com Sat Oct 29 02:26:24 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Fri, 28 Oct 2005 22:26:24 -0400
Subject: [Fedora-directory-commits]
ldapserver/ldap/cm/newinst ns-keygen, 1.6,
1.7 slapd-patch.inf, 1.2, 1.3
Message-ID: <200510290228.j9T2Stwt021967@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/cm/newinst
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21454/ldapserver/ldap/cm/newinst
Modified Files:
ns-keygen slapd-patch.inf
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: ns-keygen
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinst/ns-keygen,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ns-keygen 19 Apr 2005 22:07:20 -0000 1.6
+++ ns-keygen 29 Oct 2005 02:26:17 -0000 1.7
@@ -41,7 +41,7 @@
#
# Usage ns-keygen password_file fully_qualified_hostname
# Example:
-# ./ns-keygen ../password.txt myhost.redhat.com
+# ./ns-keygen ../password.txt myhost.directory.fedora.redhat.com
#
# Assumes that NSHOME is Set
# if NSHOME is not set, it will be derived from the path of this script, which is
Index: slapd-patch.inf
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinst/slapd-patch.inf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- slapd-patch.inf 22 Sep 2005 16:48:16 -0000 1.2
+++ slapd-patch.inf 29 Oct 2005 02:26:17 -0000 1.3
@@ -38,17 +38,17 @@
#
[General]
Name= %%%SERVER_NAME%%%
-Components=slapd-71
+Components=slapd-10
-[slapd-71]
+[slapd-10]
Name= %%%SERVER_NAME%%%
InstanceNamePrefix= %%%INSTANCE_NAME_PREFIX%%%
Description= %%%SERVER_NAME%%%
-NickName= slapd-71
+NickName= slapd-10
Version= %%%SERVER_VERSION%%%
BuildNumber= %%%SERVER_BUILD_NUM%%%
-Archive= nsslapd-71.zip
-SourcePath=slapd-71
+Archive= nsslapd-10.zip
+SourcePath=slapd-10
PreInstall= ns-config -r
PostInstall= bin/slapd/admin/bin/ns-update
PreUninstall= bin/slapd/admin/bin/uninstall
From fedora-directory-commits at redhat.com Sat Oct 29 02:28:20 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Fri, 28 Oct 2005 22:28:20 -0400
Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd/ntperfdll
nsldapctrs.ini, 1.6, 1.7 nsldapreg.ini, 1.4, 1.5
Message-ID: <200510290228.j9T2Sof9021954@cvs-int.fedora.redhat.com>
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
From fedora-directory-commits at redhat.com Sat Oct 29 02:25:57 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Fri, 28 Oct 2005 22:25:57 -0400
Subject: [Fedora-directory-commits] ldapserver Makefile, 1.26,
1.27 component_versions.mk, 1.38, 1.39 internal_comp_deps.mk,
1.28, 1.29 nsdefs.mk, 1.14, 1.15
Message-ID: <200510290228.j9T2SvH0021986@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21454/ldapserver
Modified Files:
Makefile component_versions.mk internal_comp_deps.mk nsdefs.mk
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/Makefile,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- Makefile 2 Sep 2005 20:40:46 -0000 1.26
+++ Makefile 29 Oct 2005 02:25:50 -0000 1.27
@@ -132,7 +132,7 @@
ifeq ($(INTERNAL_BUILD), 1)
COMPONENT_DEPENDENCIES = $(ADMINUTIL_DEP) $(NSPR_DEP) $(ARLIB_DEP) $(DBM_DEP) $(SECURITY_DEP) $(SVRCORE_DEP) \
$(ICU_DEP) $(SETUPUTIL_DEP) $(LDAPSDK_DEP) $(DB_LIB_DEP) $(SASL_DEP) $(NETSNMP_DEP) \
- $(AXIS_DEP) $(DSMLJAR_DEP) $(DSDOC_DEP) $(ADSYNC_DEP) $(NT4SYNC_DEP)
+ $(AXIS_DEP) $(DSMLJAR_DEP) $(DSDOC_DEP) $(ADSYNC_DEP) $(NT4SYNC_DEP) $(PERLDAP_DEP)
endif
# Pull WiX MSI toolkit on Windows.
Index: component_versions.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/component_versions.mk,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- component_versions.mk 3 Oct 2005 19:53:40 -0000 1.38
+++ component_versions.mk 29 Oct 2005 02:25:50 -0000 1.39
@@ -114,10 +114,10 @@
# admin server
ifndef ADM_RELDATE
- ADM_RELDATE = 20050901
+ ADM_RELDATE = 20051028
endif
ifndef ADM_VERSDIR
- ADM_VERSDIR = adminserver/7.1
+ ADM_VERSDIR = adminserver/1.0
endif
# Net-SNMP
@@ -127,22 +127,17 @@
# setuputil
ifndef SETUPUTIL_RELDATE
- SETUPUTIL_RELDATE = 20050831
+ SETUPUTIL_RELDATE = 20051027
endif
ifndef SETUPUTIL_VER
- SETUPUTIL_VER = 71
- SETUPUTIL_DOT_VER = 7.1
+ SETUPUTIL_VER = 10
+ SETUPUTIL_DOT_VER = 1.0
endif
ifndef SETUPUTIL_VERSDIR
SETUPUTIL_VERSDIR=setuputil/$(SETUPUTIL_DOT_VER)
endif
-# infozip utilities
-ifndef INFOZIP_RELDATE
- INFOZIP_RELDATE = CMSTOOLS_7_x
-endif
-
# server core
ifndef SVRCORE_RELDATE
SVRCORE_RELDATE = SVRCORE_4_0_RTM
@@ -150,11 +145,11 @@
# admin utility library
ifndef ADMINUTIL_VER
- ADMINUTIL_VER=71
- ADMINUTIL_DOT_VER=7.1
+ ADMINUTIL_VER=10
+ ADMINUTIL_DOT_VER=1.0
endif
ifndef ADMINUTIL_RELDATE
- ADMINUTIL_RELDATE=20050721
+ ADMINUTIL_RELDATE=20051026
endif
ifndef ADMINUTIL_VERSDIR
@@ -163,17 +158,17 @@
# LDAP Console
ifndef LDAPCONSOLE_REL
- LDAPCONSOLE_REL=71
+ LDAPCONSOLE_REL=10
endif
ifndef LDAPCONSOLE_COMP
LDAPCONSOLE_COMP = ldapconsole$(LDAPCONSOLE_REL)
endif
ifndef LDAPCONSOLE_RELDATE
- LDAPCONSOLE_RELDATE=20050913
+ LDAPCONSOLE_RELDATE=20051028
endif
ifndef PERLDAP_VERSION
- PERLDAP_VERSION=20050330
+ PERLDAP_VERSION=20051028
endif
ifndef JSS_COMP
@@ -236,9 +231,9 @@
endif
ifndef ADSYNC_VERSION
- ADSYNC_VERSION=20050912
+ ADSYNC_VERSION=20051017
endif
ifndef NT4SYNC_VERSION
- NT4SYNC_VERSION=20050912
+ NT4SYNC_VERSION=20051017
endif
Index: internal_comp_deps.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/internal_comp_deps.mk,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- internal_comp_deps.mk 5 Oct 2005 01:29:14 -0000 1.28
+++ internal_comp_deps.mk 29 Oct 2005 02:25:50 -0000 1.29
@@ -574,7 +574,26 @@
#PERLDAP_COMPONENT_DIR = $(COMPONENTS_DIR_DEV)/perldap/$(PERLDAP_VERSION)/$(NSOBJDIR_NAME_32)
PERLDAP_COMPONENT_DIR = $(COMPONENTS_DIR)/perldap/$(PERLDAP_VERSION)/$(NSOBJDIR_NAME_32)
-PERLDAP_ZIP_FILE = perldap14.zip
+PERLDAP_FILES=lib,arch
+PERLDAP_DEP = $(PERLDAP_BUILT_DIR)/lib
+
+# this is the rule to pull PerLDAP
+ifndef PERLDAP_PULL_METHOD
+PERLDAP_PULL_METHOD = FTP
+endif
+
+$(PERLDAP_DEP):
+ifdef INTERNAL_BUILD
+ $(RM) $@
+ $(FTP_PULL) -method $(PERLDAP_PULL_METHOD) \
+ -objdir $(dir $@) \
+ -componentdir $(PERLDAP_COMPONENT_DIR) \
+ -files $(PERLDAP_FILES)
+ @if [ ! -f $@ ] ; \
+ then echo "Error: could not get component PERLDAP file $@" ; \
+ exit 1 ; \
+ fi
+endif
###########################################################
### Admin Server package ##################################
Index: nsdefs.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/nsdefs.mk,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- nsdefs.mk 3 Oct 2005 19:53:40 -0000 1.14
+++ nsdefs.mk 29 Oct 2005 02:25:50 -0000 1.15
@@ -141,10 +141,10 @@
endif
endif
-MAJOR_VERSION:="7"
-MINOR_VERSION:="1"
-MAJOR_VERSION_NOQUOTES:=7
-MINOR_VERSION_NOQUOTES:=1
+MAJOR_VERSION:="1"
+MINOR_VERSION:="0"
+MAJOR_VERSION_NOQUOTES:=1
+MINOR_VERSION_NOQUOTES:=0
# the LINK version is the one used for -l linking e.g. -l$(LINK_HTTPDLL_NAME)
ifeq ($(BUILD_ARCH), WINNT)
@@ -232,9 +232,9 @@
OBJDIR=$(COMMON_OBJDIR)
OBJDIR_32=$(COMMON_OBJDIR_32)
DO_SEARCH=no
-DIR_VERSION:=7.1
-NOSP_DIR_VERSION:=7.1
-DIR_NORM_VERSION:=7.1
+DIR_VERSION:=1.0
+NOSP_DIR_VERSION:=1.0
+DIR_NORM_VERSION:=1.0
PRODUCT_NAME="$(PRODUCTCORE) $(DIR_VERSION)"
# When you change DIRSDK_VERSION or DIRSDK_VERSION_DLL_SUFFIX, you must
# update all of the .exp and .def files by executing the following command:
From fedora-directory-commits at redhat.com Sat Oct 29 02:26:58 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Fri, 28 Oct 2005 22:26:58 -0400
Subject: [Fedora-directory-commits]
ldapserver/ldap/servers/plugins/collation collation.def, 1.6, 1.7
Message-ID: <200510290229.j9T2SxrT021992@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/collation
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21454/ldapserver/ldap/servers/plugins/collation
Modified Files:
collation.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: collation.def
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/collation/collation.def,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- collation.def 19 Apr 2005 22:07:29 -0000 1.6
+++ collation.def 29 Oct 2005 02:26:51 -0000 1.7
@@ -36,7 +36,7 @@
; All rights reserved.
; END COPYRIGHT BLOCK
;
-DESCRIPTION 'Fedora Directory Server 7 Collation Plugin'
+DESCRIPTION 'Fedora Directory Server 1.0 Collation Plugin'
EXPORTS
orderingRule_init @2
plugin_init_debug_level @3
From fedora-directory-commits at redhat.com Sat Oct 29 02:27:26 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Fri, 28 Oct 2005 22:27:26 -0400
Subject: [Fedora-directory-commits]
ldapserver/ldap/servers/plugins/pwdstorage libpwdstorage.def,
1.7, 1.8
Message-ID: <200510290229.j9T2SuDh021982@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/pwdstorage
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21454/ldapserver/ldap/servers/plugins/pwdstorage
Modified Files:
libpwdstorage.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: libpwdstorage.def
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/pwdstorage/libpwdstorage.def,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libpwdstorage.def 20 Apr 2005 18:10:29 -0000 1.7
+++ libpwdstorage.def 29 Oct 2005 02:27:18 -0000 1.8
@@ -36,7 +36,7 @@
; All rights reserved.
; END COPYRIGHT BLOCK
;
-DESCRIPTION 'Fedora Directory Server 7 password storage scheme Plugin'
+DESCRIPTION 'Fedora Directory Server 1.0 password storage scheme Plugin'
EXPORTS
sha_pwd_storage_scheme_init @2
ssha_pwd_storage_scheme_init @3
From fedora-directory-commits at redhat.com Sat Oct 29 02:27:58 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Fri, 28 Oct 2005 22:27:58 -0400
Subject: [Fedora-directory-commits]
ldapserver/ldap/servers/plugins/syntaxes libsyntax.def, 1.6, 1.7
Message-ID: <200510290228.j9T2SxJB021991@cvs-int.fedora.redhat.com>
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
From fedora-directory-commits at redhat.com Mon Oct 31 15:55:42 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Mon, 31 Oct 2005 10:55:42 -0500
Subject: [Fedora-directory-commits] ldapserver/ldap/cm/newinst setup, 1.12,
1.13
Message-ID: <200510311555.j9VFtgr2003833@cvs-int.fedora.redhat.com>
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
From fedora-directory-commits at redhat.com Mon Oct 31 15:55:31 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Mon, 31 Oct 2005 10:55:31 -0500
Subject: [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
Message-ID: <200510311556.j9VFu2hC003839@cvs-int.fedora.redhat.com>
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
- at 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)
From fedora-directory-commits at redhat.com Mon Oct 31 15:55:37 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Mon, 31 Oct 2005 10:55:37 -0500
Subject: [Fedora-directory-commits] ldapserver/ldap/cm Makefile,1.39,1.40
Message-ID: <200510311556.j9VFu7pq003842@cvs-int.fedora.redhat.com>
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)