From 0ea4864d1df9b63ed20a69a315572b331c16a8e2 Mon Sep 17 00:00:00 2001 From: "cls%seawood.org" Date: Sat, 13 Nov 1999 23:51:49 +0000 Subject: [PATCH] Removing dependency upon security/freenav module. r=alecf --- extensions/cookie/makefile.win | 1 - extensions/cookie/nsCookie.cpp | 2 -- include/msgcom.h | 3 --- mailnews/compose/public/nsIMsgSend.idl | 3 --- mailnews/compose/src/nsSmtpProtocol.cpp | 24 +++++++----------------- mailnews/compose/src/nsSmtpProtocol.h | 2 -- mailnews/local/src/nsMailboxProtocol.cpp | 3 +-- mailnews/local/src/nsMailboxProtocol.h | 2 -- mailnews/local/src/nsPop3Protocol.h | 1 - mailnews/mime/src/mimemoz2.cpp | 1 - mailnews/news/src/nntpCore.h | 2 -- mailnews/news/src/nsNNTPProtocol.cpp | 24 ++++++++---------------- mailnews/news/src/nsNNTPProtocol.h | 3 --- modules/libpref/src/makefile.win | 4 +--- 14 files changed, 17 insertions(+), 58 deletions(-) diff --git a/extensions/cookie/makefile.win b/extensions/cookie/makefile.win index 76bd23ac4f0f..88464fae295c 100644 --- a/extensions/cookie/makefile.win +++ b/extensions/cookie/makefile.win @@ -69,7 +69,6 @@ LLIBS = \ !else $(DIST)\lib\netwerk.lib \ !endif - $(DIST)\lib\secfreenav32.lib \ $(HASHLIBS) include <$(DEPTH)\config\rules.mak> diff --git a/extensions/cookie/nsCookie.cpp b/extensions/cookie/nsCookie.cpp index c10117efe19c..b370f18cf452 100644 --- a/extensions/cookie/nsCookie.cpp +++ b/extensions/cookie/nsCookie.cpp @@ -45,8 +45,6 @@ extern "C" { #else #include "private/prpriv.h" #endif -#include "sechash.h" -#include "rosetta.h" } static NS_DEFINE_IID(kIFileLocatorIID, NS_IFILELOCATOR_IID); diff --git a/include/msgcom.h b/include/msgcom.h index 005f3b8802ae..c4cf0b9c2751 100644 --- a/include/msgcom.h +++ b/include/msgcom.h @@ -27,7 +27,6 @@ #ifndef _MSGCOM_H_ #define _MSGCOM_H_ -#include "rosetta.h" #if 0 #include "libmime.h" #endif @@ -880,8 +879,6 @@ typedef struct MSG_AttachedFile uint32 null_count; uint32 max_line_length; - HG68452 - } MSG_AttachedFile; diff --git a/mailnews/compose/public/nsIMsgSend.idl b/mailnews/compose/public/nsIMsgSend.idl index 7abe36a7cb69..20fc91827c36 100644 --- a/mailnews/compose/public/nsIMsgSend.idl +++ b/mailnews/compose/public/nsIMsgSend.idl @@ -39,7 +39,6 @@ %{C++ #include "nsIURL.h" -#include "rosetta.h" #include "rosetta_mailnews.h" %} @@ -137,8 +136,6 @@ typedef struct nsMsgAttachedFile PRUint32 null_count; PRUint32 max_line_length; - HG68452 - } nsMsgAttachedFile; %} diff --git a/mailnews/compose/src/nsSmtpProtocol.cpp b/mailnews/compose/src/nsSmtpProtocol.cpp index d54a7f65ef43..77c45799ef30 100644 --- a/mailnews/compose/src/nsSmtpProtocol.cpp +++ b/mailnews/compose/src/nsSmtpProtocol.cpp @@ -644,7 +644,6 @@ PRInt32 nsSmtpProtocol::SendEhloResponse(nsIInputStream * inputStream, PRUint32 if (m_responseCode != 250) { - HG10349 buffer = "HELO "; buffer += GetUserDomainName(); buffer += CRLF; @@ -688,13 +687,13 @@ PRInt32 nsSmtpProtocol::SendEhloResponse(nsIInputStream * inputStream, PRUint32 m_authMethod = SMTP_AUTH_LOGIN; /* old style */ } #ifdef UNREADY_CODE - HG40702 - - HG30626 - - HG16713 { - HG92990 + if (CD_AUTH_LOGIN_METHOD) { + CD_NEXT_STATE = SMTP_SEND_AUTH_LOGIN_USERNAME; + CD_NEXT_STATE_AFTER_RESPONSE = SMTP_AUTH_LOGIN_RESPONSE; + } else { + CD_NEXT_STATE = SMTP_SEND_HELO_RESPONSE; + } } #endif @@ -709,8 +708,6 @@ PRInt32 nsSmtpProtocol::SendEhloResponse(nsIInputStream * inputStream, PRUint32 } } -HG76227 - PRInt32 nsSmtpProtocol::AuthLoginResponse(nsIInputStream * stream, PRUint32 length) { PRInt32 status = 0; @@ -1278,7 +1275,6 @@ nsresult nsSmtpProtocol::LoadUrl(nsIURI * aURL, nsISupports * aConsumer ) PRInt32 status = 0; m_continuationResponse = -1; /* init */ //nsISmtpUrl * smtpUrl = nsnull; - HG77067 if (aURL) { @@ -1398,9 +1394,6 @@ nsresult nsSmtpProtocol::ProcessProtocolState(nsIURI * url, nsIInputStream * inp case SMTP_FINISH_CONNECT: SetFlag(SMTP_PAUSE_FOR_READ); break; -#ifdef UNREADY_CODE - HG26788 -#endif case SMTP_LOGIN_RESPONSE: if (inputStream == nsnull) SetFlag(SMTP_PAUSE_FOR_READ); @@ -1433,10 +1426,7 @@ nsresult nsSmtpProtocol::ProcessProtocolState(nsIURI * url, nsIInputStream * inp else status = AuthLoginResponse(inputStream, length); break; -#ifdef UNREADY_CODE - HG12690 -#endif - case SMTP_SEND_AUTH_LOGIN_USERNAME: + case SMTP_SEND_AUTH_LOGIN_USERNAME: status = AuthLoginUsername(); break; diff --git a/mailnews/compose/src/nsSmtpProtocol.h b/mailnews/compose/src/nsSmtpProtocol.h index 81c6d2e95c63..55dc05416494 100644 --- a/mailnews/compose/src/nsSmtpProtocol.h +++ b/mailnews/compose/src/nsSmtpProtocol.h @@ -26,8 +26,6 @@ #include "nsMsgProtocol.h" #include "nsIStreamListener.h" #include "nsXPIDLString.h" -#include "rosetta.h" -#include HG40855 #include "nsISmtpUrl.h" #include "nsIMsgStatusFeedback.h" #include "nsCOMPtr.h" diff --git a/mailnews/local/src/nsMailboxProtocol.cpp b/mailnews/local/src/nsMailboxProtocol.cpp index 28e329369cc6..02a4d3d23430 100644 --- a/mailnews/local/src/nsMailboxProtocol.cpp +++ b/mailnews/local/src/nsMailboxProtocol.cpp @@ -34,9 +34,8 @@ #include "nsIMessage.h" #include "nsMsgDBCID.h" #include "nsIMsgMailNewsUrl.h" -#include "rosetta.h" -#include "allxpstr.h" +//#include "allxpstr.h" #include "prtime.h" #include "prlog.h" #include "prerror.h" diff --git a/mailnews/local/src/nsMailboxProtocol.h b/mailnews/local/src/nsMailboxProtocol.h index df16fc3a6a03..e0013699f074 100644 --- a/mailnews/local/src/nsMailboxProtocol.h +++ b/mailnews/local/src/nsMailboxProtocol.h @@ -27,8 +27,6 @@ #include "nsCOMPtr.h" #include "nsIFileSpec.h" #include "nsIChannel.h" -#include "rosetta.h" -#include HG40855 #include "nsIOutputStream.h" #include "nsIMailboxUrl.h" diff --git a/mailnews/local/src/nsPop3Protocol.h b/mailnews/local/src/nsPop3Protocol.h index 464964502e38..14fc0e2f123d 100644 --- a/mailnews/local/src/nsPop3Protocol.h +++ b/mailnews/local/src/nsPop3Protocol.h @@ -32,7 +32,6 @@ #include "nsMsgProtocol.h" #include "MailNewsTypes.h" #include "nsIMsgStatusFeedback.h" -#include "rosetta.h" #include "prerror.h" #include "plhash.h" diff --git a/mailnews/mime/src/mimemoz2.cpp b/mailnews/mime/src/mimemoz2.cpp index 837a9abd773d..abf925cbc64c 100644 --- a/mailnews/mime/src/mimemoz2.cpp +++ b/mailnews/mime/src/mimemoz2.cpp @@ -35,7 +35,6 @@ #include "edt.h" #include "mimerosetta.h" #include "proto.h" -#include "secrng.h" #include "prprf.h" #include "intl_csi.h" #include "mimei.h" /* for moved MimeDisplayData struct */ diff --git a/mailnews/news/src/nntpCore.h b/mailnews/news/src/nntpCore.h index d21e66d8e304..97ea0e5c2ce2 100644 --- a/mailnews/news/src/nntpCore.h +++ b/mailnews/news/src/nntpCore.h @@ -23,8 +23,6 @@ #ifndef _NNTPCore_H__ #define _NNTPCore_H__ -#include "rosetta.h" - #if defined(DEBUG_seth) || defined(DEBUG_sspitzer) #define DEBUG_NEWS 1 #endif diff --git a/mailnews/news/src/nsNNTPProtocol.cpp b/mailnews/news/src/nsNNTPProtocol.cpp index b811ea2e00a3..8e6302e11d6c 100644 --- a/mailnews/news/src/nsNNTPProtocol.cpp +++ b/mailnews/news/src/nsNNTPProtocol.cpp @@ -46,9 +46,6 @@ #include "nsCRT.h" -#include "rosetta.h" -#include HG40855 - #include "prtime.h" #include "prlog.h" #include "prerror.h" @@ -186,7 +183,6 @@ char *stateLabels[] = { #endif "NNTP_CONNECT", "NNTP_CONNECT_WAIT", -HG25430 "NNTP_LOGIN_RESPONSE", "NNTP_SEND_MODE_READER", "NNTP_SEND_MODE_READER_RESPONSE", @@ -768,14 +764,14 @@ nsresult nsNNTPProtocol::LoadUrl(nsIURI * aURL, nsISupports * aConsumer) } if (userName) { - char *mungedUsername = HG64643(userName); + char *mungedUsername = XP_STRDUP(userName); cd->newsgroup->SetUsername(mungedUsername); PR_FREEIF(mungedUsername); PR_FREEIF(userName); } if (password) { - char *mungedPassword = HG64643(password); + char *mungedPassword = XP_STRDUP(password); cd->newsgroup->SetPassword(mungedPassword); PR_FREEIF(mungedPassword); @@ -1083,7 +1079,7 @@ PRInt32 nsNNTPProtocol::NewsResponse(nsIInputStream * inputStream, PRUint32 leng return status; ClearFlag(NNTP_PAUSE_FOR_READ); /* don't pause if we got a line */ - HG43574 + /* almost correct */ if(status > 1) { @@ -1179,8 +1175,6 @@ PRInt32 nsNNTPProtocol::NewsResponse(nsIInputStream * inputStream, PRUint32 leng return(0); /* everything ok */ } -HG43072 - /* interpret the server response after the connect * * returns negative if the server responds unexpectedly @@ -1518,8 +1512,7 @@ PRInt32 nsNNTPProtocol::SendListSubscriptionsResponse(nsIInputStream * inputStre if ('.' != line[0]) { #if 0 - char *urlScheme; - HG56946 + char *urlScheme = "news:"; char *url = PR_smprintf ("%s//%s/%s", urlScheme, m_hostName, line); if (url) MSG_AddSubscribedNewsgroup (cd->pane, url); @@ -2456,7 +2449,7 @@ PRInt32 nsNNTPProtocol::BeginAuthorization() #ifdef CACHE_NEWSGRP_PASSWORD if (NS_SUCCEEDED(m_newsgroup->GetUsername(&username)) { - munged_username = HG64643 (username); + munged_username = XP_STRDUP (username); m_newsgroup->SetUsername(munged_username); PR_FreeIF(munged_username); } @@ -2528,7 +2521,7 @@ PRInt32 nsNNTPProtocol::AuthorizationResponse() { m_newsgroup->GetPassword(&password); #ifdef UNREADY_CODE - password = HG63218 (password); + password = XP_STRDUP(password); #endif m_newsgroup->SetPassword(NULL); } @@ -2541,7 +2534,7 @@ PRInt32 nsNNTPProtocol::AuthorizationResponse() #ifdef CACHE_NEWSGRP_PASSWORD if (cd->pane) m_newsgroup->GetPassword(&password); - password = HG63218 (password); + password = XP_STRDUP(password); #else NET_SACopy(&password, last_password); #endif @@ -2605,7 +2598,7 @@ PRInt32 nsNNTPProtocol::AuthorizationResponse() rv = m_newsgroup->GetPassword(&garbage_password); if (!NS_SUCCEEDED(rv)) { PR_Free(garbage_password); - munged_password = HG64643(password); + munged_password = XP_STRDUP(password); m_newsgroup->SetPassword(munged_password); PR_FREEIF(munged_password); } @@ -4588,7 +4581,6 @@ nsresult nsNNTPProtocol::ProcessProtocolState(nsIURI * url, nsIInputStream * inp // mscott: I've removed the states involving connections on the assumption // that core netlib will now be managing that information. - HG42871 case NNTP_LOGIN_RESPONSE: if (inputStream == nsnull) diff --git a/mailnews/news/src/nsNNTPProtocol.h b/mailnews/news/src/nsNNTPProtocol.h index 6837d69c446b..109a89077c0a 100644 --- a/mailnews/news/src/nsNNTPProtocol.h +++ b/mailnews/news/src/nsNNTPProtocol.h @@ -24,8 +24,6 @@ #define nsNNTPProtocol_h___ #include "nsMsgProtocol.h" -#include "rosetta.h" -#include HG40855 #include "nsIOutputStream.h" #include "nsIBufferInputStream.h" @@ -72,7 +70,6 @@ NNTP_CONNECTIONS_ARE_AVAILABLE, #endif NNTP_CONNECT, NNTP_CONNECT_WAIT, -HG07711 NNTP_LOGIN_RESPONSE, NNTP_SEND_MODE_READER, NNTP_SEND_MODE_READER_RESPONSE, diff --git a/modules/libpref/src/makefile.win b/modules/libpref/src/makefile.win index 4e8dcc998d64..f8d5ca72e5f9 100644 --- a/modules/libpref/src/makefile.win +++ b/modules/libpref/src/makefile.win @@ -74,9 +74,7 @@ BINREL_DIST=$(XPDIST)\WIN954.0_DBG.OBJD !endif !endif -!ifndef MOZ_SECURITY -HASHLIBS=$(DIST)\lib\secfreenav32.lib -!else +!ifdef MOZ_SECURITY HASHLIBS=$(BINREL_DIST)\lib\hash.lib $(BINREL_DIST)\lib\secutil.lib !endif