v0.7.2

  - Added: http proxy basic authorization
  - Fixed: logging initialization after some value checking
  - Fixed: auto-reconnect failure when --nossl option is set
  - Added: auto-reconnect when afserver is not reachable on start
  - Added: auto-reconnect after normal afserver quit
  - Added: per user statistics: idle time, amount of downloaded/uploaded bytes
           and current download/upload rate
  - Added: support for https proxies
  - Added: possibility to bind sockets on different interfaces
  - Fixed: receiving incomplete headers from afclient
  - Fixed: close user connections by afclient

1 files changed, 0 insertions, 788 deletions

diff --git a/src/remoteadmin.c b/src/remoteadmin.c
deleted file mode 100644
index c2ada6e..0000000
--- a/src/remoteadmin.c
+++ /dev/null
@@ -1,788 +0,0 @@
-/*
- * active port forwarder - software for secure forwarding
- * Copyright (C) 2003,2004,2005 jeremian <jeremian [at] poczta.fm>
- *
- * 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 2 of the License, or
- * (at your option) any later version.
- *
- * 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 <config.h>
-
-#include "remoteadmin.h"
-
-static char newmessage;
-
-static int
-parse_int(unsigned char* buff, int* ret)
-{
-  int intarg, i;
-  char guard;
-  if (((i = sscanf((char*) &buff[*ret], "%d%c", &intarg, &guard)) == 2) || (i == 1)) {
-    if (i == 1) {
-      guard = ' ';
-    }
-    if (!isspace(guard)) {
-      return -1;
-    }
-    guard = 0;
-    i = (*ret);
-    while (buff[i] != 0) {
-      if (guard == 0) {
-        if (isspace(buff[i])) {
-          guard = 1;
-        }
-      }
-      else {
-        if (!isspace(buff[i])) {
-          break;
-        }
-      }
-      ++i;
-    }
-    if (buff[i] == '.') {
-      ++i;
-    }
-    (*ret) = i;
-    return intarg;
-  }
-  else {
-    return -1;
-  }
-}
-
-static int
-parse_cmd(unsigned char* buff, int* ret)
-{
-  int i, j, state;
-  char cmd[31];
-
-  i = j = state = 0;
-  newmessage = 1;
-  while (buff[i] != 0) {
-    if (state == 1) {
-      if (isspace(buff[i])) {
-        break;
-      }
-      else {
-        if (j == 30) {
-          return 0;
-        }
-        cmd[j] = buff[i];
-        ++j;
-      }
-    }
-    if (state == 0) {
-      if (!isspace(buff[i])) {
-        cmd[j] = buff[i];
-        j = 1;
-        state = 1;
-      }
-    }
-    ++i;
-  }
-  if (state == 0) {
-    return 0;
-  }
-  while (isspace(buff[i])) {
-    ++i;
-  }
-  if (buff[i] == '.') {
-    ++i;
-  }
-  (*ret) = i;
-  cmd[j] = 0;
-  if (strcmp(cmd, "help") == 0) { return 1; }
-  if (strcmp(cmd, "lcmd") == 0) { return 2; }
-  if (strcmp(cmd, "info") == 0) { return 3; }
-  if (strcmp(cmd, "rshow") == 0) { return 4; }
-  if (strcmp(cmd, "cshow") == 0) { return 5; }
-  if (strcmp(cmd, "ushow") == 0) { return 6; }
-  if (strcmp(cmd, "quit") == 0) { return 7; }
-  if (strcmp(cmd, "timeout") == 0) { return 8; }
-  if (strcmp(cmd, "audit") == 0) { return 9; }
-  if (strcmp(cmd, "dnslookups") == 0) { return 10; }
-  if (strcmp(cmd, "dateformat") == 0) { return 11; }
-  if (strcmp(cmd, "kuser") == 0) { return 12; }
-  if (strcmp(cmd, "kclient") == 0) { return 13; }
-  return 0;
-}
-
-static void
-send_adm_message(char type, clifd master, unsigned char* buff, unsigned char st)
-{
-  int n;
-  if (!newmessage) {
-    n = strlen((char*) &buff[5]);
-  }
-  else {
-    n = 0;
-  }
-  buff[0] = AF_S_ADMIN_CMD;
-  buff[1] = st;
-  buff[2] = AF_RA_UNDEFINED;
-  buff[3] = n >> 8; /* high bits of message length */
-  buff[4] = n;    /* low bits of message length */
-  send_message(type, master, buff, n+5);
-}
-
-static void
-add_to_message(unsigned char* buff, const char* format, ...)
-{
-  va_list ap;
-  int n;
-  if (!newmessage) {
-    n = strlen((char*) &buff[5]);
-  }
-  else {
-    n = 0;
-  }
-  newmessage = 0;
-  va_start(ap, format);
-
-  vsprintf((char*) &buff[5+n], format, ap);
-  n = strlen((char*) &buff[5]);
-  sprintf((char*) &buff[5+n], "\n");
-  
-  va_end(ap);
-}
-
-static void
-add_uptime_to_message(unsigned char* buff, char* info, time_t period)
-{
-  int hours, minutes, seconds;
-
-  hours = period/3600;
-  minutes = (period/60)%60;
-  seconds = period%60;
- 
-  if (hours) {
-    add_to_message(buff, "%s: %d:%02d:%02d", info, hours, minutes, seconds);
-  }
-  else {
-    add_to_message(buff, "%s: %d:%02d", info, minutes, seconds);
-  }
-}
-
-int
-serve_admin(ConfigurationT* config, int realm, int client, unsigned char* buff)
-{
-  int length, n, i, j, ret;
-  time_t now, tmp;
-  llnodeT* llptr;
-  alnodeT* alptr;
-  char olddf[51], newdf[51];
-  char type = config->realmtable[realm].type | TYPE_SSL | TYPE_ZLIB;
-  clifd master = config->realmtable[realm].raclitable[client].cliconn;
-  
-  olddf[50] = newdf[50] = 0;
-  length = buff[3];
-  length = length << 8;
-  length += buff[4]; /* this is the length of a message */
-  
-  time(&now);
-  
-  switch (buff[1]) {
-    case AF_RA_CMD: {
-                      n = get_message(type, master, buff, length);
-                      buff[n] = 0;
-                      aflog(LOG_T_MANAGE, LOG_I_INFO,
-                          "realm[%s]: admin: message length = %d [%s]",
-                          get_realmname(config, realm), n, buff);
-                      switch (parse_cmd(buff, &ret)) {
-                        case 1: { /* help */
-                                  add_to_message(buff, AF_VER("AFSERVER"));
-                                  add_to_message(buff, "\nValid commands are:");
-                                  add_to_message(buff, "  help                 display help");
-                                  add_to_message(buff, "  lcmd                 lists available commands");
-                                  add_to_message(buff, "  info                 prints info about server");
-                                  add_to_message(buff, "  rshow                display realms");
-                                  add_to_message(buff, "  cshow X              display clients in X realm");
-                                  add_to_message(buff, "  ushow X              display users in X realm");
-                                  add_to_message(buff, "  quit                 quit connection");
-                                  add_to_message(buff, "  timeout N X          set timeout value in X realm");
-                                  add_to_message(buff, "  audit {0|1} X        set audit mode in X realm");
-                                  add_to_message(buff, "  dnslookups {0|1} X   set dnslookups mode in X realm");
-                                  add_to_message(buff, "  dateformat S         set dateformat");
-                                  add_to_message(buff, "  kuser S              kick user named S");
-                                  add_to_message(buff, "  kclient N            kick client with number N");
-                                  send_adm_message(type, master, buff, AF_RA_STATUS_OK);
-                                  break;
-                                }
-                        case 2: { /* lcmd */
-                                  add_to_message(buff, "help");
-                                  add_to_message(buff, "lcmd");
-                                  add_to_message(buff, "info");
-                                  add_to_message(buff, "rshow");
-                                  add_to_message(buff, "cshow");
-                                  add_to_message(buff, "ushow");
-                                  add_to_message(buff, "quit");
-                                  add_to_message(buff, "timeout");
-                                  add_to_message(buff, "audit");
-                                  add_to_message(buff, "dnslookups");
-                                  add_to_message(buff, "dateformat");
-                                  add_to_message(buff, "kuser");
-                                  add_to_message(buff, "kclient");
-                                  send_adm_message(type, master, buff, AF_RA_STATUS_OK);
-                                  break;
-                                }
-                        case 3: { /* info */
-                                  add_to_message(buff, AF_VER("Version:"));
-                                  add_to_message(buff, "Realms: %d", config->size);
-                                  add_to_message(buff, "Certificate: %s", config->certif);
-                                  add_to_message(buff, "Key: %s", config->keys);
-                                  llptr = getloglisthead();
-                                  i = 0;
-                                  while (llptr) {
-                                    add_to_message(buff, "log[%d]: %s", i, llptr->cmdline);
-                                    llptr = llptr->next;
-                                    ++i;
-                                  }
-                                  tmp = now - config->starttime;
-                                  add_uptime_to_message(buff, "Uptime", tmp);
-                                  add_to_message(buff, "Cg: %ld B", getcg());
-                                  add_to_message(buff, "Dateformat: %s", getdateformat());
-                                  send_adm_message(type, master, buff, AF_RA_STATUS_OK);
-                                  break;
-                                }
-                        case 4: { /* rshow */
-                                  for (i = 0; i < config->size; ++i) {
-                                    add_to_message(buff, "\nRealm[%s]:", get_realmname(config, i));
-                                    add_to_message(buff, "hostname: %s", config->realmtable[i].hostname);
-                                    add_to_message(buff, "users: %d (max: %d)",
-                                        config->realmtable[i].usercon, config->realmtable[i].usernum);
-                                    add_to_message(buff, "clients: %d (max: %d)",
-                                        config->realmtable[i].clicon-config->realmtable[i].raclicon,
-                                        config->realmtable[i].clinum);
-                                    add_to_message(buff, "raclients: %d (max: %d)",
-                                        config->realmtable[i].raclicon, config->realmtable[i].raclinum);
-                                    add_to_message(buff, "users per client: %s", config->realmtable[i].usrpcli);
-                                    add_to_message(buff, "user-client pairs: %d",
-                                        config->realmtable[i].usrclinum);
-                                    for (j = 0; j < config->realmtable[i].usrclinum; ++j) {
-                                      add_to_message(buff, " pair[%d]: listenport: %s, manageport: %s", j,
-                                          config->realmtable[i].usrclitable[j].lisportnum,
-                                          config->realmtable[i].usrclitable[j].manportnum);
-                                    }
-                                    add_to_message(buff, "climode: %s", config->realmtable[i].clim);
-                                    add_to_message(buff, "timeout: %d", config->realmtable[i].tmout);
-                                    add_to_message(buff, "baseport: %s", config->realmtable[i].baseport ?
-                                        "yes" : "no");
-                                    add_to_message(buff, "audit: %s", config->realmtable[i].audit ?
-                                        "yes" : "no");
-                                    add_to_message(buff, "dnslookups: %s", config->realmtable[i].dnslookups ?
-                                        "yes" : "no");
-                                    add_to_message(buff, "ssl: %s, zlib: %s, mode: %s",
-                                        (TYPE_IS_SSL(config->realmtable[i].type))?"yes":"no",
-                                        (TYPE_IS_ZLIB(config->realmtable[i].type))?"yes":"no",
-                                        (TYPE_IS_TCP(config->realmtable[i].type))?"tcp":"udp");
-                                    switch (config->realmtable[i].tunneltype) {
-                                      case 0: {
-                                                add_to_message(buff, "tunneltype: direct");
-                                                break;
-                                              }
-                                      case 1: {
-                                                add_to_message(buff, "tunneltype: http proxy");
-                                                break;
-                                              }
-                                      default: {
-                                                 add_to_message(buff, "tunneltype: UNKNOWN");
-                                               }
-                                    }
-                                  }
-                                  send_adm_message(type, master, buff, AF_RA_STATUS_OK);
-                                  break;
-                                }
-                        case 5: { /* cshow*/
-                                  n = get_realmnumber(config, (char*) &buff[ret]);
-                                  if ((n >= 0) && (n < config->size)) {
-                                    for (i = 0; i < config->realmtable[n].clinum; ++i) {
-                                      if (config->realmtable[n].clitable[i].ready) {
-                                        add_to_message(buff, "\nClient[%s]:",
-                                            get_clientname(&(config->realmtable[n]), i));
-                                        switch (config->realmtable[n].clitable[i].ready) {
-                                          case 1: {
-                                                    add_to_message(buff, "state: ssl handshake");
-                                                    break;
-                                                  }
-                                          case 2: {
-                                                    add_to_message(buff, "state: authorization");
-                                                    break;
-                                                  }
-                                          case 3: {
-                                                    add_to_message(buff, "state: running");
-                                                    break;
-                                                  }
-                                          default: {
-                                                    add_to_message(buff, "state: unknown");
-                                                   }
-                                        }
-                                        add_to_message(buff, "users: %d (max: %d)",
-                                            config->realmtable[n].clitable[i].usercon,
-                                            config->realmtable[n].clitable[i].usernum);
-                                        add_to_message(buff, "user-client pair: %d",
-                                            config->realmtable[n].clitable[i].whatusrcli); 
-                                        tmp = now - config->realmtable[n].clitable[i].connecttime;
-                                        add_uptime_to_message(buff, "Connection time", tmp);
-                                        add_to_message(buff, "Id: %s",
-                                            (config->realmtable[n].clitable[i].clientid == NULL)?"":
-                                            config->realmtable[n].clitable[i].clientid);
-                                        add_to_message(buff, "Number: %d",
-                                            config->realmtable[n].clitable[i].clientnum);
-                                        add_to_message(buff, "IP: %s, port: %s",
-                                            config->realmtable[n].clitable[i].namebuf,
-                                            config->realmtable[n].clitable[i].portbuf);
-                                        switch (config->realmtable[n].clitable[i].tunneltype) {
-                                          case 0: {
-                                                    add_to_message(buff, "tunneltype: direct");
-                                                    break;
-                                                  }
-                                          case 1: {
-                                                    add_to_message(buff, "tunneltype: http proxy");
-                                                    break;
-                                                  }
-                                          default: {
-                                                     add_to_message(buff, "tunneltype: UNKNOWN");
-                                                   }
-                                        }
-                                        if (config->realmtable[n].audit) {
-                                          add_to_message(buff, "auditlog:");
-                                          alptr = config->realmtable[n].clitable[i].head;
-                                          while (alptr) {
-                                            add_to_message(buff,
-                                                "userid: %d ip: %s port: %s connected: %s duration: %s",
-                                                alptr->userid,
-                                                alptr->namebuf,
-                                                alptr->portbuf,
-                                                localdate(&(alptr->connecttime)),
-                                                timeperiod(alptr->duration));
-                                            alptr = alptr->next;
-                                          }
-                                        }
-                                      }
-                                    }
-                                    send_adm_message(type, master, buff, AF_RA_STATUS_OK);
-                                    break;
-                                  }
-                                  add_to_message(buff, "Wrong realm name");
-                                  add_to_message(buff, "Usage: cshow X      , X - realm name");
-                                  send_adm_message(type, master, buff, AF_RA_FAILED);
-                                  break;
-                                }
-                        case 6: { /* ushow */
-                                  n = get_realmnumber(config, (char*) &buff[ret]);
-                                  if ((n >= 0) && (n < config->size)) {
-                                    for (i = 0; i < config->realmtable[n].usernum; ++i) {
-                                      if (config->realmtable[n].contable[i].state != S_STATE_CLEAR) {
-                                        add_to_message(buff, "\nUser[%d]:",
-                                            get_username(&(config->realmtable[n]), i));
-                                        switch (config->realmtable[n].contable[i].state) {
-                                          case S_STATE_CLOSING: {
-                                                    add_to_message(buff, "state: closing");
-                                                    break;
-                                                  }
-                                          case S_STATE_OPENING: {
-                                                    add_to_message(buff, "state: opening");
-                                                    break;
-                                                  }
-                                          case S_STATE_OPEN: {
-                                                    add_to_message(buff, "state: running");
-                                                    break;
-                                                  }
-                                          case S_STATE_STOPPED: {
-                                                    add_to_message(buff, "state: stopped");
-                                                    break;
-                                                  }
-                                          default: {
-                                                    add_to_message(buff, "state: unknown");
-                                                   }
-                                        }
-                                        add_to_message(buff, "connected to: Client[%s]",
-                                            get_clientname(&(config->realmtable[n]),
-                                              config->realmtable[n].contable[i].whatcli));
-                                        tmp = now - config->realmtable[n].contable[i].connecttime;
-                                        add_uptime_to_message(buff, "Connection time", tmp);
-                                        add_to_message(buff, "IP: %s, port: %s",
-                                            config->realmtable[n].contable[i].namebuf,
-                                            config->realmtable[n].contable[i].portbuf);
-                                      }
-                                    }
-                                    send_adm_message(type, master, buff, AF_RA_STATUS_OK);
-                                    break;
-                                  }
-                                  add_to_message(buff, "Wrong realm name");
-                                  add_to_message(buff, "Usage: ushow X      , X - realm name");
-                                  send_adm_message(type, master, buff, AF_RA_FAILED);
-                                  break;
-                                }
-                        case 7: { /* quit */
-                                  aflog(LOG_T_MANAGE, LOG_I_INFO,
-                                      "realm[%s]: Client[%s] (ra): commfd: CLOSED",
-                                      get_realmname(config, realm),
-                                      get_raclientname(&(config->realmtable[realm]), client));
-                                  send_adm_message(type, master, buff, AF_RA_KICKED);
-                                  return 1;
-                                }
-                        case 8: { /* timeout */
-                                  i = parse_int(buff, &ret);
-                                  if (i <= 0) {
-                                    add_to_message(buff, "Invalid timeout value");
-                                    add_to_message(buff,
-                                        "Usage: timeout N X      , N - new timeout value, X - realm name");
-                                    send_adm_message(type, master, buff, AF_RA_FAILED);
-                                    break;
-                                  }
-                                  n = get_realmnumber(config, (char*) &buff[ret]);
-                                  if ((n >= 0) && (n < config->size)) {
-                                    add_to_message(buff, "changed timeout: %d --> %d",
-                                        config->realmtable[n].tmout, i);
-                                    config->realmtable[n].tmout = i;
-                                    send_adm_message(type, master, buff, AF_RA_STATUS_OK);
-                                    break;
-                                  }
-                                  add_to_message(buff, "Wrong realm name");
-                                  add_to_message(buff,
-                                      "Usage: timeout N X      , N - new timeout value, X - realm name");
-                                  send_adm_message(type, master, buff, AF_RA_FAILED);
-                                  break;
-                                }
-                        case 9: { /* audit */
-                                  i = parse_int(buff, &ret);
-                                  if ((i != 0) && (i != 1)) {
-                                    add_to_message(buff, "Invalid audit value");
-                                    add_to_message(buff,
-                                        "Usage: audit {0|1} X      , N=0 off, N=1 on, X - realm name");
-                                    send_adm_message(type, master, buff, AF_RA_FAILED);
-                                    break;
-                                  }
-                                  n = get_realmnumber(config, (char*) &buff[ret]);
-                                  if ((n >= 0) && (n < config->size)) {
-                                    add_to_message(buff, "changed audit: %s --> %s",
-                                        config->realmtable[n].audit ? "yes" : "no", i ? "yes" : "no");
-                                    config->realmtable[n].audit = i;
-                                    if (i == 0) {
-                                      for (i = 0; i < config->realmtable[n].clinum; ++i) {
-                                        freeauditlist(&(config->realmtable[n].clitable[i].head));
-                                      }
-                                    }
-                                    send_adm_message(type, master, buff, AF_RA_STATUS_OK);
-                                    break;
-                                  }
-                                  add_to_message(buff, "Wrong realm name");
-                                  add_to_message(buff,
-                                      "Usage: audit {0|1} X      , N=0 off, N=1 on, X - realm name");
-                                  send_adm_message(type, master, buff, AF_RA_FAILED);
-                                  break;
-                                }
-                        case 10: { /* dnslookups */
-                                  i = parse_int(buff, &ret);
-                                  if ((i != 0) && (i != 1)) {
-                                    add_to_message(buff, "Invalid dnslookups value");
-                                    add_to_message(buff,
-                                        "Usage: dnslookups {0|1} X      , N=0 off, N=1 on, X - realm name");
-                                    send_adm_message(type, master, buff, AF_RA_FAILED);
-                                    break;
-                                  }
-                                  n = get_realmnumber(config, (char*) &buff[ret]);
-                                  if ((n >= 0) && (n < config->size)) {
-                                    add_to_message(buff, "changed dnslookups: %s --> %s",
-                                        config->realmtable[n].dnslookups ? "yes" : "no", i ? "yes" : "no");
-                                    config->realmtable[n].dnslookups = i;
-                                    send_adm_message(type, master, buff, AF_RA_STATUS_OK);
-                                    break;
-                                  }
-                                  add_to_message(buff, "Wrong realm name");
-                                  add_to_message(buff,
-                                      "Usage: dnslookups {0|1} X      , N=0 off, N=1 on, X - realm name");
-                                  send_adm_message(type, master, buff, AF_RA_FAILED);
-                                  break;
-                                }
-                        case 11: { /* dateformat */
-                                  strncpy(olddf, getdateformat(), 50);
-                                  strncpy(newdf, (char*) &buff[ret], 50);
-                                  add_to_message(buff, "changed dateformat: %s --> %s",
-                                      olddf, newdf);
-                                  setdateformat(newdf);
-                                  send_adm_message(type, master, buff, AF_RA_STATUS_OK);
-                                  break;
-                                }
-                        case 12: { /* kuser */
-                                  i = parse_int(buff, &ret);
-                                  if (buff[ret] != 0) {
-                                    add_to_message(buff, "Invalid user name");
-                                    add_to_message(buff,
-                                        "Usage: kuser S      , S - user name");
-                                    send_adm_message(type, master, buff, AF_RA_FAILED);
-                                    break;
-                                  }
-                                  j = -1;
-                                  for (n = 0; n < config->size; ++n) {
-                                    j = get_usernumber(&(config->realmtable[n]), i);
-                                    if (j != (-1)) {
-                                      if ((config->realmtable[n].contable[j].state == S_STATE_OPEN) ||
-                                          (config->realmtable[n].contable[j].state == S_STATE_STOPPED)) {
-                                        add_to_message(buff, "kicked: realm[%s] user[%d]",
-                                            get_realmname(config, n), get_username(&(config->realmtable[n]), i));
-                                        close(config->realmtable[n].contable[j].connfd);
-                                        send_adm_message(type, master, buff, AF_RA_STATUS_OK);
-                                      }
-                                      else {
-                                        add_to_message(buff, "Invalid user");
-                                        add_to_message(buff,
-                                            "Usage: kuser S      , S - user name");
-                                        send_adm_message(type, master, buff, AF_RA_FAILED);
-                                      }
-                                      break;
-                                    }
-                                  }
-                                  if (j == (-1)) {
-                                    add_to_message(buff, "Invalid user name");
-                                    add_to_message(buff,
-                                        "Usage: kuser S      , S - user name");
-                                    send_adm_message(type, master, buff, AF_RA_FAILED);
-                                  }
-                                  break;
-                                }
-                        case 13: { /* kclient */
-                                  i = parse_int(buff, &ret);
-                                  if (buff[ret] != 0) {
-                                    add_to_message(buff, "Invalid client number");
-                                    add_to_message(buff,
-                                        "Usage: kclient N      , N - client number");
-                                    send_adm_message(type, master, buff, AF_RA_FAILED);
-                                    break;
-                                  }
-                                  j = -1;
-                                  for (n = 0; n < config->size; ++n) {
-                                    j = get_clientnumber(&(config->realmtable[n]), i);
-                                    if (j != (-1)) {
-                                      if (config->realmtable[n].clitable[j].ready) {
-                                        add_to_message(buff, "kicked: realm[%s] client[%s]",
-                                            get_realmname(config, n),
-                                            get_clientname(&(config->realmtable[n]), j));
-                                        send_adm_message(type, master, buff, AF_RA_STATUS_OK);
-                                        return (i+2);
-                                      }
-                                      else {
-                                        add_to_message(buff, "Invalid client");
-                                        add_to_message(buff,
-                                            "Usage: kclient N      , N - client number");
-                                        send_adm_message(type, master, buff, AF_RA_FAILED);
-                                      }
-                                      break;
-                                    }
-                                  }
-                                  if (j == (-1)) {
-                                    add_to_message(buff, "Invalid client number");
-                                    add_to_message(buff,
-                                        "Usage: kclient N      , N - client number");
-                                    send_adm_message(type, master, buff, AF_RA_FAILED);
-                                  }
-                                  break;
-
-                                }
-                        default: {
-                                  aflog(LOG_T_MANAGE, LOG_I_WARNING,
-                                      "realm[%s]: admin: cmd ignored", get_realmname(config, realm));
-                                  send_adm_message(type, master, buff, AF_RA_UNDEFINED);
-                                 }
-                      }
-                      break;
-                    }
-    case AF_RA_REPEAT: {
-                         break;
-                       }
-    default: {
-               aflog(LOG_T_MANAGE, LOG_I_ERR,
-                   "Unrecognized message from remote admin --> closing");
-               return 1;
-             }
-  }
-  return 0;
-}
-
-int
-client_admin(char type, clifd master, unsigned char* buff, int connectfd, char* id)
-{
-  fd_set rset, allset;
-  int maxfdp1, n, length, infd;
-  FILE *outfp, *infp;
-
-  buff[0] = AF_S_ADMIN_LOGIN;
-  send_message(type, master, buff, 5);
-  buff[0] = 0;
-  get_message(type, master, buff, -5);
-
-  if ( buff[0] == 0 ) {
-    aflog(LOG_T_INIT, LOG_I_CRIT,
-        "Wrong password");
-    return 1;
-  }
-  if ( buff[0] == AF_S_CANT_OPEN ) {
-    aflog(LOG_T_INIT, LOG_I_CRIT,
-        "Server is full");
-    return 1;
-  }
-  if ( buff[0] != AF_S_ADMIN_LOGIN ) {
-    aflog(LOG_T_INIT, LOG_I_CRIT,
-        "Incompatible server type or server full");
-    return 1;
-  }
- 
-  aflog(LOG_T_MAIN, LOG_I_INFO,
-      "CLIENT STARTED mode: remote administration");
-  
-  if (connectfd > 0) {
-    outfp = fdopen(connectfd, "w");
-    if (outfp == NULL) {
-      aflog(LOG_T_INIT, LOG_I_CRIT,
-          "Error in opening file descriptor for writing");
-      return 1;
-    }
-    infd = connectfd;
-  }
-  else {
-    infd = STDIN_FILENO;
-    outfp = stdout;
-  }
-  infp = fdopen(infd, "r");
-  if (infp == NULL) {
-    aflog(LOG_T_INIT, LOG_I_CRIT,
-        "Error in opening file descriptor for reading");
-    return 1;
-  }
-  
-  length = buff[3];
-  length = length << 8;
-  length += buff[4]; /* this is length of message */
-  n = get_message(type, master, buff, length);
-  buff[n] = 0;
-  fprintf(outfp, "%s\n", (char*) buff);
-  fflush(outfp);
-  
-  FD_ZERO(&allset);
-
-  FD_SET(master.commfd, &allset);
-  FD_SET(infd, &allset);
-  
-  maxfdp1 = (infd > master.commfd) ? infd+1: master.commfd+1;
-
-  if (id != NULL) {
-    buff[0] = AF_S_LOGIN;
-    buff[1] = buff[2] = 0;
-    n = strlen(id);
-    memcpy(&buff[5], id, n);
-    buff[3] = n >> 8; /* high bits of message length */
-    buff[4] = n;    /* low bits of message length */
-    send_message(type, master, buff, n+5);
-    aflog(LOG_T_MANAGE, LOG_I_INFO,
-        "ID SENT: %s", id);
-  }
-  
-  while (1) {
-    rset = allset;
-    select(maxfdp1, &rset, NULL, NULL, NULL);
-
-    if (FD_ISSET(master.commfd, &rset)) {
-      aflog(LOG_T_MANAGE, LOG_I_DEBUG,
-          "masterfd: FD_ISSET");
-      n = get_message(type, master, buff, 5);
-      if (n != 5) {
-        aflog(LOG_T_MANAGE, LOG_I_ERR,
-            "FATAL ERROR! (%d)", n);
-        if (n == -1) {
-          if (TYPE_IS_SSL(type)) {
-            get_ssl_error(&master, "FE", n);
-            continue; /* what happened? */
-          }
-        }
-        if (n != 0)
-          return 1;
-      } 
-      if (n == 0) { /* server quits -> we do the same... */
-        aflog(LOG_T_MANAGE, LOG_I_CRIT,
-            "SERVER: premature quit --> exiting...");
-        return 1;
-      }
-      if (buff[0] == AF_S_CLOSING) {
-        aflog(LOG_T_MANAGE, LOG_I_CRIT,
-            "SERVER: CLOSED -> exiting... cg: %ld bytes", getcg());
-        return 0;
-      }
-      if (buff[0] != AF_S_ADMIN_CMD) {
-        aflog(LOG_T_MANAGE, LOG_I_CRIT,
-            "SERVER: wrong message --> exiting");
-        return 1;
-      }
-      length = buff[3];
-      length = length << 8;
-      length += buff[4]; /* this is length of message */
-      
-      switch (buff[1]) {
-        case AF_RA_STATUS_OK: {
-                      aflog(LOG_T_MANAGE, LOG_I_INFO,
-                          "SERVER: cmd successful");
-                              }
-        case AF_RA_FAILED: {
-                      if (buff[1] == AF_RA_FAILED) {
-                        aflog(LOG_T_MANAGE, LOG_I_INFO,
-                            "SERVER: cmd failed");
-                      }
-                           }
-        case AF_RA_UNDEFINED: {
-                      if (buff[1] == AF_RA_UNDEFINED) {
-                        aflog(LOG_T_MANAGE, LOG_I_WARNING,
-                            "SERVER: unknown cmd");
-                      }
-                      n = get_message(type, master, buff, length);
-                      buff[n] = 0;
-                      fprintf(outfp, "%s", (char*) buff);
-                      fflush(outfp);
-                             break;
-                           }
-        case AF_RA_KICKED: {
-                   aflog(LOG_T_MANAGE, LOG_I_ERR,
-                       "SERVER: kicked us -> exiting... cg: %ld bytes", getcg());
-                   return 1;
-                             break;
-                           }
-        default: {
-                   aflog(LOG_T_MANAGE, LOG_I_ERR,
-                       "SERVER: unrecognized message -> exiting... cg: %ld bytes", getcg());
-                   return 1;
-                 }
-      }
-    }
-
-    if (FD_ISSET(infd, &rset)) {
-      aflog(LOG_T_MANAGE, LOG_I_DEBUG,
-          "infd: FD_ISSET");
-      if (fgets((char*) &buff[5], 8091, infp) == NULL) { /* client quits --> exiting */
-        aflog(LOG_T_MANAGE, LOG_I_NOTICE,
-            "CLIENT CLOSED cg: %ld bytes", getcg());
-        return 0;
-      }
-      n = strlen((char*) &buff[5]);
-      if ((n > 0) && (buff[n+4] == '\n')) {
-        --n;
-      }
-      buff[0] = AF_S_ADMIN_CMD;
-      buff[1] = AF_RA_CMD;
-      buff[2] = AF_RA_UNDEFINED;
-      buff[3] = n >> 8; /* high bits of message length */
-      buff[4] = n;    /* low bits of message length */
-      send_message(type, master, buff, n+5);
-    }
-  }
-}