migration from 4.x sometimes doesn't show LDAP servers in addressbook.
r=srilatha,sr=bienvenu,a=asa
This commit is contained in:
sspitzer%netscape.com 2002-03-16 03:15:28 +00:00
parent ee85e50aed
commit c56257ebc5

View File

@ -175,10 +175,16 @@ NS_IMETHODIMP nsAbBSDirectory::GetChildNodes(nsIEnumerator* *result)
{
DIR_Server *server = (DIR_Server *)(DIR_GetDirectories()->ElementAt(i));
// check: this is a 4.x file, remove when conversion is done
// if this is a 4.x, local .na2 addressbook (PABDirectory)
// we must skip it.
// mozilla can't handle 4.x .na2 addressbooks
// note, the filename might be na2 for 4.x LDAP directories
// (we used the .na2 file for replication), and we don't want to skip
// those. see bug #127007
PRUint32 fileNameLen = strlen(server->fileName);
if ((fileNameLen > kABFileName_PreviousSuffixLen) &&
strcmp(server->fileName + fileNameLen - kABFileName_PreviousSuffixLen, kABFileName_PreviousSuffix) == 0)
if (((fileNameLen > kABFileName_PreviousSuffixLen) &&
strcmp(server->fileName + fileNameLen - kABFileName_PreviousSuffixLen, kABFileName_PreviousSuffix) == 0) &&
(server->dirType == PABDirectory))
continue;
nsCOMPtr <nsIAbDirectoryProperties> properties;