[Armagetronad-commits] SF.net SVN: armagetronad: [7616] armagetronad/branches/0.2.8-auth/ armagetronad

[<z-...@us...>]

Revision: 7616
          http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7616&view=rev
Author:   z-man
Date:     2008-01-24 04:40:00 -0800 (Thu, 24 Jan 2008)

Log Message:
-----------
Proper error reporting when ZThread is not available and we can't to remote logins.

Modified Paths:
--------------
    armagetronad/branches/0.2.8-auth/armagetronad/language/english_base.txt
    armagetronad/branches/0.2.8-auth/armagetronad/src/network/nAuthentification.cpp

Modified: armagetronad/branches/0.2.8-auth/armagetronad/language/english_base.txt
===================================================================
--- armagetronad/branches/0.2.8-auth/armagetronad/language/english_base.txt	2008-01-24 12:30:39 UTC (rev 7615)
+++ armagetronad/branches/0.2.8-auth/armagetronad/language/english_base.txt	2008-01-24 12:40:00 UTC (rev 7616)
@@ -2517,6 +2517,7 @@
 login_error_invalidurl_defaultport   Authentication URL \1 invalid. Just leave away the default port, please :).
 login_error_invalidurl_slash         Authentication URL \1 invalid, double slash or ending with slash.
 login_error_invalidurl_notfound      Authentication URL \1 invalid, it was not found.
+login_error_noremote                 Authentication via Global ID not available on this server.
 login_error_methodmismatch  The local method used for auhtentication has been modified since your password was set. In the server's config files, put all commands that define authentication methods before all local password definitions.
 login_error_nomethod        No authentication method could be found. Your client supports \1, this server supports \2, and the authentication server supports \3.
 login_error_nomethodlist    Authentication URL \1 does not return a list of supported methods.

Modified: armagetronad/branches/0.2.8-auth/armagetronad/src/network/nAuthentification.cpp
===================================================================
--- armagetronad/branches/0.2.8-auth/armagetronad/src/network/nAuthentification.cpp	2008-01-24 12:30:39 UTC (rev 7615)
+++ armagetronad/branches/0.2.8-auth/armagetronad/src/network/nAuthentification.cpp	2008-01-24 12:40:00 UTC (rev 7616)
@@ -340,10 +340,10 @@
     void FetchInfoFromAuthority();
 
     // report an authority info query error to the higher level system
-    bool ReportAuthorityError( tOutput const & error )
+    bool ReportAuthorityError( tOutput const & error, bool real = false )
     {
         // well, the public scripts don't support this yet, so let's fake it
-        if ( 0 )
+        if ( !real )
         {
             method.method = "bmd5";
             method.prefix = "";
@@ -442,7 +442,7 @@
 bool nLoginProcess::FetchInfoFromAuthorityRemote()
 {
 #ifndef HAVE_LIBZTHREAD
-    return ReportAuthorityError( "Internal errror, remote login not supported" );
+    return ReportAuthorityError( tOutput("$login_error_noremote"), true );
 #endif
     
     {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.