ServInfo now learns whether the server supports guest mode.

Removed the moreprompt from here because it's not used in webcit.

diff --git a/webcit/serv_func.c b/webcit/serv_func.c
index 228c5b7e69ea8d4838fbca73ee9d25778da964d8..77b12888a5c49aff2caf5bcf052a18758f6ce5bc 100644 (file)
--- a/webcit/serv_func.c
+++ b/webcit/serv_func.c
@@ -33,7 +33,6 @@ void DeleteServInfo(ServInfo **FreeMe)
        FreeStrBuf(&(*FreeMe)->serv_software);
        FreeStrBuf(&(*FreeMe)->serv_bbs_city);
        FreeStrBuf(&(*FreeMe)->serv_sysadm);
-       FreeStrBuf(&(*FreeMe)->serv_moreprompt);
        FreeStrBuf(&(*FreeMe)->serv_default_cal_zone);
        FreeStrBuf(&(*FreeMe)->serv_svn_revision);
        free(*FreeMe);
@@ -124,9 +123,6 @@ ServInfo *get_serv_info(StrBuf *browser_host, StrBuf *user_agent)
                case 7:
                        info->serv_sysadm = NewStrBufDup(Buf);
                        break;
-               case 9:
-                       info->serv_moreprompt = NewStrBufDup(Buf);
-                       break;
                case 14:
                        info->serv_supports_ldap = StrToi(Buf);
                        break;
@@ -148,6 +144,9 @@ ServInfo *get_serv_info(StrBuf *browser_host, StrBuf *user_agent)
                case 23:
                        info->serv_supports_openid = StrToi(Buf);
                        break;
+               case 24:
+                       info->serv_supports_guest = StrToi(Buf);
+                       break;
                }
                ++a;
        }

diff --git a/webcit/webcit.h b/webcit/webcit.h
index 725606d74c94805cd6808467be5cf700b1172ba3..e6086b1b91e9665d497b12df76fc93e553740cb2 100644 (file)
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -293,20 +293,20 @@ struct urlcontent {
 typedef struct _serv_info {
        int serv_pid;                   /* Process ID of the Citadel server */
        StrBuf *serv_nodename;          /* Node name of the Citadel server */
-       StrBuf *serv_humannode;         /* human readable node name of the Citadel server */
-       StrBuf *serv_fqdn;              /* fully quallified Domain Name (such as uncensored.citadel.org) */
-       StrBuf *serv_software;          /* What version does our connected citadel server use */
-       int serv_rev_level;             /* Whats the citadel server revision */
+       StrBuf *serv_humannode;         /* Juman readable node name of the Citadel server */
+       StrBuf *serv_fqdn;              /* Fully qualified Domain Name (such as uncensored.citadel.org) */
+       StrBuf *serv_software;          /* Free form text description of the server software in use */
+       int serv_rev_level;             /* Server version number (times 100) */
        StrBuf *serv_bbs_city;          /* Geographic location of the Citadel server */
        StrBuf *serv_sysadm;            /* Name of system administrator */
-       StrBuf *serv_moreprompt;        /* Whats the commandline textprompt */
        int serv_supports_ldap;         /* is the server linked against an ldap tree for adresses? */
        int serv_newuser_disabled;      /* Has the server disabled self-service new user creation? */
        StrBuf *serv_default_cal_zone;  /* Default timezone for unspecified calendar items */
-       int serv_supports_sieve;        /* Does the server support Sieve mail filtering? */
-       int serv_fulltext_enabled;      /* Does the server have the full text index enabled? */
-       StrBuf *serv_svn_revision;      /* SVN revision of the server */
-       int serv_supports_openid;       /* Does the server support authentication via OpenID? */
+       int serv_supports_sieve;        /* Server supports Sieve mail filtering */
+       int serv_fulltext_enabled;      /* Full text index is enabled */
+       StrBuf *serv_svn_revision;      /* svn or git revision of the server */
+       int serv_supports_openid;       /* Server supports authentication via OpenID */
+       int serv_supports_guest;        /* Server supports unauthenticated guest logins */
 } ServInfo;