X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=libraries%2Fliblutil%2Ffetch.c;h=a56806e0c01f79e2140ee2194760bdec8e0a4369;hb=34249c08a5c15ebf15f78570ca61e6acad94dc22;hp=3177744097b9b479c1819309b0968d4225be7d3c;hpb=e7be7301c20b8232c03574bc07ff255246d3a34f;p=openldap

diff --git a/libraries/liblutil/fetch.c b/libraries/liblutil/fetch.c
index 3177744097..a56806e0c0 100644
--- a/libraries/liblutil/fetch.c
+++ b/libraries/liblutil/fetch.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1999-2006 The OpenLDAP Foundation.
+ * Copyright 1999-2010 The OpenLDAP Foundation.
  * Portions Copyright 1999-2003 Kurt D. Zeilenga.
  * All rights reserved.
  *
@@ -43,28 +43,40 @@ ldif_open_url(
 	LDAP_CONST char *urlstr )
 {
 	FILE *url;
-	char *p = NULL;
-#ifdef HAVE_FETCH
-	url = fetchGetURL( (char*) urlstr, "" );
 
-#else
 	if( strncasecmp( "file:", urlstr, sizeof("file:")-1 ) == 0 ) {
-		p = urlstr + sizeof("file:")-1;
+		char *p;
+		urlstr += sizeof("file:")-1;
 
 		/* we don't check for LDAP_DIRSEP since URLs should contain '/' */
-		if ( p[0] == '/' && p[1] == '/' )
-			p += 2;
+		if ( urlstr[0] == '/' && urlstr[1] == '/' ) {
+			urlstr += 2;
+			/* path must be absolute if authority is present */
+			if ( urlstr[0] != '/' )
+				return NULL;
+		}
+
+		p = ber_strdup( urlstr );
+
+		/* But we should convert to LDAP_DIRSEP before use */
+		if ( LDAP_DIRSEP[0] != '/' ) {
+			char *s = p;
+			while (( s = strchr( s, '/' )))
+				*s++ = LDAP_DIRSEP[0];
+		}
 
-		p = ber_strdup( p );
 		ldap_pvt_hex_unescape( p );
 
 		url = fopen( p, "rb" );
 
 		ber_memfree( p );
 	} else {
-		return NULL;
-	}
+#ifdef HAVE_FETCH
+		url = fetchGetURL( (char*) urlstr, "" );
+#else
+		url = NULL;
 #endif
+	}
 	return url;
 }