summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNoriko Hosoi <nhosoi@redhat.com>2007-11-30 17:23:13 +0000
committerNoriko Hosoi <nhosoi@redhat.com>2007-11-30 17:23:13 +0000
commit3bf0ca3253f3cefff70cc9f3e1ecb70978fb506b (patch)
tree9f63789c5481990de4e01cb68a755ba5cfdcbd2b
parente50f4bdf47b2d9b0f8af601b76e8722d72c863bb (diff)
downloadds-3bf0ca3253f3cefff70cc9f3e1ecb70978fb506b.tar.gz
ds-3bf0ca3253f3cefff70cc9f3e1ecb70978fb506b.tar.xz
ds-3bf0ca3253f3cefff70cc9f3e1ecb70978fb506b.zip
Resolves: #316281
Summary: db2bak fails if the archive path exists and ends with '/' (Comment #8) Description: Changed the condition to normalize the path: if '.' or '/' is included in the path, normalize it.
-rw-r--r--ldap/servers/slapd/util.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ldap/servers/slapd/util.c b/ldap/servers/slapd/util.c
index aaf5e061..e51c6685 100644
--- a/ldap/servers/slapd/util.c
+++ b/ldap/servers/slapd/util.c
@@ -529,8 +529,8 @@ rel2abspath_ext( char *relpath, char *cwd )
}
}
retpath = slapi_ch_strdup(abspath);
- /* if there's no '.', no need to call normalize_path */
- if (NULL != strchr(abspath, '.') || NULL != strstr(abspath, _PSEP2))
+ /* if there's no '.' or separators, no need to call normalize_path */
+ if (NULL != strchr(abspath, '.') || NULL != strstr(abspath, _PSEP))
{
char **norm_path = normalize_path(abspath);
char **np, *rp;