Index: lib/util.c
===================================================================
--- lib/util.c	(revision 6017)
+++ lib/util.c	(working copy)
@@ -641,7 +641,9 @@
 	put_dos_date(buf,22,date);
 	SSVAL(buf,26,size & 0xFFFF);
 	SSVAL(buf,28,(size >> 16)&0xFFFF);
-	push_ascii(buf+30,fname,12,0);
+	/* We only uppercase if the protocol is downrev.
+	   Strange, but verified on W2K3. Needed for OS/2. JRA. */
+	push_ascii(buf+30,fname,12,Protocol < PROTOCOL_NT1 ? STR_UPPER : 0);
 	DEBUG(8,("put name [%s] from [%s] into dir struct\n",buf+30, fname));
 }
 
Index: smbd/dir.c
===================================================================
--- smbd/dir.c	(revision 6017)
+++ smbd/dir.c	(working copy)
@@ -713,16 +713,11 @@
 	SMB_STRUCT_STAT sbuf;
 	pstring path;
 	pstring pathreal;
-	BOOL isrootdir;
 	pstring filename;
 	BOOL needslash;
 
 	*path = *pathreal = *filename = 0;
 
-	isrootdir = (strequal(conn->dirpath,"./") ||
-			strequal(conn->dirpath,".") ||
-			strequal(conn->dirpath,"/"));
-  
 	needslash = ( conn->dirpath[strlen(conn->dirpath) -1] != '/');
 
 	if (!conn->dirptr)
@@ -747,8 +742,6 @@
 		if ((strcmp(mask,"*.*") == 0) ||
 		    mask_match(filename,mask,False) ||
 		    mangle_mask_match(conn,filename,mask)) {
-			if (isrootdir && (strequal(filename,"..") || strequal(filename,".")))
-				continue;
 
 			if (!mangle_is_8_3(filename, False))
 				mangle_map(filename,True,False,SNUM(conn));