User Biography display: remove call, do through templates directly.

[citadel.git] / citadel / utillib / citadel_ipc.c

diff --git a/citadel/utillib/citadel_ipc.c b/citadel/utillib/citadel_ipc.c
index fb90f33d0c80f69966e62c8c2efc3588ba2c67a5..15e860a4bb57894592a842622ac6dcd7908be822 100644 (file)
--- a/citadel/utillib/citadel_ipc.c
+++ b/citadel/utillib/citadel_ipc.c
@@ -1,19 +1,13 @@
 /*
- * 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"
@@ -2153,18 +2147,6 @@ int CtdlIPCInternalProgram(CtdlIPC *ipc, int secret, char *cret)
 }
 
 
-/* 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:
@@ -2493,15 +2475,10 @@ int CtdlIPCGenericCommand(CtdlIPC *ipc,
 {
        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) {
@@ -2866,7 +2843,7 @@ static void ssl_lock(int mode, int n, const char *file, int line)
 static void CtdlIPC_init_OpenSSL(void)
 {
        int a;
-       SSL_METHOD *ssl_method;
+       const SSL_METHOD *ssl_method;
        DH *dh;
        
        /* already done init */
@@ -2956,7 +2933,7 @@ int
 ReadNetworkChunk(CtdlIPC* ipc)
 {
        fd_set read_fd;
-       int tries;
+/*     int tries;*/
        int ret = 0;
        int err = 0;
        struct timeval tv;
@@ -2964,7 +2941,7 @@ ReadNetworkChunk(CtdlIPC* ipc)
 
        tv.tv_sec = 1;
        tv.tv_usec = 1000;
-       tries = 0;
+       /*tries = 0; */
        n = 0;
        while (1)
        {
@@ -3251,7 +3228,7 @@ CtdlIPC* CtdlIPC_new(int argc, char **argv, char *hostbuf, char *portbuf)
        /* 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");