X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Fliblutil%2Ffetch.c;h=6535dd20b6ec6b4cb358ce8097779d5dcce4c04c;hb=f2a02b90edde2dbecb342f040603ffac72d99c36;hp=5ed0ad9cb094b35aa7b26cece71d76b39ec20d5c;hpb=c225c4af34700c6a5be880ae8eeaf67fede803fb;p=openldap

diff --git a/libraries/liblutil/fetch.c b/libraries/liblutil/fetch.c
index 5ed0ad9cb0..6535dd20b6 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-2005 The OpenLDAP Foundation.
+ * Copyright 1999-2007 The OpenLDAP Foundation.
  * Portions Copyright 1999-2003 Kurt D. Zeilenga.
  * All rights reserved.
  *
@@ -40,28 +40,26 @@
 
 FILE *
 ldif_open_url(
-	LDAP_CONST char *urlstr
-)
+	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 = strchr( &urlstr[sizeof("file://")-1], '/' );
-		if( p == NULL ) {
-			return NULL;
-		}
+	if( strncasecmp( "file:", urlstr, sizeof("file:")-1 ) == 0 ) {
+		char *p;
+		urlstr += sizeof("file:")-1;
 
 		/* we don't check for LDAP_DIRSEP since URLs should contain '/' */
-		if( *p != '/' ) {
-			/* skip over false root */
-			p++;
+		if ( urlstr[0] == '/' && urlstr[1] == '/' ) {
+			urlstr += 2;
+			/* path must be absolute if authority is present */
+			if ( urlstr[0] != '/' )
+				return NULL;
 		}
 
-		p = ber_strdup( p );
+		p = ber_strdup( urlstr );
 		ldap_pvt_hex_unescape( p );
 
 		url = fopen( p, "rb" );
@@ -78,8 +76,7 @@ int
 ldif_fetch_url(
     LDAP_CONST char	*urlstr,
     char	**valuep,
-    ber_len_t *vlenp
-)
+    ber_len_t *vlenp )
 {
 	FILE *url;
 	char buffer[1024];