[Fedora-directory-commits] ldapserver/ldap/include Makefile, 1.6, 1.7
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/include
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11830/ldap/include
Modified Files:
Makefile
Log Message:
Resolves: #214728
Summary: Cleaning up obsolete macros in the build
Changes: eliminated macro NSPR20 (Comment #9)
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/include/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Makefile 19 Apr 2005 22:07:25 -0000 1.6
+++ Makefile 10 Nov 2006 01:27:46 -0000 1.7
@@ -46,7 +46,6 @@
NOSTDCLEAN=true # don't let nsconfig.mk define target clean
NOSTDSTRIP=true # don't let nsconfig.mk define target strip
-NSPR20=true # probably should be defined somewhere else (not sure where)
include $(BUILD_ROOT)/nsdefs.mk
include $(BUILD_ROOT)/nsconfig.mk
17 years, 5 months
[Fedora-directory-commits] ldapserver/ldap/admin/src Makefile, 1.19, 1.20
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/admin/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11830/ldap/admin/src
Modified Files:
Makefile
Log Message:
Resolves: #214728
Summary: Cleaning up obsolete macros in the build
Changes: eliminated macro NSPR20 (Comment #9)
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/Makefile,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- Makefile 25 Oct 2006 00:04:41 -0000 1.19
+++ Makefile 10 Nov 2006 01:27:41 -0000 1.20
@@ -44,7 +44,6 @@
NOSTDCLEAN=true # don't let nsconfig.mk define target clean
NOSTDSTRIP=true # don't let nsconfig.mk define target strip
-NSPR20=true # probably should be defined somewhere else (not sure where)
BINDIR=$(LDAP_ADMIN_BIN_RELDIR)
OBJDEST=$(LDAP_ADMOBJDIR)
17 years, 5 months
[Fedora-directory-commits] ldapserver/ldap/admin Makefile,1.5,1.6
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/admin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11830/ldap/admin
Modified Files:
Makefile
Log Message:
Resolves: #214728
Summary: Cleaning up obsolete macros in the build
Changes: eliminated macro NSPR20 (Comment #9)
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Makefile 19 Apr 2005 22:06:53 -0000 1.5
+++ Makefile 10 Nov 2006 01:27:40 -0000 1.6
@@ -46,7 +46,6 @@
NOSTDCLEAN=true # don't let nsconfig.mk define target clean
NOSTDSTRIP=true # don't let nsconfig.mk define target strip
-NSPR20=true # probably should be defined somewhere else (not sure where)
include $(BUILD_ROOT)/nsdefs.mk
include $(BUILD_ROOT)/nsconfig.mk
17 years, 5 months
[Fedora-directory-commits] ldapserver/ldap/admin/lib Makefile, 1.10, 1.11
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/admin/lib
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11830/ldap/admin/lib
Modified Files:
Makefile
Log Message:
Resolves: #214728
Summary: Cleaning up obsolete macros in the build
Changes: eliminated macro NSPR20 (Comment #9)
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/lib/Makefile,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Makefile 29 Mar 2006 19:43:46 -0000 1.10
+++ Makefile 10 Nov 2006 01:27:35 -0000 1.11
@@ -46,7 +46,6 @@
NOSTDCLEAN=true # don't let nsconfig.mk define target clean
NOSTDSTRIP=true # don't let nsconfig.mk define target strip
-NSPR20=true # probably should be defined somewhere else (not sure where)
OBJDEST = $(LDAP_ADMOBJDIR)
LIBDIR = $(LDAP_LIBDIR)
17 years, 5 months
[Fedora-directory-commits] ldapserver/config config.mk, 1.8, 1.9 SunOS5.mk, 1.4, 1.5
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/config
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11830/config
Modified Files:
config.mk SunOS5.mk
Log Message:
Resolves: #214728
Summary: Cleaning up obsolete macros in the build
Changes: eliminated macro NSPR20 (Comment #9)
Index: config.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/config/config.mk,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- config.mk 3 Oct 2005 19:53:40 -0000 1.8
+++ config.mk 10 Nov 2006 01:27:34 -0000 1.9
@@ -411,7 +411,7 @@
# Platform dependent switching off of NSPR and JAVA
#
ifndef NO_NSPR
-DEFINES += -DNSPR -DNSPR20
+DEFINES += -DNSPR
endif
ifndef NO_JAVA
Index: SunOS5.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/config/SunOS5.mk,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SunOS5.mk 19 Apr 2005 22:06:42 -0000 1.4
+++ SunOS5.mk 10 Nov 2006 01:27:34 -0000 1.5
@@ -77,11 +77,7 @@
# Purify doesn't like -MDupdate
ifeq ($(USE_KERNEL_THREADS), 1)
-ifdef NSPR20
-NOMD_OS_CFLAGS = $(MOZ_CFLAGS) -DNSPR20 -D_PR_NTHREAD -D_REENTRANT $(SOL_CFLAGS)
-else
-NOMD_OS_CFLAGS = $(MOZ_CFLAGS) -DHW_THREADS -D_REENTRANT $(SOL_CFLAGS)
-endif
+NOMD_OS_CFLAGS = $(MOZ_CFLAGS) -D_PR_NTHREAD -D_REENTRANT $(SOL_CFLAGS)
OS_LIBS = -lthread -lposix4 -lsocket -lnsl -ldl
else
NOMD_OS_CFLAGS = $(MOZ_CFLAGS) -DSW_THREADS $(SOL_CFLAGS)
17 years, 5 months
[Fedora-directory-commits] ldapserver nsdefs.mk,1.21,1.22
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11830
Modified Files:
nsdefs.mk
Log Message:
Resolves: #214728
Summary: Cleaning up obsolete macros in the build
Changes: eliminated macro NSPR20 (Comment #9)
Index: nsdefs.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/nsdefs.mk,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- nsdefs.mk 3 Nov 2006 21:15:30 -0000 1.21
+++ nsdefs.mk 10 Nov 2006 01:27:34 -0000 1.22
@@ -205,11 +205,7 @@
endif
BASIC_OBJDIR=$(BUILD_ROOT)/built/$(FULL_RTL_OBJDIR)
-ifdef NSPR20
- NSPR_DIR=nspr20
-else
- NSPR_DIR=nspr
-endif
+NSPR_DIR=nspr
NSPR_BASENAME=libnspr21
PRODUCTCORE=Fedora Directory Server
PRODUCT="$(PRODUCTCORE)"
17 years, 5 months
[Fedora-directory-commits] ldapserver/ldap/servers/slapd pblock.c, 1.6, 1.7 protect_db.c, 1.7, 1.8 protect_db.h, 1.4, 1.5 slapi-private.h, 1.12, 1.13 task.c, 1.7, 1.8
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11098/ldap/servers/slapd
Modified Files:
pblock.c protect_db.c protect_db.h slapi-private.h task.c
Log Message:
Resolves: #214728
Summary: Cleaning up obsolete macros in the build
Changes: eliminated macro UPGRADEDB (Comment #6)
Index: pblock.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/pblock.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- pblock.c 5 Oct 2006 21:14:02 -0000 1.6
+++ pblock.c 10 Nov 2006 01:13:47 -0000 1.7
@@ -604,14 +604,12 @@
}
(*(IFP *)value) = pblock->pb_plugin->plg_db2archive;
break;
-#if defined(UPGRADEDB)
case SLAPI_PLUGIN_DB_UPGRADEDB_FN:
if ( pblock->pb_plugin->plg_type != SLAPI_PLUGIN_DATABASE ) {
return( -1 );
}
(*(IFP *)value) = pblock->pb_plugin->plg_upgradedb;
break;
-#endif
case SLAPI_PLUGIN_DB_BEGIN_FN:
if ( pblock->pb_plugin->plg_type != SLAPI_PLUGIN_DATABASE ) {
return( -1 );
@@ -1875,14 +1873,12 @@
}
pblock->pb_plugin->plg_db2archive = (IFP) value;
break;
-#if defined(UPGRADEDB)
case SLAPI_PLUGIN_DB_UPGRADEDB_FN:
if ( pblock->pb_plugin->plg_type != SLAPI_PLUGIN_DATABASE ) {
return( -1 );
}
pblock->pb_plugin->plg_upgradedb = (IFP) value;
break;
-#endif
case SLAPI_PLUGIN_DB_BEGIN_FN:
if ( pblock->pb_plugin->plg_type != SLAPI_PLUGIN_DATABASE ) {
return( -1 );
Index: protect_db.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/protect_db.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- protect_db.c 13 Oct 2006 01:06:28 -0000 1.7
+++ protect_db.c 10 Nov 2006 01:13:47 -0000 1.8
@@ -479,7 +479,6 @@
result = 0;
}
break;
-#if defined(UPGRADEDB)
case SLAPD_EXEMODE_UPGRADEDB:
if (running || importing || exporting) {
LDAPDebug(LDAP_DEBUG_ANY, NO_UPGRADEDB_DUE_TO_USE, 0, 0, 0);
@@ -489,7 +488,6 @@
result = 0;
}
break;
-#endif
case SLAPD_EXEMODE_DBTEST:
if (running || importing || exporting) {
LDAPDebug(LDAP_DEBUG_ANY, NO_DBTEST_DUE_TO_USE, 0, 0, 0);
@@ -750,7 +748,6 @@
result = 0;
}
break;
-#if defined(UPGRADEDB)
case SLAPD_EXEMODE_UPGRADEDB:
if ( mutex_exists( serverMutexName ) ||
mutex_exists( importMutexName ) ||
@@ -762,7 +759,6 @@
result = 0;
}
break;
-#endif
case SLAPD_EXEMODE_DBTEST:
if ( mutex_exists( serverMutexName ) ||
mutex_exists( importMutexName ) ||
Index: protect_db.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/protect_db.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- protect_db.h 19 Apr 2005 22:07:36 -0000 1.4
+++ protect_db.h 10 Nov 2006 01:13:47 -0000 1.5
@@ -95,9 +95,7 @@
#define NO_DB2INDEX_DUE_TO_USE "Unable to create an index because the database is being used by another slapd process.\n"
-#if defined(UPGRADEDB)
#define NO_UPGRADEDB_DUE_TO_USE "Unable to recreate index files because the database is being used by another slapd process.\n"
-#endif
#define CREATE_MUTEX_ERROR "Error - CreateMutex failed: %s\n"
/* reason for failure */
Index: slapi-private.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/slapi-private.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- slapi-private.h 7 Nov 2006 04:42:55 -0000 1.12
+++ slapi-private.h 10 Nov 2006 01:13:47 -0000 1.13
@@ -825,9 +825,7 @@
#define SLAPI_PLUGIN_DB_ENTRY_RELEASE_FN 230
#define SLAPI_PLUGIN_DB_INIT_INSTANCE_FN 231
#define SLAPI_PLUGIN_DB_WIRE_IMPORT_FN 234
-#if defined(UPGRADEDB)
#define SLAPI_PLUGIN_DB_UPGRADEDB_FN 235
-#endif
/* database plugin-specific parameters */
#define SLAPI_PLUGIN_DB_NO_ACL 250
#define SLAPI_PLUGIN_DB_RMDB_FN 280
@@ -1231,11 +1229,9 @@
void DS_Sleep(PRIntervalTime ticks);
-#if defined(UPGRADEDB)
/* macro to specify the behavior of upgradedb */
#define SLAPI_UPGRADEDB_FORCE 0x1 /* reindex all (no check w/ idl switch) */
#define SLAPI_UPGRADEDB_SKIPINIT 0x2 /* call upgradedb as part of other op */
-#endif
/*
* Macro to set port to the 'port' field of a NSPR PRNetAddr union.
Index: task.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/task.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- task.c 19 Apr 2005 22:07:37 -0000 1.7
+++ task.c 10 Nov 2006 01:13:47 -0000 1.8
@@ -56,9 +56,7 @@
#define TASK_BACKUP_DN "cn=backup, cn=tasks, cn=config"
#define TASK_RESTORE_DN "cn=restore, cn=tasks, cn=config"
#define TASK_INDEX_DN "cn=index, cn=tasks, cn=config"
-#if defined(UPGRADEDB)
#define TASK_UPGRADEDB_DN "cn=upgradedb, cn=tasks, cn=config"
-#endif
#define TASK_LOG_NAME "nsTaskLog"
#define TASK_STATUS_NAME "nsTaskStatus"
@@ -1367,7 +1365,6 @@
return rv;
}
-#if defined(UPGRADEDB)
static int
task_upgradedb_add(Slapi_PBlock *pb, Slapi_Entry *e, Slapi_Entry *eAfter,
int *returncode, char *returntext, void *arg)
@@ -1465,7 +1462,6 @@
*returncode = LDAP_SUCCESS;
return SLAPI_DSE_CALLBACK_OK;
}
-#endif
/* update attributes in the entry under "cn=tasks" to match the current
* status of the task.
@@ -1697,9 +1693,7 @@
slapi_task_register_handler("backup", task_backup_add);
slapi_task_register_handler("restore", task_restore_add);
slapi_task_register_handler("index", task_index_add);
-#if defined(UPGRADEDB)
slapi_task_register_handler("upgradedb", task_upgradedb_add);
-#endif
}
/* called when the server is shutting down -- abort all existing tasks */
17 years, 5 months
[Fedora-directory-commits] ldapserver/ldap/servers/slapd/back-ldbm dblayer.c, 1.12, 1.13 import.c, 1.6, 1.7 import.h, 1.6, 1.7 import-threads.c, 1.10, 1.11 init.c, 1.6, 1.7 ldif2ldbm.c, 1.9, 1.10 proto-back-ldbm.h, 1.7, 1.8 upgrade.c, 1.4, 1.5
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11098/ldap/servers/slapd/back-ldbm
Modified Files:
dblayer.c import.c import.h import-threads.c init.c
ldif2ldbm.c proto-back-ldbm.h upgrade.c
Log Message:
Resolves: #214728
Summary: Cleaning up obsolete macros in the build
Changes: eliminated macro UPGRADEDB (Comment #6)
Index: dblayer.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/dblayer.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- dblayer.c 7 Nov 2006 04:20:14 -0000 1.12
+++ dblayer.c 10 Nov 2006 01:13:47 -0000 1.13
@@ -1719,12 +1719,10 @@
"file in %s\n", inst->inst_dir_name, 0, 0);
} else {
int rval = 0;
-#if defined(UPGRADEDB)
/* check the DBVERSION and reset idl-switch if needed (DS6.2) */
/* from the next major rel, we won't do this and just upgrade */
if (!(li->li_flags & LI_FORCE_MOD_CONFIG))
adjust_idl_switch(ldbmversion, li);
-#endif
/* check to make sure these instance was made with the correct
* version. */
@@ -2022,7 +2020,6 @@
return 0;
}
-#ifdef UPGRADEDB
/*
* dblayer_get_aux_id2entry:
* - create a dedicated db env and db handler for id2entry.
@@ -2222,7 +2219,6 @@
slapi_ch_free_string(&inst_dirp);
return 0;
}
-#endif
int dblayer_close_indexes(backend *be)
{
@@ -5387,7 +5383,6 @@
}
/* We're done ! */
-#if defined(UPGRADEDB)
/* [605024] check the DBVERSION and reset idl-switch if needed */
if (dbversion_exists(li, home_dir))
{
@@ -5404,7 +5399,6 @@
adjust_idl_switch(ldbmversion, li);
}
}
-#endif
return_value = check_db_version(li, &action);
if (action & DBVERSION_UPGRADE_3_4)
Index: import.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/import.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- import.c 6 Dec 2005 18:28:14 -0000 1.6
+++ import.c 10 Nov 2006 01:13:47 -0000 1.7
@@ -1116,7 +1116,6 @@
/* start the producer */
import_init_worker_info(producer, job);
producer->work_type = PRODUCER;
-#if defined(UPGRADEDB)
if (job->flags & FLAG_REINDEXING)
{
if (! CREATE_THREAD(PR_USER_THREAD, (VFP)index_producer, producer,
@@ -1132,7 +1131,6 @@
}
}
else
-#endif
{
import_log_notice(job, "Beginning import job...");
if (! CREATE_THREAD(PR_USER_THREAD, (VFP)import_producer, producer,
@@ -1427,10 +1425,8 @@
}
job->flags = FLAG_USE_FILES;
-#if defined(UPGRADEDB)
if (NULL == name_array) /* no ldif file is given -> reindexing */
job->flags |= FLAG_REINDEXING;
-#endif
if (!noattrindexes)
job->flags |= FLAG_INDEX_ATTRS;
for (i = 0; name_array && name_array[i] != NULL; i++)
Index: import.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/import.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- import.h 11 Apr 2006 02:14:45 -0000 1.6
+++ import.h 10 Nov 2006 01:13:47 -0000 1.7
@@ -157,9 +157,7 @@
* for replica initialization */
#define FLAG_ABORT 0x08 /* import has been aborted */
#define FLAG_ONLINE 0x10 /* bring backend online when done */
-#if defined(UPGRADEDB)
#define FLAG_REINDEXING 0x20 /* read from id2entry and do indexing */
-#endif
/* Structure holding stuff about a worker thread and what it's up to */
@@ -229,9 +227,7 @@
/* import-threads.c */
void import_producer(void *param);
-#if defined(UPGRADEDB)
void index_producer(void *param);
-#endif
void import_foreman(void *param);
void import_worker(void *param);
static void import_wait_for_space_in_fifo(ImportJob *job, size_t new_esize);
Index: import-threads.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/import-threads.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- import-threads.c 6 Nov 2006 20:51:32 -0000 1.10
+++ import-threads.c 10 Nov 2006 01:13:47 -0000 1.11
@@ -620,7 +620,6 @@
info->state = ABORTED;
}
-#if defined(UPGRADEDB)
/* producer thread for re-indexing:
* read id2entry, parsing entries (str2entry) (needed???), assigning
* them IDs (again, needed???) and queueing them on the entry FIFO.
@@ -855,7 +854,6 @@
dblayer_release_aux_id2entry( be, db, env );
info->state = ABORTED;
}
-#endif
static void
import_wait_for_space_in_fifo(ImportJob *job, size_t new_esize)
@@ -1090,9 +1088,7 @@
goto error;
}
-#if defined (UPGRADEDB)
if (!(job->flags & FLAG_REINDEXING))/* reindex reads data from id2entry */
-#endif
{
/* insert into the id2entry index
* (that isn't really an index -- it's the storehouse of the entries
@@ -1144,9 +1140,7 @@
/* Remove the entry from the cache (caused by id2entry_add) */
-#if defined (UPGRADEDB)
if (!(job->flags & FLAG_REINDEXING))/* reindex reads data from id2entry */
-#endif
cache_remove(&inst->inst_cache, fi->entry);
fi->entry->ep_refcnt = job->number_indexers;
Index: init.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/init.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- init.c 19 Apr 2005 22:07:38 -0000 1.6
+++ init.c 10 Nov 2006 01:13:47 -0000 1.7
@@ -202,10 +202,8 @@
(void *) ldbm_back_archive2ldbm );
rc |= slapi_pblock_set( pb, SLAPI_PLUGIN_DB_DB2ARCHIVE_FN,
(void *) ldbm_back_ldbm2archive );
-#if defined(UPGRADEDB)
rc |= slapi_pblock_set( pb, SLAPI_PLUGIN_DB_UPGRADEDB_FN,
(void *) ldbm_back_upgradedb );
-#endif
rc |= slapi_pblock_set( pb, SLAPI_PLUGIN_DB_BEGIN_FN,
(void *) dblayer_plugin_begin );
rc |= slapi_pblock_set( pb, SLAPI_PLUGIN_DB_COMMIT_FN,
Index: ldif2ldbm.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/ldif2ldbm.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ldif2ldbm.c 11 Apr 2006 02:14:45 -0000 1.9
+++ ldif2ldbm.c 10 Nov 2006 01:13:47 -0000 1.10
@@ -1927,7 +1927,6 @@
return( rc );
}
-#if defined(UPGRADEDB)
/*
* ldbm_back_upgradedb -
*
@@ -2468,4 +2467,3 @@
ldbm_back_ldif2ldbm_deluxe(pb);
}
-#endif /* UPGRADEDB */
Index: proto-back-ldbm.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/proto-back-ldbm.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- proto-back-ldbm.h 1 Sep 2006 21:25:14 -0000 1.7
+++ proto-back-ldbm.h 10 Nov 2006 01:13:47 -0000 1.8
@@ -433,9 +433,7 @@
int ldbm_back_ldbm2index( Slapi_PBlock *pb );
int ldbm_back_archive2ldbm( Slapi_PBlock *pb );
int ldbm_back_ldbm2archive( Slapi_PBlock *pb );
-#if defined(UPGRADEDB)
int ldbm_back_upgradedb( Slapi_PBlock *pb );
-#endif
int ldbm_back_next_search_entry( Slapi_PBlock *pb );
int ldbm_back_next_search_entry_ext( Slapi_PBlock *pb, int use_extension );
int ldbm_back_db_test( Slapi_PBlock *pb );
@@ -536,9 +534,7 @@
*/
int check_db_version(struct ldbminfo *li, int *action);
int check_db_inst_version(ldbm_instance *inst);
-#if defined(UPGRADEDB)
int adjust_idl_switch(char *ldbmversion, struct ldbminfo *li);
-#endif
int ldbm_upgrade(ldbm_instance *inst, int action);
int lookup_dbversion(char *dbversion, int flag);
Index: upgrade.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/upgrade.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- upgrade.c 19 Apr 2005 22:07:38 -0000 1.4
+++ upgrade.c 10 Nov 2006 01:13:47 -0000 1.5
@@ -205,7 +205,6 @@
return rval;
}
-#if defined(UPGRADEDB)
/*
* adjust_idl_switch
* if the current nsslapd-idl-switch is different from ldbmversion,
@@ -264,7 +263,6 @@
li->li_flags &= ~LI_FORCE_MOD_CONFIG;
return rval;
}
-#endif
/* Do the work to upgrade a database if needed */
/* When we're called, the database files have been opened, and any
17 years, 5 months
[Fedora-directory-commits] ldapserver/lib/base file.cpp,1.6,1.7
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/lib/base
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10781/lib/base
Modified Files:
file.cpp
Log Message:
Resolves: #214728
Summary: Cleaning up obsolete macros in the build
Changes: eliminated macro NET_SSL (Comment #5)
Index: file.cpp
===================================================================
RCS file: /cvs/dirsec/ldapserver/lib/base/file.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- file.cpp 11 Apr 2006 02:14:52 -0000 1.6
+++ file.cpp 10 Nov 2006 01:10:57 -0000 1.7
@@ -528,8 +528,6 @@
#endif /* SNI */
#endif
-#ifdef NET_SSL
-
#define ERRMSG_SIZE 35
#ifdef THREAD_ANY
static int errmsg_key = -1;
@@ -537,19 +535,16 @@
/* Removed for ns security integration
#include "xp_error.h"
*/
-#else
+#else /* THREAD_ANY */
static char errmsg[ERRMSG_SIZE];
-#endif
+#endif /* THREAD_ANY */
#include "util.h"
-#endif
-
-
void system_errmsg_init(void)
{
if (errmsg_key == -1) {
-#if defined(THREAD_ANY) && defined(NET_SSL)
+#if defined(THREAD_ANY)
errmsg_key = systhread_newkey();
#endif
#ifdef XP_WIN32
17 years, 5 months
[Fedora-directory-commits] ldapserver/ldap/servers/plugins/pwdstorage pwdstorage.h, 1.7, 1.8 sha_pwd.c, 1.6, 1.7 ssha_pwd.c, 1.7, 1.8
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/pwdstorage
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10781/ldap/servers/plugins/pwdstorage
Modified Files:
pwdstorage.h sha_pwd.c ssha_pwd.c
Log Message:
Resolves: #214728
Summary: Cleaning up obsolete macros in the build
Changes: eliminated macro NET_SSL (Comment #5)
Index: pwdstorage.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/pwdstorage/pwdstorage.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- pwdstorage.h 6 Sep 2005 21:15:15 -0000 1.7
+++ pwdstorage.h 10 Nov 2006 01:10:51 -0000 1.8
@@ -103,64 +103,4 @@
int md5_pw_cmp( char *userpwd, char *dbpwd );
char *md5_pw_enc( char *pwd );
-
-#if !defined(NET_SSL)
-/******************************************/
-/*
- * Some of the stuff below depends on a definition for uint32, so
- * we include one here. Other definitions appear in nspr/prtypes.h,
- * at least. All the platforms we support use 32-bit ints.
- */
-typedef unsigned int uint32;
-
-
-/******************************************/
-/*
- * The following is from ds.h, which the libsec sec.h stuff depends on (see
- * comment below).
- */
-/*
-** A status code. Status's are used by procedures that return status
-** values. Again the motivation is so that a compiler can generate
-** warnings when return values are wrong. Correct testing of status codes:
-**
-** DSStatus rv;
-** rv = some_function (some_argument);
-** if (rv != DSSuccess)
-** do_an_error_thing();
-**
-*/
-typedef enum DSStatusEnum {
- DSWouldBlock = -2,
- DSFailure = -1,
- DSSuccess = 0
-} DSStatus;
-
-
-/******************************************/
-/*
- * All of the SHA1-related defines are from libsec's "sec.h" -- including
- * it directly pulls in way too much stuff that we conflict with. Ugh.
- */
-
-/*
- * Number of bytes each hash algorithm produces
- */
-#define SHA1_LENGTH 20
-#define SHA256_LENGTH 32
-#define SHA384_LENGTH 48
-#define SHA512_LENGTH 64
-
-/******************************************/
-/*
-** SHA-1 secure hash function
-*/
-
-/*
-** Hash a null terminated string "src" into "dest" using SHA-1
-*/
-DSStatus SHA1_Hash(unsigned char *dest, char *src);
-
-#endif /* !defined(NET_SSL) */
-
#endif /* _PWDSTORAGE_H */
Index: sha_pwd.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/pwdstorage/sha_pwd.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sha_pwd.c 9 Oct 2006 21:42:57 -0000 1.6
+++ sha_pwd.c 10 Nov 2006 01:10:51 -0000 1.7
@@ -46,9 +46,7 @@
#include "pwdstorage.h"
-#if defined(NET_SSL)
#include <sechash.h>
-#endif /* NET_SSL */
#define SHA_SALT_LENGTH 8 /* number of bytes of data in salt */
#define NOT_FIRST_TIME (time_t)1 /* not the first logon */
Index: ssha_pwd.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/pwdstorage/ssha_pwd.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ssha_pwd.c 14 Sep 2005 23:37:37 -0000 1.7
+++ ssha_pwd.c 10 Nov 2006 01:10:51 -0000 1.8
@@ -48,10 +48,8 @@
#include "prtime.h"
#include "prlong.h"
-#if defined(NET_SSL)
#include <pk11func.h>
#include <pk11pqg.h>
-#endif /* NET_SSL */
#define SHA_SALT_LENGTH 8 /* number of bytes of data in salt */
17 years, 5 months