[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

[Noriko Hosoi (nhosoi)]

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 */