From e9c3ee8aaebff568b55c9c2c99852c0a0b8691c7 Mon Sep 17 00:00:00 2001 From: "darin%meer.net" Date: Wed, 3 Nov 2004 22:15:48 +0000 Subject: [PATCH] backing out part of my patch for bug 267367 that broke mailnews auth prompting git-svn-id: svn://10.0.0.236/trunk@164885 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/docshell/base/nsDocShell.cpp | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/mozilla/docshell/base/nsDocShell.cpp b/mozilla/docshell/base/nsDocShell.cpp index 5f4267156b3..b18b7a86384 100644 --- a/mozilla/docshell/base/nsDocShell.cpp +++ b/mozilla/docshell/base/nsDocShell.cpp @@ -403,9 +403,18 @@ NS_IMETHODIMP nsDocShell::GetInterface(const nsIID & aIID, void **aSink) return NS_NOINTERFACE; } else if (aIID.Equals(NS_GET_IID(nsIAuthPrompt))) { - return NS_SUCCEEDED( - GetAuthPrompt(PROMPT_NORMAL, (nsIAuthPrompt **) aSink)) ? - NS_OK : NS_NOINTERFACE; + // if auth is not allowed, bail out + if (!mAllowAuth) + return NS_NOINTERFACE; + + nsCOMPtr authPrompter(do_GetInterface(mTreeOwner)); + if (authPrompter) { + *aSink = authPrompter; + NS_ADDREF((nsISupports *) * aSink); + return NS_OK; + } + else + return NS_NOINTERFACE; } else if (aIID.Equals(NS_GET_IID(nsIProgressEventSink)) || aIID.Equals(NS_GET_IID(nsIHttpEventSink))