landing patch for bug 237586 "Implement negotiateauth using SSPI for Windows" r=cneberg sr=bryner a=shaver

extensions/auth/nsAuthGSSAPI.cpp

@@ -217,10 +217,13 @@ nsNegotiateAuth::GetNextToken(const void *inToken,
         in_token_ptr = &input_token;
     }
     else if (mCtx != GSS_C_NO_CONTEXT) {
-        //
-        // Possibly starting over, clear out any existing context.
-        //
-        Reset();
+        // If there is no input token, then we are starting a new
+        // authentication sequence.  If we have already initialized our
+        // security context, then we're in trouble because it means that the
+        // first sequence failed.  We need to bail or else we might end up in
+        // an infinite loop.
+        LOG(("Cannot restart authentication sequence!"));
+        return NS_ERROR_UNEXPECTED; 
     }
 
 #if defined(XP_MACOSX)

extensions/auth/nsAuthGSSAPI.h

@@ -56,14 +56,6 @@
 #include <gssapi/gssapi_generic.h> 
 #endif
 
-#define NS_NEGOTIATEAUTH_CID                         \
-{ /* 96ec4163-efc8-407a-8735-007fb26be4e8 */         \
-    0x96ec4163,                                      \
-    0xefc8,                                          \
-    0x407a,                                          \
-    {0x87, 0x35, 0x00, 0x7f, 0xb2, 0x6b, 0xe4, 0xe8} \
-}
-
 // The nsNegotiateAuth class provides responses for the GSS-API Negotiate method
 // as specified by Microsoft in draft-brezak-spnego-http-04.txt