[1751] | 1 | diff --git a/ldap/servers/plugins/replication/cl5_api.c b/ldap/servers/plugins/replication/cl5_api.c |
---|
| 2 | index b7c7229..59ef8be 100644 |
---|
| 3 | --- a/ldap/servers/plugins/replication/cl5_api.c |
---|
| 4 | +++ b/ldap/servers/plugins/replication/cl5_api.c |
---|
| 5 | @@ -657,7 +657,7 @@ int cl5DeleteDBSync (Object *replica) |
---|
| 6 | file = (CL5DBFile*)object_get_data (obj); |
---|
| 7 | PR_ASSERT (file); |
---|
| 8 | |
---|
| 9 | - PR_snprintf (fName, MAXPATHLEN, "%s/%s", s_cl5Desc.dbDir, file->name); |
---|
| 10 | + PR_snprintf (fName, MAXPATHLEN, "%s", file->name); |
---|
| 11 | |
---|
| 12 | _cl5DBDeleteFile (obj); |
---|
| 13 | |
---|
| 14 | @@ -1894,6 +1894,7 @@ static int _cl5DBOpen () |
---|
| 15 | slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name_cl, "_cl5DBOpen: " |
---|
| 16 | "file %s has no matching replica; removing\n", entry->name); |
---|
| 17 | |
---|
| 18 | + PR_snprintf(fullpathname, MAXPATHLEN, "%s/%s", s_cl5Desc.dbDir, entry->name); |
---|
| 19 | rc = s_cl5Desc.dbEnv->dbremove(s_cl5Desc.dbEnv, |
---|
| 20 | 0, fullpathname, 0, 0); |
---|
| 21 | if (rc != 0) |
---|
| 22 | @@ -5528,7 +5529,6 @@ done: |
---|
| 23 | static void _cl5DBCloseFile (void **data) |
---|
| 24 | { |
---|
| 25 | CL5DBFile *file; |
---|
| 26 | - char fullpathname[MAXPATHLEN]; |
---|
| 27 | |
---|
| 28 | PR_ASSERT (data); |
---|
| 29 | |
---|
| 30 | @@ -5537,7 +5537,7 @@ static void _cl5DBCloseFile (void **data) |
---|
| 31 | PR_ASSERT (file); |
---|
| 32 | |
---|
| 33 | slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name_cl, "_cl5DBCloseFile: " |
---|
| 34 | - "Closing database %s/%s\n", s_cl5Desc.dbDir, file->name); |
---|
| 35 | + "Closing database %s\n", file->name); |
---|
| 36 | |
---|
| 37 | /* close the file */ |
---|
| 38 | /* if this is normal close or close after import, update entry count */ |
---|
| 39 | @@ -5553,7 +5553,7 @@ static void _cl5DBCloseFile (void **data) |
---|
| 40 | if (file->db) { |
---|
| 41 | file->db->close(file->db, 0); |
---|
| 42 | slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name_cl, "_cl5DBCloseFile: " |
---|
| 43 | - "Closed the changelog database handle for %s/%s\n", s_cl5Desc.dbDir, file->name); |
---|
| 44 | + "Closed the changelog database handle for %s\n", file->name); |
---|
| 45 | file->db = NULL; |
---|
| 46 | } |
---|
| 47 | |
---|
| 48 | @@ -5562,16 +5562,15 @@ static void _cl5DBCloseFile (void **data) |
---|
| 49 | int rc = 0; |
---|
| 50 | /* We need to use the libdb API to delete the files, otherwise we'll |
---|
| 51 | * run into problems when we try to checkpoint transactions later. */ |
---|
| 52 | - PR_snprintf(fullpathname, MAXPATHLEN, "%s/%s", s_cl5Desc.dbDir, file->name); |
---|
| 53 | - rc = s_cl5Desc.dbEnv->dbremove(s_cl5Desc.dbEnv, 0, fullpathname, 0, 0); |
---|
| 54 | + rc = s_cl5Desc.dbEnv->dbremove(s_cl5Desc.dbEnv, 0, file->name, 0, 0); |
---|
| 55 | if (rc != 0) |
---|
| 56 | { |
---|
| 57 | slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name_cl, "_cl5DBCloseFile: " |
---|
| 58 | "failed to remove (%s) file; libdb error - %d (%s)\n", |
---|
| 59 | - fullpathname, rc, db_strerror(rc)); |
---|
| 60 | + file->name, rc, db_strerror(rc)); |
---|
| 61 | } else { |
---|
| 62 | slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name_cl, "_cl5DBCloseFile: " |
---|
| 63 | - "Deleted the changelog database file %s/%s\n", s_cl5Desc.dbDir, file->name); |
---|
| 64 | + "Deleted the changelog database file %s\n", file->name); |
---|
| 65 | |
---|
| 66 | } |
---|
| 67 | } |
---|