This commit was manufactured by cvs2svn to create tag 'pwd'.

git-svn-id: svn://10.0.0.236/tags/pwd@105972 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/build/package/rpm/mozilla

@@ -1,117 +0,0 @@
-#!/bin/sh
-#
-# The contents of this file are subject to the Netscape Public License
-# Version 1.0 (the "NPL"); you may not use this file except in
-# compliance with the NPL.  You may obtain a copy of the NPL at
-# http://www.mozilla.org/NPL/
-#
-# Software distributed under the NPL is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
-# for the specific language governing rights and limitations under the
-# NPL.
-#
-# The Initial Developer of this code under the NPL is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
-# Reserved.
-#
-
-## 
-## Usage:
-##
-## $ mozilla
-##
-## This script is meant to run a mozilla program from the mozilla
-## rpm installation.
-##
-## The script will setup all the environment voodoo needed to make
-## mozilla work.
-
-##
-## Standard shell script disclaimer blurb thing:
-##
-## This script is a hcak.  Its brute force.  Its horrible.  
-## It doesnt use Artificial Intelligence.  It doesnt use Virtual Reality.
-## Its not perl.  Its not python.  It probably wont work unchanged on
-## the "other" thousands of unices.  But it worksforme.
-##
-## If you have an improvement, patch, idea, whatever, on how to make this
-## script better, post it here:
-##
-## news://news.mozilla.org/netscape.public.mozilla.patches
-## news://news.mozilla.org/netscape.public.mozilla.unix
-##
-## 
-
-##
-## Potential improvements:
-##
-## + Run ldd on the program and report missing dlls
-## + All the "other" unices/packages
-##
-
-cmdname=`basename $0`
-
-##
-## location of the apprunner binary.
-##
-MOZ_APPRUNNER_NAME="/usr/lib/mozilla/bin/apprunner"
-
-##
-## Variables
-##
-MOZ_DIST_BIN=""
-MOZ_PROGRAM=""
-
-##
-## Functions
-##
-moz_bail()
-{
-	message=$1
-
-	echo
-	echo "$cmdname: $message"
-	echo
-
-	exit 1
-}
-
-moz_test_binary()
-{
-	binary=$1
-
-	if [ -f "$binary" ]
-	then
-		if [ -x "$binary" ]
-		then
-			return 1
-		fi
-	fi
-
-	return 0
-}
-
-moz_test_binary $MOZ_APPRUNNER_NAME
-
-if [ $? -eq 1 ]
-then
-	MOZ_PROGRAM=$MOZ_APPRUNNER_NAME
-fi
-
-##
-## Make sure the program is executable
-##
-if [ ! -x $MOZ_PROGRAM ]
-then
-	moz_bail "Cannot execute $MOZ_PROGRAM."
-fi
-
-##
-## Set MOZILLA_FIVE_HOME
-##
-MOZILLA_FIVE_HOME="/usr/lib/mozilla"
-
-export MOZILLA_FIVE_HOME
-
-exec ./$MOZ_PROGRAM ${1+"$@"}

mozilla/build/package/rpm/mozilla-viewer

@@ -1,111 +0,0 @@
-#!/bin/sh
-#
-# The contents of this file are subject to the Netscape Public License
-# Version 1.0 (the "NPL"); you may not use this file except in
-# compliance with the NPL.  You may obtain a copy of the NPL at
-# http://www.mozilla.org/NPL/
-#
-# Software distributed under the NPL is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
-# for the specific language governing rights and limitations under the
-# NPL.
-#
-# The Initial Developer of this code under the NPL is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
-# Reserved.
-#
-
-## 
-## Usage:
-##
-## $ mozilla
-##
-## This script is meant to run a mozilla program from the mozilla
-## rpm installation.
-##
-## The script will setup all the environment voodoo needed to make
-## mozilla work.
-
-##
-## Standard shell script disclaimer blurb thing:
-##
-## This script is a hcak.  Its brute force.  Its horrible.  
-## It doesnt use Artificial Intelligence.  It doesnt use Virtual Reality.
-## Its not perl.  Its not python.  It probably wont work unchanged on
-## the "other" thousands of unices.  But it worksforme.
-##
-## If you have an improvement, patch, idea, whatever, on how to make this
-## script better, post it here:
-##
-## news://news.mozilla.org/netscape.public.mozilla.patches
-## news://news.mozilla.org/netscape.public.mozilla.unix
-##
-## 
-
-##
-## Potential improvements:
-##
-## + Run ldd on the program and report missing dlls
-## + All the "other" unices/packages
-##
-
-cmdname=`basename $0`
-
-##
-## location of the viewer binary.
-##
-MOZ_VIEWER_NAME="/usr/lib/mozilla/bin/viewer"
-
-##
-## Variables
-##
-MOZ_PROGRAM=""
-
-##
-## Functions
-##
-moz_bail()
-{
-	message=$1
-
-	echo
-	echo "$cmdname: $message"
-	echo
-
-	exit 1
-}
-
-moz_test_binary()
-{
-	binary=$1
-
-	if [ -f "$binary" ]
-	then
-		if [ -x "$binary" ]
-		then
-			return 1
-		fi
-	fi
-
-	return 0
-}
-
-
-MOZ_PROGRAM=$MOZ_APPRUNNER_NAME
-
-moz_test_binary $MOZ_PROGRAM
-
-if [ $? -eq 0 ]
-then
-	moz_bail "Cannot execute $MOZ_PROGRAM."
-fi
-
-##
-## Set MOZILLA_FIVE_HOME
-##
-MOZILLA_FIVE_HOME="/usr/lib/mozilla"
-
-export MOZILLA_FIVE_HOME
-
-exec $MOZ_PROGRAM ${1+"$@"}

mozilla/build/package/rpm/mozilla.spec.in

@@ -1,98 +0,0 @@
-%define ver		@MOZ_RPM_VERSION@
-%define rel		@MOZ_RPM_RELEASE@
-%define prefix	@MOZ_RPM_PREFIX@
-%define tmp		@MOZ_RPM_TMP@
-
-Summary:	Mozilla / ButtMonkey / Gecko / Whatever
-Name:		mozilla
-Version:	%ver
-Release:	%rel
-Copyright:	NPL
-Group:		Mozilla
-Source:		mozilla-%{ver}-%{rel}.tar.gz
-BuildRoot:	%{tmp}/%{name}-root
-Packager:	Ramiro Estrugo <ramiro@netscape.com>
-URL:		http://www.mozilla.org/
-Provides:	mozilla
-Requires:	glib >= 1.2.1 gtk+ >= 1.2.1 nspr-pthreads >= 3.1
-
-%description
-Mozilla
-
-%package devel
-Summary:	Mozilla development crap
-Group:		Mozilla
-#Requires:	mozilla nspr-devel
-
-#Obsoletes: libnspr-devel
-#Conflicts: libnspr-userthreads-devel
-
-%description devel
-Mozilla development libs and headers
-
-%prep
-%setup -n mozilla
-
-%build
-./configure \
-			--with-pthreads \
-			--enable-toolkit=gtk \
-			--disable-build-nspr \
-			@MOZ_RPM_SEAMONKEY_OPTIMIZE@
-
-make
-
-%install
-mkdir -p $RPM_BUILD_ROOT%{prefix}/lib/mozilla/bin
-mkdir -p $RPM_BUILD_ROOT%{prefix}/include/mozilla
-mkdir -p $RPM_BUILD_ROOT%{prefix}/lib
-mkdir -p $RPM_BUILD_ROOT%{prefix}/lib/mozilla/idl
-mkdir -p $RPM_BUILD_ROOT%{prefix}/lib/mozilla/components
-mkdir -p $RPM_BUILD_ROOT%{prefix}/lib/mozilla/res
-mkdir -p $RPM_BUILD_ROOT/usr/bin
-
-cp -rpv dist/bin/components/*.so $RPM_BUILD_ROOT%{prefix}/lib/mozilla/components
-cp -rpv dist/bin/res/* $RPM_BUILD_ROOT%{prefix}/lib/mozilla/res
-cp -rpv dist/bin/*.so $RPM_BUILD_ROOT%{prefix}/lib
-cp -rpv dist/include/* $RPM_BUILD_ROOT%{prefix}/include/mozilla
-cp -rpv dist/idl/* $RPM_BUILD_ROOT%{prefix}/lib/mozilla/idl
-cp -rpv dist/lib/*.a $RPM_BUILD_ROOT%{prefix}/lib
-cp -rpv dist/bin/apprunner $RPM_BUILD_ROOT%{prefix}/lib/mozilla/bin
-cp -rpv dist/bin/viewer $RPM_BUILD_ROOT%{prefix}/lib/mozilla/bin
-cp -rpv dist/bin/vreg $RPM_BUILD_ROOT%{prefix}/lib/mozilla/bin
-
-cp -rpv build/mozilla-viewer.sh $RPM_BUILD_ROOT/usr/bin/mozilla-viewer
-cp -rpv build/mozilla-apprunner.sh $RPM_BUILD_ROOT/usr/bin/mozilla-apprunner
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%post
-
-#if grep "/usr/mozilla/lib" /etc/ld.so.conf > /dev/null 2>&1
-#then
-#	:
-#else
-#	echo "/usr/mozilla/lib" >> /etc/ld.so.conf
-#fi
-#
-#/sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
-%files
-%attr(-, root, root)
-
-%{prefix}/lib/mozilla/components/*
-%{prefix}/lib/*.so
-%{prefix}/lib/mozilla/bin/*
-%{prefix}/lib/mozilla/res/*
-%attr(755, root, root)/usr/bin/mozilla-viewer
-%attr(755, root, root)/usr/bin/mozilla-apprunner
-
-%files devel
-%attr(-, root, root)
-
-%{prefix}/lib/*.a
-%{prefix}/include/mozilla/*
-%{prefix}/lib/mozilla/idl/*

mozilla/build/package/rpm/nspr-pthreads.spec.in

@@ -1,76 +0,0 @@
-%define ver		@MOZILLA_RPM_VERSION@
-%define rel		@MOZILLA_RPM_RELEASE@
-%define prefix	@MOZILLA_RPM_PREFIX@
-%define tmp		@MOZILLA_RPM_TMP@
-
-Summary:	Netscape Portable Runtime (NSPR)
-Name:		nspr-pthreads
-Version:	%ver
-Release:	%rel
-Copyright:	NPL
-Group:		Development/Libraries
-Source:		nspr-pthreads-%{ver}-%{rel}.tar.gz
-BuildRoot:	%{tmp}/%{name}-root
-Packager:	Ramiro Estrugo <ramiro@netscape.com>
-URL:		http://www.mozilla.org/docs/tplist/catCode/nsprdesc.htm
-Provides:	nspr
-
-%description
-Libraries that implement cross-platform runtime services from Netscape.
-
-%package devel
-Summary:	NSPR library header files for development
-Group:		Development/Libraries
-Requires:	nspr
-#Obsoletes: libnspr-devel
-#Conflicts: libnspr-userthreads-devel
-
-%description devel
-Header files for the NSPR library from Netscape
-
-%prep
-%setup -n nspr-pthreads
-
-%build
-make \
-	DIST=$RPM_BUILD_ROOT%{prefix} \
-	NSDISTMODE=copy \
-	USE_PTHREADS=1 \
-	@MOZILLA_RPM_NSPR_OPTIMIZE@ \
-	export
-
-%install
-make \
-	DIST=$RPM_BUILD_ROOT%{prefix} \
-	NSDISTMODE=copy \
-	USE_PTHREADS=1 \
-	@MOZILLA_RPM_NSPR_OPTIMIZE@ \
-	install
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%post
-
-#if grep "/usr/mozilla/lib" /etc/ld.so.conf > /dev/null 2>&1
-#then
-#	:
-#else
-#	echo "/usr/mozilla/lib" >> /etc/ld.so.conf
-#fi
-#
-#/sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
-%files
-%attr(-, root, root)
-
-%{prefix}/lib/*.so
-
-%files devel
-%attr(-, root, root)
-
-%{prefix}/include/*
-%{prefix}/lib/*.a
-

mozilla/directory/c-sdk/ldap/libraries/libprldap/Makefile.client

@@ -0,0 +1,168 @@
+# 
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#  
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#  
+# The Original Code is Mozilla Communicator client code, released
+# March 31, 1998.
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation. Portions created by Netscape are
+# Copyright (C) 1998-1999 Netscape Communications Corporation. All
+# Rights Reserved.
+# 
+# Contributor(s): 
+#
+
+DEPTH		= ../../../../..
+NS_DEPTH	= ../../../..
+LDAP_SRC	= ../..
+NSCP_DISTDIR    = ../../../../../dist
+NSPR_TREE = ../../..
+MOD_DEPTH = ../../..
+
+include $(NSPR_TREE)/config/rules.mk
+include		../../../build.mk
+
+SRCS		= ldappr-dns.c \
+		  ldappr-error.c \
+		  ldappr-io.c \
+		  ldappr-public.c \
+		  ldappr-threads.c
+
+ifeq ($(OS_ARCH), WINNT)
+REALOBJS        = $(SRCS:.c=.obj)
+else
+REALOBJS	= $(SRCS:.c=.o)
+endif
+
+PROBJDEST 	= $(OBJDIR_NAME)
+OBJS		= $(addprefix $(PROBJDEST)/, $(REALOBJS)) 
+
+DISTHDIR	= $(NSCP_DISTDIR)/public/ldap
+HDIR		= $(LDAP_SRC)/include
+
+ifeq ($(OS_ARCH), WINNT)
+LIBPRLDAP	= $(addprefix $(PROBJDEST)/, \
+			nsldappr32v$(PRLDAPVERS).$(DLL_SUFFIX))
+DLLPRLDAP	= $(addprefix $(PROBJDEST)/, \
+			nsldappr32v$(PRLDAPVERS).$(LIB_SUFFIX))
+else
+LIBPRLDAP	= $(addprefix $(PROBJDEST)/, lib$(PRLDAP_LIBNAME).$(DLL_SUFFIX))
+endif
+INSTALLDIR      = $(DEPTH)/dist/$(OBJDIR_NAME)
+
+LOCAL_INCLUDES  = -I$(PUBLIC)/nspr
+INCLUDES	+= -I$(DISTHDIR) -I$(HDIR) -I$(INSTALLDIR)/include \
+		   -I../../../../../dist/include
+DEFINES		+= $(DEFS)
+
+PLATFORMCFLAGS	= -DUSE_WAITPID -DNEEDPROTOS
+PLATFORMLIBS	=
+THREADS		=
+THREADSLIB	=
+
+#
+# shared library symbol export definitions
+#
+ifeq ($(USE_DLL_EXPORTS_FILE), 1)
+ifeq ($(OS_ARCH), WINNT)
+GENEXPORTS=cmd /c  $(PERL) $(LDAP_SRC)/build/genexports.pl
+else
+GENEXPORTS=$(PERL) $(LDAP_SRC)/build/genexports.pl
+endif
+
+# variable definitions for exported symbols
+ifeq ($(OS_ARCH), WINNT)
+        PRLDAP_EXPORT_DEFS=../msdos/winsock/nsldappr32.def
+else
+        PRLDAP_EXPORT_DEFS= $(PROBJDEST)/libprldap.exp
+endif
+
+PRLDAP_EXPORT_FLAGS=$(addprefix $(DLLEXPORTS_PREFIX), $(PRLDAP_EXPORT_DEFS))
+
+GENEXPARGS=$(BUILD_DEBUG) $(PRLDAPVERS_SUFFIX) $(PRLDAPVERS)
+endif # USE_DLL_EXPORTS_FILE
+
+ifeq ($(OS_ARCH), SunOS)
+EXTRA_LIBS = -L$(NSCP_DISTDIR)/$(OBJDIR_NAME)/lib -l$(LDAP_LIBNAME)
+EXTRA_LIBS += -L$(NSCP_DISTDIR)/lib $(DYNAMICNSPR)
+endif
+
+ifeq ($(OS_ARCH), WINNT)
+EXTRA_LIBS =wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib \
+            comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib \
+            rpcrt4.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib
+EXTRA_LIBS += $(NSCP_DISTDIR)/$(OBJDIR_NAME)/lib/$(LDAP_LIBNAME).lib
+EXTRA_LIBS += $(NSCP_DISTDIR)/$(OBJDIR_NAME)/lib/$(PLC_BASENAME).lib
+EXTRA_LIBS += $(NSCP_DISTDIR)/$(OBJDIR_NAME)/lib/$(PLDS_BASENAME).lib
+EXTRA_LIBS += $(NSCP_DISTDIR)/$(OBJDIR_NAME)/lib/$(NSPR_BASENAME).lib
+endif
+
+ifeq ($(OS_ARCH), OSF1)
+EXTRA_LIBS = -L$(NSCP_DISTDIR)/$(OBJDIR_NAME)/lib -l$(LDAP_LIBNAME)
+EXTRA_LIBS += -L$(NSCP_DISTDIR)/lib $(DYNAMICNSPR)
+EXTRA_LIBS += -lcxx -lpthread -lrt -lmach -lexc
+endif
+
+ifeq ($(OS_ARCH), AIX)
+EXTRA_LIBS = -L$(NSCP_DISTDIR)/$(OBJDIR_NAME)/lib -l$(LDAP_LIBNAME)
+EXTRA_LIBS += -L$(NSCP_DISTDIR)/lib $(DYNAMICNSPR)
+EXTRA_LIBS += -ldl -brtl -lpthreads -lc_r -lm
+endif
+
+OBJDEST = $(OBJDIR_NAME)
+
+###########################################################################
+
+# recursive gmake rule to create exported symbols file
+$(PROBJDEST)/libprldap.exp:: libprldap.ex
+ifeq ($(OS_ARCH), WINNT)
+	$(GENEXPORTS) Win32 Standard $< $(GENEXPARGS) > $@
+else
+	$(GENEXPORTS) $(OS_ARCH) Standard $< $(GENEXPARGS) > $@
+endif
+
+versiont.c:	Makefile.client Version.c
+	@$(RM) $@
+	@(u="$${USER-root}" v="$(shell cat ../../build/version)" d="$(shell pwd)" \
+	h="$(shell hostname)" t="$(shell date)"; $(SED) -e "s|%WHEN%|$${t}|" \
+	-e "s|%WHOANDWHERE%|$${u}@$${h}:$${d}|" \
+	-e "s|%VERSION%|$${v}|" \
+	< Version.c > $@)
+
+all::    $(OBJDEST) $(LIBDIR) $(OBJS) $(LIBPRLDAP)
+
+$(LIBDIR):
+	$(MKDIR) $(LIBDIR)
+
+$(LIBPRLDAP): $(OBJS) $(LIBDIR) $(PRLDAP_EXPORT_DEFS)
+	@echo ======= making $(LIBPRLDAP)
+ifdef SO_FILES_TO_REMOVE
+	-$(RM) $(SO_FILES_TO_REMOVE)
+endif
+	$(LINK_DLL) $(DSO_LDOPTS) $(PRLDAP_EXPORT_FLAGS) $(EXTRA_LIBS)
+
+veryclean:: clean
+
+clean::
+	$(RM) $(OBJS) $(LIBPRLDAP)
+	$(RM) -r $(PROBJDEST)
+
+$(OBJDEST):
+	$(MKDIR) $(OBJDEST)
+
+install:: $(LIBPRLDAP)	
+ifeq ($(OS_ARCH), WINNT)
+	$(INSTALL) -m 555 $(LIBPRLDAP) $(INSTALLDIR)/lib
+	$(INSTALL) -m 555 $(DLLPRLDAP) $(INSTALLDIR)/lib
+endif
+ifdef MKSHLIB
+	$(INSTALL) -m 555 $(LIBPRLDAP) $(INSTALLDIR)/lib
+endif

mozilla/directory/c-sdk/ldap/libraries/libprldap/ldappr-dns.c

@@ -0,0 +1,117 @@
+/*
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is Mozilla Communicator client code, released
+ * March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation. Portions created by Netscape are
+ * Copyright (C) 1998-1999 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s):
+ */
+
+/*
+ * DNS callback functions for libldap that use the NSPR (Netscape
+ * Portable Runtime) thread API.
+ *
+ */
+
+#include "ldappr-int.h"
+
+static LDAPHostEnt *prldap_gethostbyname( const char *name,
+	LDAPHostEnt *result, char *buffer, int buflen, int *statusp,
+	void *extradata );
+static LDAPHostEnt *prldap_gethostbyaddr( const char *addr, int length,
+	int type, LDAPHostEnt *result, char *buffer, int buflen,
+	int *statusp, void *extradata );
+static LDAPHostEnt *prldap_convert_hostent( LDAPHostEnt *ldhp,
+	PRHostEnt *prhp );
+
+
+/*
+ * Install NSPR DNS functions into ld (if ld is NULL, they are installed
+ * as the default functions for new LDAP * handles).
+ *
+ * Returns 0 if all goes well and -1 if not.
+ */
+int
+prldap_install_dns_functions( LDAP *ld )
+{
+    struct ldap_dns_fns			dnsfns;
+
+    memset( &dnsfns, '\0', sizeof(struct ldap_dns_fns) );
+    dnsfns.lddnsfn_bufsize = PR_NETDB_BUF_SIZE;
+    dnsfns.lddnsfn_gethostbyname = prldap_gethostbyname;
+    dnsfns.lddnsfn_gethostbyaddr = prldap_gethostbyaddr;
+    if ( ldap_set_option( ld, LDAP_OPT_DNS_FN_PTRS, (void *)&dnsfns ) != 0 ) {
+	return( -1 );
+    }
+
+    return( 0 );
+}
+
+
+static LDAPHostEnt *
+prldap_gethostbyname( const char *name, LDAPHostEnt *result,
+	char *buffer, int buflen, int *statusp, void *extradata )
+{
+    PRHostEnt	prhent;
+
+    if( !statusp || ( *statusp = (int)PR_GetIPNodeByName( name,
+		PRLDAP_DEFAULT_ADDRESS_FAMILY, PR_AI_DEFAULT,
+		buffer, buflen, &prhent )) == PR_FAILURE ) {
+	return( NULL );
+    }
+
+    return( prldap_convert_hostent( result, &prhent ));
+}
+
+
+static LDAPHostEnt *
+prldap_gethostbyaddr( const char *addr, int length, int type,
+	LDAPHostEnt *result, char *buffer, int buflen, int *statusp,
+	void *extradata )
+{
+    PRHostEnt	prhent;
+    PRNetAddr	iaddr;
+
+    if ( PR_SetNetAddr(PR_IpAddrNull, PRLDAP_DEFAULT_ADDRESS_FAMILY,
+		0, &iaddr) == PR_FAILURE
+		|| PR_StringToNetAddr( addr, &iaddr ) == PR_FAILURE ) {
+	return( NULL );
+    }
+
+    if( !statusp || (*statusp = PR_GetHostByAddr(&iaddr, buffer,
+	     buflen, &prhent )) == PR_FAILURE ) {
+	return( NULL );
+    }
+
+    return( prldap_convert_hostent( result, &prhent ));
+}
+
+
+/*
+ * Function: prldap_convert_hostent()
+ * Description: copy the fields of a PRHostEnt struct to an LDAPHostEnt
+ * Returns: the LDAPHostEnt pointer passed in.
+ */
+static LDAPHostEnt *
+prldap_convert_hostent( LDAPHostEnt *ldhp, PRHostEnt *prhp )
+{
+	ldhp->ldaphe_name = prhp->h_name;
+	ldhp->ldaphe_aliases = prhp->h_aliases;
+	ldhp->ldaphe_addrtype = prhp->h_addrtype;
+	ldhp->ldaphe_length =  prhp->h_length;
+	ldhp->ldaphe_addr_list =  prhp->h_addr_list;
+	return( ldhp );
+}

mozilla/xpfe/browser/resources/locale/en-US/Makefile.in

@@ -1,32 +0,0 @@
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-#
-
-DEPTH		= ../../../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-DIRS		= mac unix win
-
-include $(topsrcdir)/config/rules.mk
-

mozilla/xpfe/browser/resources/locale/en-US/Manifest

@@ -1,5 +0,0 @@
-navigator.dtd
-viewSource.dtd
-pageInfo.dtd
-navigator.properties
-askViewZoom.dtd

mozilla/xpfe/browser/resources/locale/en-US/contents-region.rdf

@@ -1,26 +0,0 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the locale being supplied by this package -->
-  <RDF:Seq about="urn:mozilla:locale:root">
-    <RDF:li resource="urn:mozilla:locale:US"/>
-  </RDF:Seq>
-
-  <!-- locale information -->
-  <RDF:Description about="urn:mozilla:locale:US"
-        chrome:author="mozilla.org"
-        chrome:name="US"
-        chrome:previewURL="http://www.mozilla.org/locales/US.gif">
-    <chrome:packages>
-      <RDF:Seq about="urn:mozilla:locale:US:packages">
-        <RDF:li resource="urn:mozilla:locale:US:navigator-region"/>
-      </RDF:Seq>
-    </chrome:packages>
-  </RDF:Description>
-
-  <!-- Version Information.  State that we work only with major version of this
-       package. -->
-  <RDF:Description about="urn:mozilla:locale:US:navigator-region"
-	chrome:localeVersion="1.2"/>
-</RDF:RDF>

mozilla/xpfe/browser/resources/locale/en-US/contents.rdf

@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the skins being supplied by this package -->
-  <RDF:Seq about="urn:mozilla:locale:root">
-    <RDF:li resource="urn:mozilla:locale:en-US"/>
-  </RDF:Seq>
-
-  <!-- locale information -->
-  <RDF:Description about="urn:mozilla:locale:en-US">
-    <chrome:packages>
-      <RDF:Seq about="urn:mozilla:locale:en-US:packages">
-        <RDF:li resource="urn:mozilla:locale:en-US:navigator"/>
-      </RDF:Seq>
-    </chrome:packages>
-  </RDF:Description>
-
-  <!-- Version Information.  State that we work only with major version of this
-       package. -->
-  <RDF:Description about="urn:mozilla:locale:en-US:navigator"
-	chrome:localeVersion="1.2"/>
-</RDF:RDF>

mozilla/xpfe/browser/resources/locale/en-US/linkToolbar.dtd

@@ -1,79 +0,0 @@
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Christopher Hoess <choess@stwing.upenn.edu>'s code.
-   -
-   - The Initial Developer of the Original Code is
-   - Christopher Hoess.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -      Eric Hodel <drbrain@segment7.net>
-   -      Stuart Ballard <sballard@netreach.net>
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the LGPL or the GPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<!-- Link Toolbar Title -->
-<!ENTITY linkToolbar.label "Site Navigation Bar">
-<!ENTITY linkToolbar.accesskey "a">
-
-<!-- Link Toolbar visibility options -->
-<!ENTITY linkToolbarAlways.label "Show Always">
-<!ENTITY linkToolbarAlways.accesskey "S">
-<!ENTITY linkToolbarAsNeeded.label "Show Only As Needed">
-<!ENTITY linkToolbarAsNeeded.accesskey "O">
-<!ENTITY linkToolbarNever.label "Hide Always">
-<!ENTITY linkToolbarNever.accesskey "H">
-
-<!-- Toolbar buttons, menus, and menuitems -->
-<!ENTITY topButton.label "Top">
-<!ENTITY upButton.label "Up">
-<!ENTITY firstButton.label "First">
-<!ENTITY prevButton.label "Previous">
-<!ENTITY nextButton.label "Next">
-<!ENTITY lastButton.label "Last">
-
-<!ENTITY documentButton.label "Document">
-
-<!ENTITY tocButton.label "Table of Contents">
-<!ENTITY chapterButton.label "Chapters">
-<!ENTITY sectionButton.label "Sections">
-<!ENTITY subSectionButton.label "Subsections">
-<!ENTITY appendixButton.label "Appendices">
-<!ENTITY glossaryButton.label "Glossary">
-<!ENTITY indexButton.label "Index">
-
-<!ENTITY moreButton.label "More">
-
-<!ENTITY helpButton.label "Help">
-<!ENTITY searchButton.label "Search">
-
-<!ENTITY authorButton.label "Authors">
-<!ENTITY copyrightButton.label "Copyright">
-
-<!ENTITY bookmarkButton.label "Bookmarks">
-
-<!ENTITY alternateButton.label "Other Versions">

mozilla/xpfe/browser/resources/locale/en-US/metadata.dtd

@@ -1,26 +0,0 @@
-<!ENTITY no-properties.label   "No properties set.">
-
-<!ENTITY caption.label         "Element Properties">
-<!ENTITY image-sec.label       "Image Properties">
-<!ENTITY image-url.label       "Location:">
-<!ENTITY image-desc.label      "Description:">
-<!ENTITY image-alt.label       "Alternate text:">
-<!ENTITY image-width.label     "Width:">
-<!ENTITY image-height.label    "Height:">
-<!ENTITY image-filesize.label  "Size of File:">
-<!ENTITY insdel-sec.label      "Insert/Delete Properties">
-<!ENTITY insdel-cite.label     "Info:">
-<!ENTITY insdel-date.label     "Date:">
-<!ENTITY link-sec.label        "Link Properties">
-<!ENTITY link-url.label        "Address:">
-<!ENTITY link-target.label     "Will open in:">
-<!ENTITY link-type.label       "Target type:">
-<!ENTITY link-lang.label       "Target language:">
-<!ENTITY link-rel.label        "Relation:">
-<!ENTITY link-rev.label        "Reversed relation:">
-<!ENTITY misc-sec.label        "Miscellaneous Properties">
-<!ENTITY misc-lang.label       "Text language:">
-<!ENTITY misc-title.label      "Title:">
-<!ENTITY misc-tblsummary.label "Table summary:">
-<!ENTITY quote-sec.label       "Quote Properties">
-<!ENTITY quote-cite.label      "Info:">

mozilla/xpfe/browser/resources/locale/en-US/metadata.properties

@@ -1,12 +0,0 @@
-sameWindowText=Same window
-newWindowText=New window
-parentFrameText=Parent frame
-sameFrameText=Same frame
-embeddedText=Embedded
-unableToShowProps=No properties available.
-altTextMissing=Missing
-altTextBlank=Blank
-imageSize=%S KB (%S bytes)
-imageSizeUnknown=Unknown (not cached)
-imageWidth=%Spx
-imageHeight=%Spx