diff --git a/src/server/internal-connections.c b/src/server/internal-connections.c
index 379af1a7858af9256f29e23f9e7aa0df268c10e1..799e73e87a72aaac15ce901e57e2399eae0b5e8f 100644
--- a/src/server/internal-connections.c
+++ b/src/server/internal-connections.c
@@ -1,5 +1,5 @@
 /*
- * $Id: internal-connections.c,v 0.12 1993/08/05 01:15:30 ceder Exp $
+ * $Id: internal-connections.c,v 0.13 1993/10/10 16:49:22 ceder Exp $
  * Copyright (C) 1991  Lysator Academic Computer Association.
  *
  * This file is part of the LysKOM server.
@@ -28,19 +28,23 @@
  * Abstract routines on the data type Connection.
  */
 
-static char *rcsid = "$Id: internal-connections.c,v 0.12 1993/08/05 01:15:30 ceder Exp $";
+static char *rcsid = "$Id: internal-connections.c,v 0.13 1993/10/10 16:49:22 ceder Exp $";
 #include "rcs.h"
 USE(rcsid);
 
+#include <stdio.h>
+#include <time.h>
+#include <setjmp.h>
 
 #include "exp.h"
-#include <kom-types.h>
-#include <server/smalloc.h>
+#include "s-string.h"
+#include "kom-types.h"
 #include "com.h"
 #include "connections.h"
 #include "internal-connections.h"
-#include "lyskomd.h"
 #include "config.h"
+#include "server/smalloc.h"
+#include "lyskomd.h"
 #include "log.h"
 
 INTERNAL  Connection  *all_connections   = NULL;
@@ -51,25 +55,52 @@ INTERNAL  Session_no   no_of_connection_attempts = 0;
 INTERNAL  Connection  *last_conn = NULL;
 
 INTERNAL const Connection EMPTY_CONNECTION =
-    ((Connection){0, NULL, NULL,
-		      /* Things used by services.c */
-		      (Pers_no)0, (Person *)NULL, NO_TIME, (Conf_no)0,
-		      EMPTY_STRING_i, (u_char)0,
-		      EMPTY_STRING_i, EMPTY_STRING_i, EMPTY_STRING_i,
-		      EMPTY_STRING_i, EMPTY_STRING_i,
-		      FALSE, FALSE,
-		      /* Used by server/connections.c */
-		      (struct mux*)NULL, '\0',
-		      0, 0, 0, 0, 0,
-		      0, call_fnc_login_old,
-		      /* Gather data... */
-		      0, 0, 0, 0, EMPTY_STRING_i, EMPTY_STRING_i,
-		      EMPTY_STRING_i, (Misc_info*)NULL, 
-		      (Local_text_no*)NULL, DEFAULT_PRIV_BITS_i,
-		      NULL_CONF_TYPE_i, EMPTY_tm_i,
-		      /* Protocol independent... */
-		      EMPTY_STRING_i, 0, FALSE,
-		      NO_TIME, 0});
+    ((Connection){0,		/* magic */
+		    NULL,	/* prev */
+		    NULL,	/* next */
+		    /* Things used by services.c */
+		    (Pers_no)0, /* pers_no */
+		    (Person *)NULL, /* person */
+		    NO_TIME,	/* session_start */
+		    (Conf_no)0,	/* cwc */
+		    EMPTY_STRING_i, /* what_am_i_doing */
+		    (unsigned char)0, /* ena_level */
+		    EMPTY_STRING_i, /* username */
+		    EMPTY_STRING_i, /* hostname */
+		    EMPTY_STRING_i, /* ident_user */
+		    EMPTY_STRING_i, /* client_name */
+		    EMPTY_STRING_i, /* client_version */
+		    FALSE,	/* invisible */
+		    FALSE,	/* username_valid */
+		    /* Used by server/connections.c */
+		    (struct mux*)NULL, /* mux */
+		    '\0',	/* protocol */
+		    0,		/* parse_pos */
+		    0,		/* fnc_parse_pos */
+		    0,		/* array_parse_pos */
+		    0,		/* struct_parse_pos */
+		    0,		/* string_parse_pos */
+		    0,		/* ref_no */
+		    call_fnc_login_old,	/* function */
+		    /* Gather data... */
+		    0,		/* num0 */
+		    0,		/* num1 */
+		    0,		/* num2 */
+		    0,		/* num3 */
+		    EMPTY_STRING_i, /* c_string0 */
+		    EMPTY_STRING_i, /* c_string1 */
+		    EMPTY_STRING_i, /* string0 */
+		    (Misc_info*)NULL, /* c_misc_info_p */
+		    (Local_text_no*)NULL, /* c_local_text_no_p */
+		    DEFAULT_PRIV_BITS_i, /* priv_bits */
+		    NULL_CONF_TYPE_i, /* conf_type */
+		    EMPTY_tm_i,	/* time */
+		    /* Protocol independent... */
+		    EMPTY_STRING_i, /* unparsed */
+		    0,		/* first_to_parse */
+		    FALSE,	/* more_to_parse */
+		    NO_TIME,	/* last_request */
+		    0});	/* session_no */
 
 static int  no_of_allocated_connections = 0;