X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Futillib%2Fcitadel_ipc.c;h=41b5a3877872f69e318beb17471777bff8189f44;hb=c822442544cf31a8cda014b77364ceeb883b1d66;hp=fb90f33d0c80f69966e62c8c2efc3588ba2c67a5;hpb=b6938b71c266f458180103090af0ab72e3d9616c;p=citadel.git

diff --git a/citadel/utillib/citadel_ipc.c b/citadel/utillib/citadel_ipc.c
index fb90f33d0..41b5a3877 100644
--- a/citadel/utillib/citadel_ipc.c
+++ b/citadel/utillib/citadel_ipc.c
@@ -2493,15 +2493,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 +2861,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 +2951,7 @@ int
 ReadNetworkChunk(CtdlIPC* ipc)
 {
 	fd_set read_fd;
-	int tries;
+/*	int tries;*/
 	int ret = 0;
 	int err = 0;
 	struct timeval tv;
@@ -2964,7 +2959,7 @@ ReadNetworkChunk(CtdlIPC* ipc)
 
 	tv.tv_sec = 1;
 	tv.tv_usec = 1000;
-	tries = 0;
+	/*tries = 0; */
 	n = 0;
 	while (1)
 	{
@@ -3251,7 +3246,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");