INFO command 'openid support' is now indicated as the version of OpenID support ...

diff --git a/citadel/citserver.c b/citadel/citserver.c
index e1843eb209c2396a3684203f93eabc6ffb994d21..9570e30663030bcb6f513934fa3f3f3d84cd4109 100644 (file)
--- a/citadel/citserver.c
+++ b/citadel/citserver.c
@@ -82,6 +82,7 @@ char *unique_session_numbers;
 int ScheduledShutdown = 0;
 time_t server_startup_time;
 int panic_fd;
+int openid_level_supported = 0;
 
 /*
  * print the actual stack frame.
@@ -316,7 +317,7 @@ void cmd_info(char *cmdbuf) {
        cprintf("%s\n", svn_revision());
 
        if (config.c_auth_mode == AUTHMODE_NATIVE) {
-               cprintf("1\n"); /* OpenID is enabled when using native auth */
+               cprintf("%d\n", openid_level_supported); /* OpenID is enabled when using native auth */
        }
        else {
                cprintf("0\n"); /* OpenID is disabled when using non-native auth */

diff --git a/citadel/citserver.h b/citadel/citserver.h
index c294916e24dd07cb854dd82118ad6a79fea41158..0540a7670cbac83ad2f3c578c1c89c18c7e7ce55 100644 (file)
--- a/citadel/citserver.h
+++ b/citadel/citserver.h
@@ -48,3 +48,4 @@ void GenerateRoomDisplay(char *real_room,
 extern int panic_fd;
 char CtdlCheckExpress(void);
 extern time_t server_startup_time;
+extern int openid_level_supported;

diff --git a/citadel/modules/openid/serv_openid_rp.c b/citadel/modules/openid/serv_openid_rp.c
index d8fa443fdea8f164b8eaa282afb4ee824cdd4304..69aa50b6e57e318ecb8b981fd06fbbca49f781f6 100644 (file)
--- a/citadel/modules/openid/serv_openid_rp.c
+++ b/citadel/modules/openid/serv_openid_rp.c
@@ -964,6 +964,7 @@ CTDL_MODULE_INIT(openid_rp)
                }
                CtdlRegisterSessionHook(openid_cleanup_function, EVT_LOGOUT);
                CtdlRegisterUserHook(openid_purge, EVT_PURGEUSER);
+               openid_level_supported = 1;     /* This module supports OpenID 1.0 only */
        }
 
        /* return our Subversion id for the Log */