diff options
| author | Noriko Hosoi <nhosoi@redhat.com> | 2007-10-16 17:30:58 +0000 |
|---|---|---|
| committer | Noriko Hosoi <nhosoi@redhat.com> | 2007-10-16 17:30:58 +0000 |
| commit | 14381d4aa4e500bbeb7b64376240fc048f2409d6 (patch) | |
| tree | d6ecfd97e9543bc12179a78147ea9b832386d3b8 | |
| parent | 6e0b12928e32a715d2dddac5f72cb8adeaf721a2 (diff) | |
Resolves: #327091
Summary: Migration/Upgrade fails when it's from 6.21 to 8.0 on the same OS/architecture
Description:
back-ldbm.h: added LDBM_VERSION_62
dblayer.c: fixed a bug to check the instance dir name
upgrade.c: added LDBM_VERSION_62
| -rw-r--r-- | ldap/servers/slapd/back-ldbm/back-ldbm.h | 4 | ||||
| -rw-r--r-- | ldap/servers/slapd/back-ldbm/dblayer.c | 2 | ||||
| -rw-r--r-- | ldap/servers/slapd/back-ldbm/upgrade.c | 8 |
3 files changed, 8 insertions, 6 deletions
diff --git a/ldap/servers/slapd/back-ldbm/back-ldbm.h b/ldap/servers/slapd/back-ldbm/back-ldbm.h index fe7572bc..0c407da3 100644 --- a/ldap/servers/slapd/back-ldbm/back-ldbm.h +++ b/ldap/servers/slapd/back-ldbm/back-ldbm.h @@ -157,8 +157,8 @@ typedef unsigned short u_int16_t; #define LDBM_VERSION "Netscape-ldbm/7.0" /* db42: new idl -> old */ #define LDBM_VERSION_NEW "Netscape-ldbm/7.0_NEW" /* db42: new idl */ #define LDBM_VERSION_OLD "Netscape-ldbm/7.0_CLASSIC" /* db42: old idl */ -#define LDBM_VERSION_62 "Netscape-ldbm/6.2" /* db33: new idl */ -#define LDBM_VERSION_61 "Netscape-ldbm/6.1" /* db33: new idl */ +#define LDBM_VERSION_62 "Netscape-ldbm/6.2" /* db42: old idl */ +#define LDBM_VERSION_61 "Netscape-ldbm/6.1" /* db33: old idl */ #define LDBM_VERSION_60 "Netscape-ldbm/6.0" /* db33: old idl */ #define LDBM_VERSION_50 "Netscape-ldbm/5.0" diff --git a/ldap/servers/slapd/back-ldbm/dblayer.c b/ldap/servers/slapd/back-ldbm/dblayer.c index 68ea3338..af82af54 100644 --- a/ldap/servers/slapd/back-ldbm/dblayer.c +++ b/ldap/servers/slapd/back-ldbm/dblayer.c @@ -5848,7 +5848,7 @@ int dblayer_update_db_ext(ldbm_instance *inst, char *oldext, char *newext) li = inst->inst_li; priv = (dblayer_private*)li->li_dblayer_private; inst_dirp = dblayer_get_full_inst_dir(li, inst, inst_dir, MAXPATHLEN); - if (!inst_dirp || *inst_dirp) { + if (NULL == inst_dirp || '\0' == *inst_dirp) { LDAPDebug(LDAP_DEBUG_ANY, "update_db_ext: instance dir is NULL\n", 0, 0, 0); return -1; /* non zero */ diff --git a/ldap/servers/slapd/back-ldbm/upgrade.c b/ldap/servers/slapd/back-ldbm/upgrade.c index a64f2578..a9c0cf94 100644 --- a/ldap/servers/slapd/back-ldbm/upgrade.c +++ b/ldap/servers/slapd/back-ldbm/upgrade.c @@ -58,7 +58,8 @@ db_upgrade_info ldbm_version_suss[] = { {BDB_IMPL, 0, 0, DBVERSION_NEW_IDL, DBVERSION_NO_UPGRADE}, {LDBM_VERSION, 4, 2, DBVERSION_NEW_IDL, DBVERSION_NO_UPGRADE}, {LDBM_VERSION_OLD, 4, 2, DBVERSION_OLD_IDL, DBVERSION_NO_UPGRADE}, - {LDBM_VERSION_61, 3, 3, DBVERSION_NEW_IDL, DBVERSION_UPGRADE_3_4}, + {LDBM_VERSION_62, 4, 2, DBVERSION_OLD_IDL, DBVERSION_NO_UPGRADE}, + {LDBM_VERSION_61, 3, 3, DBVERSION_OLD_IDL, DBVERSION_UPGRADE_3_4}, {LDBM_VERSION_60, 3, 3, DBVERSION_OLD_IDL, DBVERSION_UPGRADE_3_4}, {NULL,0,0} }; @@ -274,8 +275,7 @@ adjust_idl_switch(char *ldbmversion, struct ldbminfo *li) li->li_flags |= LI_FORCE_MOD_CONFIG; if ((0 == PL_strncasecmp(ldbmversion, BDB_IMPL, strlen(BDB_IMPL))) || - (0 == PL_strcmp(ldbmversion, LDBM_VERSION)) || - (0 == PL_strcmp(ldbmversion, LDBM_VERSION_61))) /* db: new idl */ + (0 == PL_strcmp(ldbmversion, LDBM_VERSION))) /* db: new idl */ { if (!idl_get_idl_new()) /* config: old idl */ { @@ -288,6 +288,8 @@ adjust_idl_switch(char *ldbmversion, struct ldbminfo *li) } } else if ((0 == strcmp(ldbmversion, LDBM_VERSION_OLD)) || + (0 == PL_strcmp(ldbmversion, LDBM_VERSION_61)) || + (0 == PL_strcmp(ldbmversion, LDBM_VERSION_62)) || (0 == strcmp(ldbmversion, LDBM_VERSION_60))) /* db: old */ { if (idl_get_idl_new()) /* config: new */ |