-/* $Id$
- *
- * Copyright (c) 1987-2009 by the citadel.org team
+/*
+ * Copyright (c) 1987-2012 by the citadel.org team
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * This program is open source software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "sysdep.h"
ret = CtdlIPCGenericCommand(ipc, "GETU", NULL, 0, NULL, NULL, cret);
if (ret / 100 == 2) {
- uret[0]->USscreenwidth = extract_int(cret, 0);
- uret[0]->USscreenheight = extract_int(cret, 1);
uret[0]->flags = extract_int(cret, 2);
}
return ret;
if (!uret) return -2;
if (!cret) return -2;
- sprintf(aaa, "SETU %d|%d|%d",
- uret->USscreenwidth, uret->USscreenheight,
- uret->flags);
+ sprintf(aaa,
+ "SETU 80|24|%d",
+ uret->flags
+ );
return CtdlIPCGenericCommand(ipc, aaa, NULL, 0, NULL, NULL, cret);
}
break;
case 22: strcpy(ipc->ServInfo.svn_revision, buf);
break;
+ case 24: ipc->ServInfo.guest_logins = atoi(buf);
+ break;
}
}
}
-/* FSCK */
-int CtdlIPCMessageBaseCheck(CtdlIPC *ipc, char **mret, char *cret)
-{
- size_t size = 0;
-
- if (!cret) return -2;
- if (!mret) return -2;
- if (*mret) return -2;
-
- return CtdlIPCGenericCommand(ipc, "FSCK", NULL, 0, mret, &size, cret);
-}
-
/*
* Not implemented:
{
char buf[SIZ];
register int ret;
- int watch_ssl = 0;
if (!command) return -2;
if (!proto_response) return -2;
-#ifdef HAVE_OPENSSL
- if (ipc->ssl) watch_ssl = 1;
-#endif
-
CtdlIPC_lock(ipc);
CtdlIPC_putline(ipc, command);
while (1) {
static void CtdlIPC_init_OpenSSL(void)
{
int a;
- SSL_METHOD *ssl_method;
+ const SSL_METHOD *ssl_method;
DH *dh;
/* already done init */
ReadNetworkChunk(CtdlIPC* ipc)
{
fd_set read_fd;
- int tries;
+/* int tries;*/
int ret = 0;
int err = 0;
struct timeval tv;
tv.tv_sec = 1;
tv.tv_usec = 1000;
- tries = 0;
+ /*tries = 0; */
n = 0;
while (1)
{
/* If we're using a unix domain socket we can do a bunch of stuff */
if (!strcmp(cithost, UDS)) {
if (!strcasecmp(citport, DEFAULT_PORT)) {
- snprintf(sockpath, sizeof sockpath, file_citadel_socket);
+ snprintf(sockpath, sizeof sockpath, "%s", file_citadel_socket);
}
else {
snprintf(sockpath, sizeof sockpath, "%s/%s", citport, "citadel.socket");