X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=src%2Frrd_daemon.c;h=128f3c444afe0bdde1d75331532f73ea388df0c2;hp=6445e55d6bad10ad207ea4d64ff73e4a413d4cee;hb=b4d4059df709e7faded933b9e619eabf9cbe1622;hpb=aff0a2728543eee1ac21f3fa02f171caae8d9362

diff --git a/src/rrd_daemon.c b/src/rrd_daemon.c
index 6445e55..128f3c4 100644
--- a/src/rrd_daemon.c
+++ b/src/rrd_daemon.c
@@ -1,7 +1,7 @@
 /**
  * RRDTool - src/rrd_daemon.c
- * Copyright (C) 2008 Florian octo Forster
- * Copyright (C) 2008 Kevin Brintnall
+ * Copyright (C) 2008,2009 Florian octo Forster
+ * Copyright (C) 2008,2009 Kevin Brintnall
  *
  * 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
@@ -77,11 +77,13 @@
 #include <stdlib.h>
 
 #ifndef WIN32
-#include <stdint.h>
+#ifdef HAVE_STDINT_H
+#  include <stdint.h>
+#endif
 #include <unistd.h>
 #include <strings.h>
 #include <inttypes.h>
-#	include <sys/socket.h>
+#include <sys/socket.h>
 
 #else
 
@@ -91,6 +93,7 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <dirent.h>
 #include <fcntl.h>
 #include <signal.h>
 #include <sys/un.h>
@@ -102,11 +105,18 @@
 #include <assert.h>
 #include <sys/time.h>
 #include <time.h>
+#include <libgen.h>
+#include <grp.h>
 
 #include <glib-2.0/glib.h>
 /* }}} */
 
-#define RRDD_LOG(severity, ...) syslog ((severity), __VA_ARGS__)
+#define RRDD_LOG(severity, ...) \
+  do { \
+    if (stay_foreground) \
+      fprintf(stderr, __VA_ARGS__); \
+    syslog ((severity), __VA_ARGS__); \
+  } while (0)
 
 #ifndef __GNUC__
 # define __attribute__(x) /**/
@@ -115,12 +125,6 @@
 /*
  * Types
  */
-typedef enum
-{
-  PRIV_LOW,
-  PRIV_HIGH
-} socket_privilege;
-
 typedef enum { RESP_ERR = -1, RESP_OK = 0 } response_code;
 
 struct listen_socket_s
@@ -128,7 +132,6 @@ struct listen_socket_s
   int fd;
   char addr[PATH_MAX + 1];
   int family;
-  socket_privilege privilege;
 
   /* state for BATCH processing */
   time_t batch_start;
@@ -141,16 +144,46 @@ struct listen_socket_s
 
   char *wbuf;
   ssize_t wbuf_len;
+
+  uint32_t permissions;
+
+  gid_t  socket_group;
+  mode_t socket_permissions;
 };
 typedef struct listen_socket_s listen_socket_t;
 
+struct command_s;
+typedef struct command_s command_t;
+/* note: guard against "unused" warnings in the handlers */
+#define DISPATCH_PROTO	listen_socket_t *sock	__attribute__((unused)),\
+			time_t now		__attribute__((unused)),\
+			char  *buffer		__attribute__((unused)),\
+			size_t buffer_size	__attribute__((unused))
+
+#define HANDLER_PROTO	command_t *cmd	        __attribute__((unused)),\
+			DISPATCH_PROTO
+
+struct command_s {
+  char   *cmd;
+  int (*handler)(HANDLER_PROTO);
+
+  char  context;		/* where we expect to see it */
+#define CMD_CONTEXT_CLIENT	(1<<0)
+#define CMD_CONTEXT_BATCH	(1<<1)
+#define CMD_CONTEXT_JOURNAL	(1<<2)
+#define CMD_CONTEXT_ANY		(0x7f)
+
+  char *syntax;
+  char *help;
+};
+
 struct cache_item_s;
 typedef struct cache_item_s cache_item_t;
 struct cache_item_s
 {
   char *file;
   char **values;
-  int values_num;
+  size_t values_num;
   time_t last_flush_time;
   time_t last_update_stamp;
 #define CI_FLAGS_IN_TREE  (1<<0)
@@ -177,6 +210,12 @@ enum queue_side_e
 };
 typedef enum queue_side_e queue_side_t;
 
+/* describe a set of journal files */
+typedef struct {
+  char **files;
+  size_t files_num;
+} journal_set;
+
 /* max length of socket command or response */
 #define CMD_MAX 4096
 #define RBUF_SIZE (CMD_MAX*2)
@@ -190,7 +229,11 @@ static uid_t daemon_uid;
 static listen_socket_t *listen_fds = NULL;
 static size_t listen_fds_num = 0;
 
-static int do_shutdown = 0;
+enum {
+  RUNNING,		/* normal operation */
+  FLUSHING,		/* flushing remaining values */
+  SHUTDOWN		/* shutting down */
+} state = RUNNING;
 
 static pthread_t *queue_threads;
 static pthread_cond_t queue_cond = PTHREAD_COND_INITIALIZER;
@@ -199,8 +242,8 @@ static int config_queue_threads = 4;
 static pthread_t flush_thread;
 static pthread_cond_t flush_cond = PTHREAD_COND_INITIALIZER;
 
-static pthread_t *connection_threads = NULL;
 static pthread_mutex_t connection_threads_lock = PTHREAD_MUTEX_INITIALIZER;
+static pthread_cond_t  connection_threads_done = PTHREAD_COND_INITIALIZER;
 static int connection_threads_num = 0;
 
 /* Cache stuff */
@@ -219,7 +262,7 @@ static size_t _config_base_dir_len = 0;
 static int config_write_base_only = 0;
 
 static listen_socket_t **config_listen_address_list = NULL;
-static int config_listen_address_list_len = 0;
+static size_t config_listen_address_list_len = 0;
 
 static uint64_t stats_queue_length = 0;
 static uint64_t stats_updates_received = 0;
@@ -231,21 +274,29 @@ static uint64_t stats_journal_rotate = 0;
 static pthread_mutex_t stats_lock = PTHREAD_MUTEX_INITIALIZER;
 
 /* Journaled updates */
-static char *journal_cur = NULL;
-static char *journal_old = NULL;
-static FILE *journal_fh = NULL;
+#define JOURNAL_REPLAY(s) ((s) == NULL)
+#define JOURNAL_BASE "rrd.journal"
+static journal_set *journal_cur = NULL;
+static journal_set *journal_old = NULL;
+static char *journal_dir = NULL;
+static FILE *journal_fh = NULL;		/* current journal file handle */
+static long  journal_size = 0;		/* current journal size */
+#define JOURNAL_MAX (1 * 1024 * 1024 * 1024)
 static pthread_mutex_t journal_lock = PTHREAD_MUTEX_INITIALIZER;
 static int journal_write(char *cmd, char *args);
 static void journal_done(void);
 static void journal_rotate(void);
 
+/* prototypes for forward refernces */
+static int handle_request_help (HANDLER_PROTO);
+
 /* 
  * Functions
  */
 static void sig_common (const char *sig) /* {{{ */
 {
   RRDD_LOG(LOG_NOTICE, "caught SIG%s", sig);
-  do_shutdown++;
+  state = FLUSHING;
   pthread_cond_broadcast(&flush_cond);
   pthread_cond_broadcast(&queue_cond);
 } /* }}} void sig_common */
@@ -308,12 +359,32 @@ static void install_signal_handlers(void) /* {{{ */
 static int open_pidfile(char *action, int oflag) /* {{{ */
 {
   int fd;
-  char *file;
+  const char *file;
+  char *file_copy, *dir;
 
   file = (config_pid_file != NULL)
     ? config_pid_file
     : LOCALSTATEDIR "/run/rrdcached.pid";
 
+  /* dirname may modify its argument */
+  file_copy = strdup(file);
+  if (file_copy == NULL)
+  {
+    fprintf(stderr, "rrdcached: strdup(): %s\n",
+        rrd_strerror(errno));
+    return -1;
+  }
+
+  dir = dirname(file_copy);
+  if (rrd_mkdir_p(dir, 0777) != 0)
+  {
+    fprintf(stderr, "Failed to create pidfile directory '%s': %s\n",
+        dir, rrd_strerror(errno));
+    return -1;
+  }
+
+  free(file_copy);
+
   fd = open(file, oflag, S_IWUSR|S_IRUSR|S_IRGRP|S_IROTH);
   if (fd < 0)
     fprintf(stderr, "rrdcached: can't %s pid file '%s' (%s)\n",
@@ -351,7 +422,13 @@ static int check_pidfile(void)
   }
 
   lseek(pid_fd, 0, SEEK_SET);
-  ftruncate(pid_fd, 0);
+  if (ftruncate(pid_fd, 0) == -1)
+  {
+    fprintf(stderr,
+            "FATAL: Faild to truncate stale PID file. (pid %d)\n", pid);
+    close(pid_fd);
+    return -1;
+  }
 
   fprintf(stderr,
           "rrdcached: removed stale PID file (no rrdcached on pid %d)\n"
@@ -430,7 +507,7 @@ static char *next_cmd (listen_socket_t *sock, ssize_t *len) /* {{{ */
 
   /* NOTREACHED */
   assert(1==0);
-}
+} /* }}} char *next_cmd */
 
 /* add the characters directly to the write buffer */
 static int add_to_wbuf(listen_socket_t *sock, char *str, size_t len) /* {{{ */
@@ -461,12 +538,12 @@ static int add_response_info(listen_socket_t *sock, char *fmt, ...) /* {{{ */
   char buffer[CMD_MAX];
   int len;
 
-  if (sock == NULL) return 0; /* journal replay mode */
+  if (JOURNAL_REPLAY(sock)) return 0;
   if (sock->batch_start) return 0; /* no extra info returned when in BATCH */
 
   va_start(argp, fmt);
 #ifdef HAVE_VSNPRINTF
-  len = vsnprintf(buffer, sizeof(buffer)-1, fmt, argp);
+  len = vsnprintf(buffer, sizeof(buffer), fmt, argp);
 #else
   len = vsprintf(buffer, fmt, argp);
 #endif
@@ -508,7 +585,7 @@ static int send_response (listen_socket_t *sock, response_code rc,
   ssize_t wrote;
   int rclen, len;
 
-  if (sock == NULL) return rc;  /* journal replay mode */
+  if (JOURNAL_REPLAY(sock)) return rc;
 
   if (sock->batch_start)
   {
@@ -524,7 +601,7 @@ static int send_response (listen_socket_t *sock, response_code rc,
   rclen = sprintf(buffer, "%d ", lines);
   va_start(argp, fmt);
 #ifdef HAVE_VSNPRINTF
-  len = vsnprintf(buffer+rclen, sizeof(buffer)-rclen-1, fmt, argp);
+  len = vsnprintf(buffer+rclen, sizeof(buffer)-rclen, fmt, argp);
 #else
   len = vsprintf(buffer+rclen, fmt, argp);
 #endif
@@ -573,7 +650,7 @@ static void wipe_ci_values(cache_item_t *ci, time_t when)
 
   ci->last_flush_time = when;
   if (config_write_jitter > 0)
-    ci->last_flush_time += (random() % config_write_jitter);
+    ci->last_flush_time += (rrd_random() % config_write_jitter);
 }
 
 /* remove_from_queue
@@ -614,7 +691,7 @@ static void *free_cache_item(cache_item_t *ci) /* {{{ */
 
   remove_from_queue(ci);
 
-  for (int i=0; i < ci->values_num; i++)
+  for (size_t i=0; i < ci->values_num; i++)
     free(ci->values[i]);
 
   free (ci->values);
@@ -622,6 +699,7 @@ static void *free_cache_item(cache_item_t *ci) /* {{{ */
 
   /* in case anyone is waiting */
   pthread_cond_broadcast(&ci->flushed);
+  pthread_cond_destroy(&ci->flushed);
 
   free (ci);
 
@@ -704,33 +782,20 @@ static gboolean tree_callback_flush (gpointer key, gpointer value, /* {{{ */
   if (ci->flags & CI_FLAGS_IN_QUEUE)
     return FALSE;
 
-  if ((ci->last_flush_time <= cfd->abs_timeout)
-      && (ci->values_num > 0))
-  {
-    enqueue_cache_item (ci, TAIL);
-  }
-  else if ((do_shutdown != 0)
-      && (ci->values_num > 0))
+  if (ci->values_num > 0
+      && (ci->last_flush_time <= cfd->abs_timeout || state != RUNNING))
   {
     enqueue_cache_item (ci, TAIL);
   }
   else if (((cfd->now - ci->last_flush_time) >= config_flush_interval)
       && (ci->values_num <= 0))
   {
-    char **temp;
-
-    temp = (char **) rrd_realloc (cfd->keys,
-        sizeof (char *) * (cfd->keys_num + 1));
-    if (temp == NULL)
+    assert ((char *) key == ci->file);
+    if (!rrd_add_ptr((void ***)&cfd->keys, &cfd->keys_num, (void *)key))
     {
-      RRDD_LOG (LOG_ERR, "tree_callback_flush: realloc failed.");
+      RRDD_LOG (LOG_ERR, "tree_callback_flush: rrd_add_ptrs failed.");
       return (FALSE);
     }
-    cfd->keys = temp;
-    /* Make really sure this points to the _same_ place */
-    assert ((char *) key == ci->file);
-    cfd->keys[cfd->keys_num] = (char *) key;
-    cfd->keys_num++;
   }
 
   return (FALSE);
@@ -761,9 +826,10 @@ static int flush_old_values (int max_age)
 
   for (k = 0; k < cfd.keys_num; k++)
   {
+    gboolean status = g_tree_remove(cache_tree, cfd.keys[k]);
     /* should never fail, since we have held the cache_lock
      * the entire time */
-    assert( g_tree_remove(cache_tree, cfd.keys[k]) == TRUE );
+    assert(status == TRUE);
   }
 
   if (cfd.keys != NULL)
@@ -787,21 +853,22 @@ static void *flush_thread_main (void *args __attribute__((unused))) /* {{{ */
 
   pthread_mutex_lock(&cache_lock);
 
-  while (!do_shutdown)
+  while (state == RUNNING)
   {
     gettimeofday (&now, NULL);
     if ((now.tv_sec > next_flush.tv_sec)
         || ((now.tv_sec == next_flush.tv_sec)
           && ((1000 * now.tv_usec) > next_flush.tv_nsec)))
     {
+      RRDD_LOG(LOG_DEBUG, "flushing old values");
+
+      /* Determine the time of the next cache flush. */
+      next_flush.tv_sec = now.tv_sec + config_flush_interval;
+
       /* Flush all values that haven't been written in the last
        * `config_write_interval' seconds. */
       flush_old_values (config_write_interval);
 
-      /* Determine the time of the next cache flush. */
-      next_flush.tv_sec =
-        now.tv_sec + next_flush.tv_sec % config_flush_interval;
-
       /* unlock the cache while we rotate so we don't block incoming
        * updates if the fsync() blocks on disk I/O */
       pthread_mutex_unlock(&cache_lock);
@@ -820,6 +887,8 @@ static void *flush_thread_main (void *args __attribute__((unused))) /* {{{ */
   if (config_flush_at_shutdown)
     flush_old_values (-1); /* flush everything */
 
+  state = SHUTDOWN;
+
   pthread_mutex_unlock(&cache_lock);
 
   return NULL;
@@ -829,19 +898,18 @@ static void *queue_thread_main (void *args __attribute__((unused))) /* {{{ */
 {
   pthread_mutex_lock (&cache_lock);
 
-  while (!do_shutdown
+  while (state != SHUTDOWN
          || (cache_queue_head != NULL && config_flush_at_shutdown))
   {
     cache_item_t *ci;
     char *file;
     char **values;
-    int values_num;
+    size_t values_num;
     int status;
-    int i;
 
     /* Now, check if there's something to store away. If not, wait until
-     * something comes in.  if we are shutting down, do not wait around.  */
-    if (cache_queue_head == NULL && !do_shutdown)
+     * something comes in. */
+    if (cache_queue_head == NULL)
     {
       status = pthread_cond_wait (&queue_cond, &cache_lock);
       if ((status != 0) && (status != ETIMEDOUT))
@@ -878,7 +946,7 @@ static void *queue_thread_main (void *args __attribute__((unused))) /* {{{ */
     pthread_mutex_unlock (&cache_lock);
 
     rrd_clear_error ();
-    status = rrd_update_r (file, NULL, values_num, (void *) values);
+    status = rrd_update_r (file, NULL, (int) values_num, (void *) values);
     if (status != 0)
     {
       RRDD_LOG (LOG_NOTICE, "queue_thread_main: "
@@ -887,13 +955,14 @@ static void *queue_thread_main (void *args __attribute__((unused))) /* {{{ */
     }
 
     journal_write("wrote", file);
-    pthread_cond_broadcast(&ci->flushed);
-
-    for (i = 0; i < values_num; i++)
-      free (values[i]);
 
-    free(values);
-    free(file);
+    /* Search again in the tree.  It's possible someone issued a "FORGET"
+     * while we were writing the update values. */
+    pthread_mutex_lock(&cache_lock);
+    ci = (cache_item_t *) g_tree_lookup(cache_tree, file);
+    if (ci)
+      pthread_cond_broadcast(&ci->flushed);
+    pthread_mutex_unlock(&cache_lock);
 
     if (status == 0)
     {
@@ -903,6 +972,9 @@ static void *queue_thread_main (void *args __attribute__((unused))) /* {{{ */
       pthread_mutex_unlock (&stats_lock);
     }
 
+    rrd_free_ptrs((void ***) &values, &values_num);
+    free(file);
+
     pthread_mutex_lock (&cache_lock);
   }
   pthread_mutex_unlock (&cache_lock);
@@ -982,7 +1054,7 @@ static int check_file_access (const char *file, listen_socket_t *sock) /* {{{ */
   assert(file != NULL);
 
   if (!config_write_base_only
-      || sock == NULL /* journal replay */
+      || JOURNAL_REPLAY(sock)
       || config_base_dir == NULL)
     return 1;
 
@@ -1025,20 +1097,6 @@ static void get_abs_path(char **filename, char *tmp)
   *filename = tmp;
 } /* }}} static int get_abs_path */
 
-/* returns 1 if we have the required privilege level,
- * otherwise issue an error to the user on sock */
-static int has_privilege (listen_socket_t *sock, /* {{{ */
-                          socket_privilege priv)
-{
-  if (sock == NULL) /* journal replay */
-    return 1;
-
-  if (sock->privilege >= priv)
-    return 1;
-
-  return send_response(sock, RESP_ERR, "%s\n", rrd_strerror(EACCES));
-} /* }}} static int has_privilege */
-
 static int flush_file (const char *filename) /* {{{ */
 {
   cache_item_t *ci;
@@ -1067,166 +1125,17 @@ static int flush_file (const char *filename) /* {{{ */
   return (0);
 } /* }}} int flush_file */
 
-static int handle_request_help (listen_socket_t *sock, /* {{{ */
-    char *buffer, size_t buffer_size)
+static int syntax_error(listen_socket_t *sock, command_t *cmd) /* {{{ */
 {
-  int status;
-  char **help_text;
-  char *command;
+  char *err = "Syntax error.\n";
 
-  char *help_help[2] =
-  {
-    "Command overview\n"
-    ,
-    "HELP [<command>]\n"
-    "FLUSH <filename>\n"
-    "FLUSHALL\n"
-    "PENDING <filename>\n"
-    "FORGET <filename>\n"
-    "QUEUE\n"
-    "UPDATE <filename> <values> [<values> ...]\n"
-    "BATCH\n"
-    "STATS\n"
-    "QUIT\n"
-  };
-
-  char *help_flush[2] =
-  {
-    "Help for FLUSH\n"
-    ,
-    "Usage: FLUSH <filename>\n"
-    "\n"
-    "Adds the given filename to the head of the update queue and returns\n"
-    "after it has been dequeued.\n"
-  };
-
-  char *help_flushall[2] =
-  {
-    "Help for FLUSHALL\n"
-    ,
-    "Usage: FLUSHALL\n"
-    "\n"
-    "Triggers writing of all pending updates.  Returns immediately.\n"
-  };
-
-  char *help_pending[2] =
-  {
-    "Help for PENDING\n"
-    ,
-    "Usage: PENDING <filename>\n"
-    "\n"
-    "Shows any 'pending' updates for a file, in order.\n"
-    "The updates shown have not yet been written to the underlying RRD file.\n"
-  };
-
-  char *help_forget[2] =
-  {
-    "Help for FORGET\n"
-    ,
-    "Usage: FORGET <filename>\n"
-    "\n"
-    "Removes the file completely from the cache.\n"
-    "Any pending updates for the file will be lost.\n"
-  };
-
-  char *help_queue[2] =
-  {
-    "Help for QUEUE\n"
-    ,
-    "Shows all files in the output queue.\n"
-    "The output is zero or more lines in the following format:\n"
-    "(where <num_vals> is the number of values to be written)\n"
-    "\n"
-    "<num_vals> <filename>\n"
-    "\n"
-  };
+  if (cmd && cmd->syntax)
+    err = cmd->syntax;
 
-  char *help_update[2] =
-  {
-    "Help for UPDATE\n"
-    ,
-    "Usage: UPDATE <filename> <values> [<values> ...]\n"
-    "\n"
-    "Adds the given file to the internal cache if it is not yet known and\n"
-    "appends the given value(s) to the entry. See the rrdcached(1) manpage\n"
-    "for details.\n"
-    "\n"
-    "Each <values> has the following form:\n"
-    "  <values> = <time>:<value>[:<value>[...]]\n"
-    "See the rrdupdate(1) manpage for details.\n"
-  };
+  return send_response(sock, RESP_ERR, "Usage: %s", err);
+} /* }}} static int syntax_error() */
 
-  char *help_stats[2] =
-  {
-    "Help for STATS\n"
-    ,
-    "Usage: STATS\n"
-    "\n"
-    "Returns some performance counters, see the rrdcached(1) manpage for\n"
-    "a description of the values.\n"
-  };
-
-  char *help_batch[2] =
-  {
-    "Help for BATCH\n"
-    ,
-    "The 'BATCH' command permits the client to initiate a bulk load\n"
-    "   of commands to rrdcached.\n"
-    "\n"
-    "Usage:\n"
-    "\n"
-    "    client: BATCH\n"
-    "    server: 0 Go ahead.  End with dot '.' on its own line.\n"
-    "    client: command #1\n"
-    "    client: command #2\n"
-    "    client: ... and so on\n"
-    "    client: .\n"
-    "    server: 2 errors\n"
-    "    server: 7 message for command #7\n"
-    "    server: 9 message for command #9\n"
-    "\n"
-    "For more information, consult the rrdcached(1) documentation.\n"
-  };
-
-  char *help_quit[2] =
-  {
-    "Help for QUIT\n"
-    ,
-    "Disconnect from rrdcached.\n"
-  };
-
-  status = buffer_get_field (&buffer, &buffer_size, &command);
-  if (status != 0)
-    help_text = help_help;
-  else
-  {
-    if (strcasecmp (command, "update") == 0)
-      help_text = help_update;
-    else if (strcasecmp (command, "flush") == 0)
-      help_text = help_flush;
-    else if (strcasecmp (command, "flushall") == 0)
-      help_text = help_flushall;
-    else if (strcasecmp (command, "pending") == 0)
-      help_text = help_pending;
-    else if (strcasecmp (command, "forget") == 0)
-      help_text = help_forget;
-    else if (strcasecmp (command, "queue") == 0)
-      help_text = help_queue;
-    else if (strcasecmp (command, "stats") == 0)
-      help_text = help_stats;
-    else if (strcasecmp (command, "batch") == 0)
-      help_text = help_batch;
-    else if (strcasecmp (command, "quit") == 0)
-      help_text = help_quit;
-    else
-      help_text = help_help;
-  }
-
-  add_response_info(sock, help_text[1]);
-  return send_response(sock, RESP_OK, help_text[0]);
-} /* }}} int handle_request_help */
-
-static int handle_request_stats (listen_socket_t *sock) /* {{{ */
+static int handle_request_stats (HANDLER_PROTO) /* {{{ */
 {
   uint64_t copy_queue_length;
   uint64_t copy_updates_received;
@@ -1274,8 +1183,7 @@ static int handle_request_stats (listen_socket_t *sock) /* {{{ */
   return (0);
 } /* }}} int handle_request_stats */
 
-static int handle_request_flush (listen_socket_t *sock, /* {{{ */
-    char *buffer, size_t buffer_size)
+static int handle_request_flush (HANDLER_PROTO) /* {{{ */
 {
   char *file, file_tmp[PATH_MAX];
   int status;
@@ -1283,7 +1191,7 @@ static int handle_request_flush (listen_socket_t *sock, /* {{{ */
   status = buffer_get_field (&buffer, &buffer_size, &file);
   if (status != 0)
   {
-    return send_response(sock, RESP_ERR, "Usage: flush <filename>\n");
+    return syntax_error(sock,cmd);
   }
   else
   {
@@ -1318,14 +1226,8 @@ static int handle_request_flush (listen_socket_t *sock, /* {{{ */
   assert(1==0);
 } /* }}} int handle_request_flush */
 
-static int handle_request_flushall(listen_socket_t *sock) /* {{{ */
+static int handle_request_flushall(HANDLER_PROTO) /* {{{ */
 {
-  int status;
-
-  status = has_privilege(sock, PRIV_HIGH);
-  if (status <= 0)
-    return status;
-
   RRDD_LOG(LOG_DEBUG, "Received FLUSHALL");
 
   pthread_mutex_lock(&cache_lock);
@@ -1335,8 +1237,7 @@ static int handle_request_flushall(listen_socket_t *sock) /* {{{ */
   return send_response(sock, RESP_OK, "Started flush.\n");
 } /* }}} static int handle_request_flushall */
 
-static int handle_request_pending(listen_socket_t *sock, /* {{{ */
-                                  char *buffer, size_t buffer_size)
+static int handle_request_pending(HANDLER_PROTO) /* {{{ */
 {
   int status;
   char *file, file_tmp[PATH_MAX];
@@ -1344,12 +1245,7 @@ static int handle_request_pending(listen_socket_t *sock, /* {{{ */
 
   status = buffer_get_field(&buffer, &buffer_size, &file);
   if (status != 0)
-    return send_response(sock, RESP_ERR,
-                         "Usage: PENDING <filename>\n");
-
-  status = has_privilege(sock, PRIV_HIGH);
-  if (status <= 0)
-    return status;
+    return syntax_error(sock,cmd);
 
   get_abs_path(&file, file_tmp);
 
@@ -1361,15 +1257,14 @@ static int handle_request_pending(listen_socket_t *sock, /* {{{ */
     return send_response(sock, RESP_ERR, "%s\n", rrd_strerror(ENOENT));
   }
 
-  for (int i=0; i < ci->values_num; i++)
+  for (size_t i=0; i < ci->values_num; i++)
     add_response_info(sock, "%s\n", ci->values[i]);
 
   pthread_mutex_unlock(&cache_lock);
   return send_response(sock, RESP_OK, "updates pending\n");
 } /* }}} static int handle_request_pending */
 
-static int handle_request_forget(listen_socket_t *sock, /* {{{ */
-                                 char *buffer, size_t buffer_size)
+static int handle_request_forget(HANDLER_PROTO) /* {{{ */
 {
   int status;
   gboolean found;
@@ -1377,12 +1272,7 @@ static int handle_request_forget(listen_socket_t *sock, /* {{{ */
 
   status = buffer_get_field(&buffer, &buffer_size, &file);
   if (status != 0)
-    return send_response(sock, RESP_ERR,
-                         "Usage: FORGET <filename>\n");
-
-  status = has_privilege(sock, PRIV_HIGH);
-  if (status <= 0)
-    return status;
+    return syntax_error(sock,cmd);
 
   get_abs_path(&file, file_tmp);
   if (!check_file_access(file, sock)) return 0;
@@ -1393,7 +1283,7 @@ static int handle_request_forget(listen_socket_t *sock, /* {{{ */
 
   if (found == TRUE)
   {
-    if (sock != NULL)
+    if (!JOURNAL_REPLAY(sock))
       journal_write("forget", file);
 
     return send_response(sock, RESP_OK, "Gone!\n");
@@ -1405,7 +1295,7 @@ static int handle_request_forget(listen_socket_t *sock, /* {{{ */
   assert(1==0);
 } /* }}} static int handle_request_forget */
 
-static int handle_request_queue (listen_socket_t *sock) /* {{{ */
+static int handle_request_queue (HANDLER_PROTO) /* {{{ */
 {
   cache_item_t *ci;
 
@@ -1423,9 +1313,7 @@ static int handle_request_queue (listen_socket_t *sock) /* {{{ */
   return send_response(sock, RESP_OK, "in queue.\n");
 } /* }}} int handle_request_queue */
 
-static int handle_request_update (listen_socket_t *sock, /* {{{ */
-                                  time_t now,
-                                  char *buffer, size_t buffer_size)
+static int handle_request_update (HANDLER_PROTO) /* {{{ */
 {
   char *file, file_tmp[PATH_MAX];
   int values_num = 0;
@@ -1434,17 +1322,13 @@ static int handle_request_update (listen_socket_t *sock, /* {{{ */
 
   cache_item_t *ci;
 
-  status = has_privilege(sock, PRIV_HIGH);
-  if (status <= 0)
-    return status;
-
   /* save it for the journal later */
-  strncpy(orig_buf, buffer, sizeof(orig_buf)-1);
+  if (!JOURNAL_REPLAY(sock))
+    strncpy(orig_buf, buffer, buffer_size);
 
   status = buffer_get_field (&buffer, &buffer_size, &file);
   if (status != 0)
-    return send_response(sock, RESP_ERR,
-                         "Usage: UPDATE <filename> <values> [<values> ...]\n");
+    return syntax_error(sock,cmd);
 
   pthread_mutex_lock(&stats_lock);
   stats_updates_received++;
@@ -1459,6 +1343,7 @@ static int handle_request_update (listen_socket_t *sock, /* {{{ */
   if (ci == NULL) /* {{{ */
   {
     struct stat statbuf;
+    cache_item_t *tmp;
 
     /* don't hold the lock while we setup; stat(2) might block */
     pthread_mutex_unlock(&cache_lock);
@@ -1506,17 +1391,29 @@ static int handle_request_update (listen_socket_t *sock, /* {{{ */
     pthread_cond_init(&ci->flushed, NULL);
 
     pthread_mutex_lock(&cache_lock);
-    g_tree_replace (cache_tree, (void *) ci->file, (void *) ci);
+
+    /* another UPDATE might have added this entry in the meantime */
+    tmp = g_tree_lookup (cache_tree, file);
+    if (tmp == NULL)
+      g_tree_replace (cache_tree, (void *) ci->file, (void *) ci);
+    else
+    {
+      free_cache_item (ci);
+      ci = tmp;
+    }
+
+    /* state may have changed while we were unlocked */
+    if (state == SHUTDOWN)
+      return -1;
   } /* }}} */
   assert (ci != NULL);
 
   /* don't re-write updates in replay mode */
-  if (sock != NULL)
+  if (!JOURNAL_REPLAY(sock))
     journal_write("update", orig_buf);
 
   while (buffer_size > 0)
   {
-    char **temp;
     char *value;
     time_t stamp;
     char *eostamp;
@@ -1547,22 +1444,11 @@ static int handle_request_update (listen_socket_t *sock, /* {{{ */
     else
       ci->last_update_stamp = stamp;
 
-    temp = (char **) rrd_realloc (ci->values,
-        sizeof (char *) * (ci->values_num + 1));
-    if (temp == NULL)
-    {
-      RRDD_LOG (LOG_ERR, "handle_request_update: realloc failed.");
-      continue;
-    }
-    ci->values = temp;
-
-    ci->values[ci->values_num] = strdup (value);
-    if (ci->values[ci->values_num] == NULL)
+    if (!rrd_add_strdup(&ci->values, &ci->values_num, value))
     {
-      RRDD_LOG (LOG_ERR, "handle_request_update: strdup failed.");
+      RRDD_LOG (LOG_ERR, "handle_request_update: rrd_add_strdup failed.");
       continue;
     }
-    ci->values_num++;
 
     values_num++;
   }
@@ -1590,9 +1476,8 @@ static int handle_request_update (listen_socket_t *sock, /* {{{ */
 /* we came across a "WROTE" entry during journal replay.
  * throw away any values that we have accumulated for this file
  */
-static int handle_request_wrote (const char *buffer, time_t now) /* {{{ */
+static int handle_request_wrote (HANDLER_PROTO) /* {{{ */
 {
-  int i;
   cache_item_t *ci;
   const char *file = buffer;
 
@@ -1606,12 +1491,7 @@ static int handle_request_wrote (const char *buffer, time_t now) /* {{{ */
   }
 
   if (ci->values)
-  {
-    for (i=0; i < ci->values_num; i++)
-      free(ci->values[i]);
-
-    free(ci->values);
-  }
+    rrd_free_ptrs((void ***) &ci->values, &ci->values_num);
 
   wipe_ci_values(ci, now);
   remove_from_queue(ci);
@@ -1621,7 +1501,7 @@ static int handle_request_wrote (const char *buffer, time_t now) /* {{{ */
 } /* }}} int handle_request_wrote */
 
 /* start "BATCH" processing */
-static int batch_start (listen_socket_t *sock) /* {{{ */
+static int batch_start (HANDLER_PROTO) /* {{{ */
 {
   int status;
   if (sock->batch_start)
@@ -1636,7 +1516,7 @@ static int batch_start (listen_socket_t *sock) /* {{{ */
 } /* }}} static int batch_start */
 
 /* finish "BATCH" processing and return results to the client */
-static int batch_done (listen_socket_t *sock) /* {{{ */
+static int batch_done (HANDLER_PROTO) /* {{{ */
 {
   assert(sock->batch_start);
   sock->batch_start = 0;
@@ -1644,20 +1524,268 @@ static int batch_done (listen_socket_t *sock) /* {{{ */
   return send_response(sock, RESP_OK, "errors\n");
 } /* }}} static int batch_done */
 
-/* if sock==NULL, we are in journal replay mode */
-static int handle_request (listen_socket_t *sock, /* {{{ */
-                           time_t now,
-                           char *buffer, size_t buffer_size)
+static int handle_request_quit (HANDLER_PROTO) /* {{{ */
+{
+  return -1;
+} /* }}} static int handle_request_quit */
+
+static command_t list_of_commands[] = { /* {{{ */
+  {
+    "UPDATE",
+    handle_request_update,
+    CMD_CONTEXT_ANY,
+    "UPDATE <filename> <values> [<values> ...]\n"
+    ,
+    "Adds the given file to the internal cache if it is not yet known and\n"
+    "appends the given value(s) to the entry. See the rrdcached(1) manpage\n"
+    "for details.\n"
+    "\n"
+    "Each <values> has the following form:\n"
+    "  <values> = <time>:<value>[:<value>[...]]\n"
+    "See the rrdupdate(1) manpage for details.\n"
+  },
+  {
+    "WROTE",
+    handle_request_wrote,
+    CMD_CONTEXT_JOURNAL,
+    NULL,
+    NULL
+  },
+  {
+    "FLUSH",
+    handle_request_flush,
+    CMD_CONTEXT_CLIENT | CMD_CONTEXT_BATCH,
+    "FLUSH <filename>\n"
+    ,
+    "Adds the given filename to the head of the update queue and returns\n"
+    "after it has been dequeued.\n"
+  },
+  {
+    "FLUSHALL",
+    handle_request_flushall,
+    CMD_CONTEXT_CLIENT,
+    "FLUSHALL\n"
+    ,
+    "Triggers writing of all pending updates.  Returns immediately.\n"
+  },
+  {
+    "PENDING",
+    handle_request_pending,
+    CMD_CONTEXT_CLIENT,
+    "PENDING <filename>\n"
+    ,
+    "Shows any 'pending' updates for a file, in order.\n"
+    "The updates shown have not yet been written to the underlying RRD file.\n"
+  },
+  {
+    "FORGET",
+    handle_request_forget,
+    CMD_CONTEXT_ANY,
+    "FORGET <filename>\n"
+    ,
+    "Removes the file completely from the cache.\n"
+    "Any pending updates for the file will be lost.\n"
+  },
+  {
+    "QUEUE",
+    handle_request_queue,
+    CMD_CONTEXT_CLIENT,
+    "QUEUE\n"
+    ,
+        "Shows all files in the output queue.\n"
+    "The output is zero or more lines in the following format:\n"
+    "(where <num_vals> is the number of values to be written)\n"
+    "\n"
+    "<num_vals> <filename>\n"
+  },
+  {
+    "STATS",
+    handle_request_stats,
+    CMD_CONTEXT_CLIENT,
+    "STATS\n"
+    ,
+    "Returns some performance counters, see the rrdcached(1) manpage for\n"
+    "a description of the values.\n"
+  },
+  {
+    "HELP",
+    handle_request_help,
+    CMD_CONTEXT_CLIENT,
+    "HELP [<command>]\n",
+    NULL, /* special! */
+  },
+  {
+    "BATCH",
+    batch_start,
+    CMD_CONTEXT_CLIENT,
+    "BATCH\n"
+    ,
+    "The 'BATCH' command permits the client to initiate a bulk load\n"
+    "   of commands to rrdcached.\n"
+    "\n"
+    "Usage:\n"
+    "\n"
+    "    client: BATCH\n"
+    "    server: 0 Go ahead.  End with dot '.' on its own line.\n"
+    "    client: command #1\n"
+    "    client: command #2\n"
+    "    client: ... and so on\n"
+    "    client: .\n"
+    "    server: 2 errors\n"
+    "    server: 7 message for command #7\n"
+    "    server: 9 message for command #9\n"
+    "\n"
+    "For more information, consult the rrdcached(1) documentation.\n"
+  },
+  {
+    ".",   /* BATCH terminator */
+    batch_done,
+    CMD_CONTEXT_BATCH,
+    NULL,
+    NULL
+  },
+  {
+    "QUIT",
+    handle_request_quit,
+    CMD_CONTEXT_CLIENT | CMD_CONTEXT_BATCH,
+    "QUIT\n"
+    ,
+    "Disconnect from rrdcached.\n"
+  }
+}; /* }}} command_t list_of_commands[] */
+static size_t list_of_commands_len = sizeof (list_of_commands)
+  / sizeof (list_of_commands[0]);
+
+static command_t *find_command(char *cmd)
+{
+  size_t i;
+
+  for (i = 0; i < list_of_commands_len; i++)
+    if (strcasecmp(cmd, list_of_commands[i].cmd) == 0)
+      return (&list_of_commands[i]);
+  return NULL;
+}
+
+/* We currently use the index in the `list_of_commands' array as a bit position
+ * in `listen_socket_t.permissions'. This member schould NEVER be accessed from
+ * outside these functions so that switching to a more elegant storage method
+ * is easily possible. */
+static ssize_t find_command_index (const char *cmd) /* {{{ */
+{
+  size_t i;
+
+  for (i = 0; i < list_of_commands_len; i++)
+    if (strcasecmp(cmd, list_of_commands[i].cmd) == 0)
+      return ((ssize_t) i);
+  return (-1);
+} /* }}} ssize_t find_command_index */
+
+static int socket_permission_check (listen_socket_t *sock, /* {{{ */
+    const char *cmd)
+{
+  ssize_t i;
+
+  if (JOURNAL_REPLAY(sock))
+    return (1);
+
+  if (cmd == NULL)
+    return (-1);
+
+  if ((strcasecmp ("QUIT", cmd) == 0)
+      || (strcasecmp ("HELP", cmd) == 0))
+    return (1);
+  else if (strcmp (".", cmd) == 0)
+    cmd = "BATCH";
+
+  i = find_command_index (cmd);
+  if (i < 0)
+    return (-1);
+  assert (i < 32);
+
+  if ((sock->permissions & (1 << i)) != 0)
+    return (1);
+  return (0);
+} /* }}} int socket_permission_check */
+
+static int socket_permission_add (listen_socket_t *sock, /* {{{ */
+    const char *cmd)
+{
+  ssize_t i;
+
+  i = find_command_index (cmd);
+  if (i < 0)
+    return (-1);
+  assert (i < 32);
+
+  sock->permissions |= (1 << i);
+  return (0);
+} /* }}} int socket_permission_add */
+
+/* check whether commands are received in the expected context */
+static int command_check_context(listen_socket_t *sock, command_t *cmd)
+{
+  if (JOURNAL_REPLAY(sock))
+    return (cmd->context & CMD_CONTEXT_JOURNAL);
+  else if (sock->batch_start)
+    return (cmd->context & CMD_CONTEXT_BATCH);
+  else
+    return (cmd->context & CMD_CONTEXT_CLIENT);
+
+  /* NOTREACHED */
+  assert(1==0);
+}
+
+static int handle_request_help (HANDLER_PROTO) /* {{{ */
 {
-  char *buffer_ptr;
-  char *command;
+  int status;
+  char *cmd_str;
+  char *resp_txt;
+  command_t *help = NULL;
+
+  status = buffer_get_field (&buffer, &buffer_size, &cmd_str);
+  if (status == 0)
+    help = find_command(cmd_str);
+
+  if (help && (help->syntax || help->help))
+  {
+    char tmp[CMD_MAX];
+
+    snprintf(tmp, sizeof(tmp)-1, "Help for %s\n", help->cmd);
+    resp_txt = tmp;
+
+    if (help->syntax)
+      add_response_info(sock, "Usage: %s\n", help->syntax);
+
+    if (help->help)
+      add_response_info(sock, "%s\n", help->help);
+  }
+  else
+  {
+    size_t i;
+
+    resp_txt = "Command overview\n";
+
+    for (i = 0; i < list_of_commands_len; i++)
+    {
+      if (list_of_commands[i].syntax == NULL)
+        continue;
+      add_response_info (sock, "%s", list_of_commands[i].syntax);
+    }
+  }
+
+  return send_response(sock, RESP_OK, resp_txt);
+} /* }}} int handle_request_help */
+
+static int handle_request (DISPATCH_PROTO) /* {{{ */
+{
+  char *buffer_ptr = buffer;
+  char *cmd_str = NULL;
+  command_t *cmd = NULL;
   int status;
 
   assert (buffer[buffer_size - 1] == '\0');
 
-  buffer_ptr = buffer;
-  command = NULL;
-  status = buffer_get_field (&buffer_ptr, &buffer_size, &command);
+  status = buffer_get_field (&buffer_ptr, &buffer_size, &cmd_str);
   if (status != 0)
   {
     RRDD_LOG (LOG_INFO, "handle_request: Unable parse command.");
@@ -1667,108 +1795,149 @@ static int handle_request (listen_socket_t *sock, /* {{{ */
   if (sock != NULL && sock->batch_start)
     sock->batch_cmd++;
 
-  if (strcasecmp (command, "update") == 0)
-    return (handle_request_update (sock, now, buffer_ptr, buffer_size));
-  else if (strcasecmp (command, "wrote") == 0 && sock == NULL)
-  {
-    /* this is only valid in replay mode */
-    return (handle_request_wrote (buffer_ptr, now));
-  }
-  else if (strcasecmp (command, "flush") == 0)
-    return (handle_request_flush (sock, buffer_ptr, buffer_size));
-  else if (strcasecmp (command, "flushall") == 0)
-    return (handle_request_flushall(sock));
-  else if (strcasecmp (command, "pending") == 0)
-    return (handle_request_pending(sock, buffer_ptr, buffer_size));
-  else if (strcasecmp (command, "forget") == 0)
-    return (handle_request_forget(sock, buffer_ptr, buffer_size));
-  else if (strcasecmp (command, "queue") == 0)
-    return (handle_request_queue(sock));
-  else if (strcasecmp (command, "stats") == 0)
-    return (handle_request_stats (sock));
-  else if (strcasecmp (command, "help") == 0)
-    return (handle_request_help (sock, buffer_ptr, buffer_size));
-  else if (strcasecmp (command, "batch") == 0 && sock != NULL)
-    return batch_start(sock);
-  else if (strcasecmp (command, ".") == 0 && sock != NULL && sock->batch_start)
-    return batch_done(sock);
-  else if (strcasecmp (command, "quit") == 0)
-    return -1;
-  else
-    return send_response(sock, RESP_ERR, "Unknown command: %s\n", command);
+  cmd = find_command(cmd_str);
+  if (!cmd)
+    return send_response(sock, RESP_ERR, "Unknown command: %s\n", cmd_str);
 
-  /* NOTREACHED */
-  assert(1==0);
+  if (!socket_permission_check (sock, cmd->cmd))
+    return send_response(sock, RESP_ERR, "Permission denied.\n");
+
+  if (!command_check_context(sock, cmd))
+    return send_response(sock, RESP_ERR, "Can't use '%s' here.\n", cmd_str);
+
+  return cmd->handler(cmd, sock, now, buffer_ptr, buffer_size);
 } /* }}} int handle_request */
 
-/* MUST NOT hold journal_lock before calling this */
-static void journal_rotate(void) /* {{{ */
+static void journal_set_free (journal_set *js) /* {{{ */
 {
-  FILE *old_fh = NULL;
-  int new_fd;
-
-  if (journal_cur == NULL || journal_old == NULL)
+  if (js == NULL)
     return;
 
-  pthread_mutex_lock(&journal_lock);
+  rrd_free_ptrs((void ***) &js->files, &js->files_num);
 
-  /* we rotate this way (rename before close) so that the we can release
-   * the journal lock as fast as possible.  Journal writes to the new
-   * journal can proceed immediately after the new file is opened.  The
-   * fclose can then block without affecting new updates.
-   */
-  if (journal_fh != NULL)
+  free(js);
+} /* }}} journal_set_free */
+
+static void journal_set_remove (journal_set *js) /* {{{ */
+{
+  if (js == NULL)
+    return;
+
+  for (uint i=0; i < js->files_num; i++)
   {
-    old_fh = journal_fh;
-    journal_fh = NULL;
-    rename(journal_cur, journal_old);
-    ++stats_journal_rotate;
+    RRDD_LOG(LOG_DEBUG, "removing old journal %s", js->files[i]);
+    unlink(js->files[i]);
   }
+} /* }}} journal_set_remove */
 
-  new_fd = open(journal_cur, O_WRONLY|O_CREAT|O_APPEND,
-                S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH);
-  if (new_fd >= 0)
+/* close current journal file handle.
+ * MUST hold journal_lock before calling */
+static void journal_close(void) /* {{{ */
+{
+  if (journal_fh != NULL)
   {
-    journal_fh = fdopen(new_fd, "a");
-    if (journal_fh == NULL)
-      close(new_fd);
+    if (fclose(journal_fh) != 0)
+      RRDD_LOG(LOG_ERR, "cannot close journal: %s", rrd_strerror(errno));
   }
 
-  pthread_mutex_unlock(&journal_lock);
+  journal_fh = NULL;
+  journal_size = 0;
+} /* }}} journal_close */
+
+/* MUST hold journal_lock before calling */
+static void journal_new_file(void) /* {{{ */
+{
+  struct timeval now;
+  int  new_fd;
+  char new_file[PATH_MAX + 1];
+
+  assert(journal_dir != NULL);
+  assert(journal_cur != NULL);
+
+  journal_close();
 
-  if (old_fh != NULL)
-    fclose(old_fh);
+  gettimeofday(&now, NULL);
+  /* this format assures that the files sort in strcmp() order */
+  snprintf(new_file, PATH_MAX, "%s/%s.%010d.%06d",
+           journal_dir, JOURNAL_BASE, (int)now.tv_sec, (int)now.tv_usec);
 
+  new_fd = open(new_file, O_WRONLY|O_CREAT|O_APPEND,
+                S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH);
+  if (new_fd < 0)
+    goto error;
+
+  journal_fh = fdopen(new_fd, "a");
   if (journal_fh == NULL)
-  {
-    RRDD_LOG(LOG_CRIT,
-             "JOURNALING DISABLED: Cannot open journal file '%s' : (%s)",
-             journal_cur, rrd_strerror(errno));
+    goto error;
 
-    RRDD_LOG(LOG_ERR,
-             "JOURNALING DISABLED: All values will be flushed at shutdown");
-    config_flush_at_shutdown = 1;
-  }
+  journal_size = ftell(journal_fh);
+  RRDD_LOG(LOG_DEBUG, "started new journal %s", new_file);
+
+  /* record the file in the journal set */
+  rrd_add_strdup(&journal_cur->files, &journal_cur->files_num, new_file);
+
+  return;
+
+error:
+  RRDD_LOG(LOG_CRIT,
+           "JOURNALING DISABLED: Error while trying to create %s : %s",
+           new_file, rrd_strerror(errno));
+  RRDD_LOG(LOG_CRIT,
+           "JOURNALING DISABLED: All values will be flushed at shutdown");
+
+  close(new_fd);
+  config_flush_at_shutdown = 1;
+
+} /* }}} journal_new_file */
+
+/* MUST NOT hold journal_lock before calling this */
+static void journal_rotate(void) /* {{{ */
+{
+  journal_set *old_js = NULL;
+
+  if (journal_dir == NULL)
+    return;
+
+  RRDD_LOG(LOG_DEBUG, "rotating journals");
+
+  pthread_mutex_lock(&stats_lock);
+  ++stats_journal_rotate;
+  pthread_mutex_unlock(&stats_lock);
+
+  pthread_mutex_lock(&journal_lock);
+
+  journal_close();
+
+  /* rotate the journal sets */
+  old_js = journal_old;
+  journal_old = journal_cur;
+  journal_cur = calloc(1, sizeof(journal_set));
+
+  if (journal_cur != NULL)
+    journal_new_file();
+  else
+    RRDD_LOG(LOG_CRIT, "journal_rotate: malloc(journal_set) failed\n");
+
+  pthread_mutex_unlock(&journal_lock);
+
+  journal_set_remove(old_js);
+  journal_set_free  (old_js);
 
 } /* }}} static void journal_rotate */
 
+/* MUST hold journal_lock when calling */
 static void journal_done(void) /* {{{ */
 {
   if (journal_cur == NULL)
     return;
 
-  pthread_mutex_lock(&journal_lock);
-  if (journal_fh != NULL)
-  {
-    fclose(journal_fh);
-    journal_fh = NULL;
-  }
+  journal_close();
 
   if (config_flush_at_shutdown)
   {
     RRDD_LOG(LOG_INFO, "removing journals");
-    unlink(journal_old);
-    unlink(journal_cur);
+    journal_set_remove(journal_old);
+    journal_set_remove(journal_cur);
   }
   else
   {
@@ -1776,7 +1945,9 @@ static void journal_done(void) /* {{{ */
              "journals will be used at next startup");
   }
 
-  pthread_mutex_unlock(&journal_lock);
+  journal_set_free(journal_cur);
+  journal_set_free(journal_old);
+  free(journal_dir);
 
 } /* }}} static void journal_done */
 
@@ -1789,6 +1960,11 @@ static int journal_write(char *cmd, char *args) /* {{{ */
 
   pthread_mutex_lock(&journal_lock);
   chars = fprintf(journal_fh, "%s %s\n", cmd, args);
+  journal_size += chars;
+
+  if (journal_size > JOURNAL_MAX)
+    journal_new_file();
+
   pthread_mutex_unlock(&journal_lock);
 
   if (chars > 0)
@@ -1820,9 +1996,6 @@ static int journal_replay (const char *file) /* {{{ */
     memset(&statbuf, 0, sizeof(statbuf));
     if (stat(file, &statbuf) != 0)
     {
-      if (errno == ENOENT)
-        return 0;
-
       reason = "stat error";
       status = errno;
     }
@@ -1898,25 +2071,79 @@ static int journal_replay (const char *file) /* {{{ */
   return entry_cnt > 0 ? 1 : 0;
 } /* }}} static int journal_replay */
 
+static int journal_sort(const void *v1, const void *v2)
+{
+  char **jn1 = (char **) v1;
+  char **jn2 = (char **) v2;
+
+  return strcmp(*jn1,*jn2);
+}
+
 static void journal_init(void) /* {{{ */
 {
   int had_journal = 0;
+  DIR *dir;
+  struct dirent *dent;
+  char path[PATH_MAX+1];
 
-  if (journal_cur == NULL) return;
+  if (journal_dir == NULL) return;
 
   pthread_mutex_lock(&journal_lock);
 
+  journal_cur = calloc(1, sizeof(journal_set));
+  if (journal_cur == NULL)
+  {
+    RRDD_LOG(LOG_CRIT, "journal_rotate: malloc(journal_set) failed\n");
+    return;
+  }
+
   RRDD_LOG(LOG_INFO, "checking for journal files");
 
-  had_journal += journal_replay(journal_old);
-  had_journal += journal_replay(journal_cur);
+  /* Handle old journal files during transition.  This gives them the
+   * correct sort order.  TODO: remove after first release
+   */
+  {
+    char old_path[PATH_MAX+1];
+    snprintf(old_path, PATH_MAX, "%s/%s", journal_dir, JOURNAL_BASE ".old" );
+    snprintf(path,     PATH_MAX, "%s/%s", journal_dir, JOURNAL_BASE ".0000");
+    rename(old_path, path);
+
+    snprintf(old_path, PATH_MAX, "%s/%s", journal_dir, JOURNAL_BASE        );
+    snprintf(path,     PATH_MAX, "%s/%s", journal_dir, JOURNAL_BASE ".0001");
+    rename(old_path, path);
+  }
+
+  dir = opendir(journal_dir);
+  while ((dent = readdir(dir)) != NULL)
+  {
+    /* looks like a journal file? */
+    if (strncmp(dent->d_name, JOURNAL_BASE, strlen(JOURNAL_BASE)))
+      continue;
+
+    snprintf(path, PATH_MAX, "%s/%s", journal_dir, dent->d_name);
+
+    if (!rrd_add_strdup(&journal_cur->files, &journal_cur->files_num, path))
+    {
+      RRDD_LOG(LOG_CRIT, "journal_init: cannot add journal file %s!",
+               dent->d_name);
+      break;
+    }
+  }
+  closedir(dir);
+
+  qsort(journal_cur->files, journal_cur->files_num,
+        sizeof(journal_cur->files[0]), journal_sort);
+
+  for (uint i=0; i < journal_cur->files_num; i++)
+    had_journal += journal_replay(journal_cur->files[i]);
+
+  journal_new_file();
 
   /* it must have been a crash.  start a flush */
   if (had_journal && config_flush_at_shutdown)
     flush_old_values(-1);
 
   pthread_mutex_unlock(&journal_lock);
-  journal_rotate();
 
   RRDD_LOG(LOG_INFO, "journal processing complete");
 
@@ -1946,7 +2173,6 @@ static void close_connection(listen_socket_t *sock) /* {{{ */
 static void *connection_thread_main (void *args) /* {{{ */
 {
   listen_socket_t *sock;
-  int i;
   int fd;
 
   sock = (listen_socket_t *) args;
@@ -1963,25 +2189,10 @@ static void *connection_thread_main (void *args) /* {{{ */
   }
 
   pthread_mutex_lock (&connection_threads_lock);
-  {
-    pthread_t *temp;
-
-    temp = (pthread_t *) rrd_realloc (connection_threads,
-        sizeof (pthread_t) * (connection_threads_num + 1));
-    if (temp == NULL)
-    {
-      RRDD_LOG (LOG_ERR, "connection_thread_main: realloc(++) failed.");
-    }
-    else
-    {
-      connection_threads = temp;
-      connection_threads[connection_threads_num] = pthread_self ();
-      connection_threads_num++;
-    }
-  }
+  connection_threads_num++;
   pthread_mutex_unlock (&connection_threads_lock);
 
-  while (do_shutdown == 0)
+  while (state == RUNNING)
   {
     char *cmd;
     ssize_t cmd_len;
@@ -1996,7 +2207,7 @@ static void *connection_thread_main (void *args) /* {{{ */
     pollfd.revents = 0;
 
     status = poll (&pollfd, 1, /* timeout = */ 500);
-    if (do_shutdown)
+    if (state != RUNNING)
       break;
     else if (status == 0) /* timeout */
       continue;
@@ -2048,34 +2259,9 @@ out_close:
 
   /* Remove this thread from the connection threads list */
   pthread_mutex_lock (&connection_threads_lock);
-  {
-    pthread_t self;
-    pthread_t *temp;
-
-    /* Find out own index in the array */
-    self = pthread_self ();
-    for (i = 0; i < connection_threads_num; i++)
-      if (pthread_equal (connection_threads[i], self) != 0)
-        break;
-    assert (i < connection_threads_num);
-
-    /* Move the trailing threads forward. */
-    if (i < (connection_threads_num - 1))
-    {
-      memmove (connection_threads + i,
-               connection_threads + i + 1,
-               sizeof (pthread_t) * (connection_threads_num - i - 1));
-    }
-
-    connection_threads_num--;
-
-    temp = rrd_realloc(connection_threads,
-                   sizeof(*connection_threads) * connection_threads_num);
-    if (connection_threads_num > 0 && temp == NULL)
-      RRDD_LOG(LOG_ERR, "connection_thread_main: realloc(--) failed.");
-    else
-      connection_threads = temp;
-  }
+  connection_threads_num--;
+  if (connection_threads_num <= 0)
+    pthread_cond_broadcast(&connection_threads_done);
   pthread_mutex_unlock (&connection_threads_lock);
 
   return (NULL);
@@ -2088,11 +2274,31 @@ static int open_listen_socket_unix (const listen_socket_t *sock) /* {{{ */
   listen_socket_t *temp;
   int status;
   const char *path;
+  char *path_copy, *dir;
 
   path = sock->addr;
   if (strncmp(path, "unix:", strlen("unix:")) == 0)
     path += strlen("unix:");
 
+  /* dirname may modify its argument */
+  path_copy = strdup(path);
+  if (path_copy == NULL)
+  {
+    fprintf(stderr, "rrdcached: strdup(): %s\n",
+        rrd_strerror(errno));
+    return (-1);
+  }
+
+  dir = dirname(path_copy);
+  if (rrd_mkdir_p(dir, 0777) != 0)
+  {
+    fprintf(stderr, "Failed to create socket directory '%s': %s\n",
+        dir, rrd_strerror(errno));
+    return (-1);
+  }
+
+  free(path_copy);
+
   temp = (listen_socket_t *) rrd_realloc (listen_fds,
       sizeof (listen_fds[0]) * (listen_fds_num + 1));
   if (temp == NULL)
@@ -2130,6 +2336,23 @@ static int open_listen_socket_unix (const listen_socket_t *sock) /* {{{ */
     return (-1);
   }
 
+  /* tweak the sockets group ownership */
+  if (sock->socket_group != (gid_t)-1)
+  {
+    if ( (chown(path, getuid(), sock->socket_group) != 0) ||
+	 (chmod(path, (S_IRUSR|S_IWUSR|S_IXUSR | S_IRGRP|S_IWGRP)) != 0) )
+    {
+      fprintf(stderr, "rrdcached: failed to set socket group permissions (%s)\n", strerror(errno));
+    }
+  }
+
+  if (sock->socket_permissions != (mode_t)-1)
+  {
+    if (chmod(path, sock->socket_permissions) != 0)
+      fprintf(stderr, "rrdcached: failed to set socket file permissions (%o): %s\n",
+          (unsigned int)sock->socket_permissions, strerror(errno));
+  }
+
   status = listen (fd, /* backlog = */ 10);
   if (status != 0)
   {
@@ -2159,7 +2382,7 @@ static int open_listen_socket_network(const listen_socket_t *sock) /* {{{ */
   char *port;
   int status;
 
-  strncpy (addr_copy, sock->addr, sizeof (addr_copy));
+  strncpy (addr_copy, sock->addr, sizeof(addr_copy)-1);
   addr_copy[sizeof (addr_copy) - 1] = 0;
   addr = addr_copy;
 
@@ -2195,8 +2418,8 @@ static int open_listen_socket_network(const listen_socket_t *sock) /* {{{ */
       fprintf (stderr, "rrdcached: Garbage after address: %s\n", port);
       return (-1);
     }
-  } /* if (*addr = ']') */
-  else if (strchr (addr, '.') != NULL) /* Hostname or IPv4 */
+  } /* if (*addr == '[') */
+  else
   {
     port = rindex(addr, ':');
     if (port != NULL)
@@ -2326,7 +2549,7 @@ static void *listen_thread_main (void *args __attribute__((unused))) /* {{{ */
 
   RRDD_LOG(LOG_INFO, "listening for connections");
 
-  while (do_shutdown == 0)
+  while (state == RUNNING)
   {
     for (i = 0; i < pollfds_num; i++)
     {
@@ -2336,7 +2559,7 @@ static void *listen_thread_main (void *args __attribute__((unused))) /* {{{ */
     }
 
     status = poll (pollfds, pollfds_num, /* timeout = */ 1000);
-    if (do_shutdown)
+    if (state != RUNNING)
       break;
     else if (status == 0) /* timeout */
       continue;
@@ -2399,7 +2622,7 @@ static void *listen_thread_main (void *args __attribute__((unused))) /* {{{ */
         continue;
       }
     } /* for (pollfds_num) */
-  } /* while (do_shutdown == 0) */
+  } /* while (state == RUNNING) */
 
   RRDD_LOG(LOG_INFO, "starting shutdown");
 
@@ -2407,15 +2630,7 @@ static void *listen_thread_main (void *args __attribute__((unused))) /* {{{ */
 
   pthread_mutex_lock (&connection_threads_lock);
   while (connection_threads_num > 0)
-  {
-    pthread_t wait_for;
-
-    wait_for = connection_threads[0];
-
-    pthread_mutex_unlock (&connection_threads_lock);
-    pthread_join (wait_for, /* retval = */ NULL);
-    pthread_mutex_lock (&connection_threads_lock);
-  }
+    pthread_cond_wait(&connection_threads_done, &connection_threads_lock);
   pthread_mutex_unlock (&connection_threads_lock);
 
   free(pollfds);
@@ -2439,19 +2654,17 @@ static int daemonize (void) /* {{{ */
   /* open all the listen sockets */
   if (config_listen_address_list_len > 0)
   {
-    for (int i = 0; i < config_listen_address_list_len; i++)
-    {
+    for (size_t i = 0; i < config_listen_address_list_len; i++)
       open_listen_socket (config_listen_address_list[i]);
-      free_listen_socket (config_listen_address_list[i]);
-    }
 
-    free(config_listen_address_list);
+    rrd_free_ptrs((void ***) &config_listen_address_list,
+                  &config_listen_address_list_len);
   }
   else
   {
     listen_socket_t sock;
     memset(&sock, 0, sizeof(sock));
-    strncpy(sock.addr, RRDCACHED_DEFAULT_ADDRESS, sizeof(sock.addr));
+    strncpy(sock.addr, RRDCACHED_DEFAULT_ADDRESS, sizeof(sock.addr)-1);
     open_listen_socket (&sock);
   }
 
@@ -2483,8 +2696,9 @@ static int daemonize (void) /* {{{ */
     close (0);
 
     open ("/dev/null", O_RDWR);
-    dup (0);
-    dup (0);
+    if (dup(0) == -1 || dup(0) == -1){
+        RRDD_LOG (LOG_ERR, "faild to run dup.\n");
+    }
   } /* if (!stay_foreground) */
 
   /* Change into the /tmp directory. */
@@ -2520,8 +2734,6 @@ error:
 
 static int cleanup (void) /* {{{ */
 {
-  do_shutdown++;
-
   pthread_cond_broadcast (&flush_cond);
   pthread_join (flush_thread, NULL);
 
@@ -2535,21 +2747,21 @@ static int cleanup (void) /* {{{ */
     RRDD_LOG(LOG_INFO, "clean shutdown; all RRDs flushed");
   }
 
-  journal_done();
-  remove_pidfile ();
-
   free(queue_threads);
   free(config_base_dir);
-  free(config_pid_file);
-  free(journal_cur);
-  free(journal_old);
 
   pthread_mutex_lock(&cache_lock);
   g_tree_destroy(cache_tree);
 
+  pthread_mutex_lock(&journal_lock);
+  journal_done();
+
   RRDD_LOG(LOG_INFO, "goodbye");
   closelog ();
 
+  remove_pidfile ();
+  free(config_pid_file);
+
   return (0);
 } /* }}} int cleanup */
 
@@ -2558,7 +2770,13 @@ static int read_options (int argc, char **argv) /* {{{ */
   int option;
   int status = 0;
 
-  while ((option = getopt(argc, argv, "gl:L:f:w:z:t:Bb:p:Fj:h?")) != -1)
+  char **permissions = NULL;
+  size_t permissions_len = 0;
+
+  gid_t  socket_group = (gid_t)-1;
+  mode_t socket_permissions = (mode_t)-1;
+
+  while ((option = getopt(argc, argv, "gl:s:m:P:f:w:z:t:Bb:p:Fj:h?")) != -1)
   {
     switch (option)
     {
@@ -2566,10 +2784,8 @@ static int read_options (int argc, char **argv) /* {{{ */
         stay_foreground=1;
         break;
 
-      case 'L':
       case 'l':
       {
-        listen_socket_t **temp;
         listen_socket_t *new;
 
         new = malloc(sizeof(listen_socket_t));
@@ -2580,20 +2796,121 @@ static int read_options (int argc, char **argv) /* {{{ */
         }
         memset(new, 0, sizeof(listen_socket_t));
 
-        temp = (listen_socket_t **) rrd_realloc (config_listen_address_list,
-            sizeof (listen_socket_t *) * (config_listen_address_list_len + 1));
-        if (temp == NULL)
+        strncpy(new->addr, optarg, sizeof(new->addr)-1);
+
+        /* Add permissions to the socket {{{ */
+        if (permissions_len != 0)
+        {
+          size_t i;
+          for (i = 0; i < permissions_len; i++)
+          {
+            status = socket_permission_add (new, permissions[i]);
+            if (status != 0)
+            {
+              fprintf (stderr, "read_options: Adding permission \"%s\" to "
+                  "socket failed. Most likely, this permission doesn't "
+                  "exist. Check your command line.\n", permissions[i]);
+              status = 4;
+            }
+          }
+        }
+        else /* if (permissions_len == 0) */
+        {
+          /* Add permission for ALL commands to the socket. */
+          size_t i;
+          for (i = 0; i < list_of_commands_len; i++)
+          {
+            status = socket_permission_add (new, list_of_commands[i].cmd);
+            if (status != 0)
+            {
+              fprintf (stderr, "read_options: Adding permission \"%s\" to "
+                  "socket failed. This should never happen, ever! Sorry.\n",
+                  permissions[i]);
+              status = 4;
+            }
+          }
+        }
+        /* }}} Done adding permissions. */
+
+        new->socket_group = socket_group;
+        new->socket_permissions = socket_permissions;
+
+        if (!rrd_add_ptr((void ***)&config_listen_address_list,
+                         &config_listen_address_list_len, new))
         {
-          fprintf (stderr, "read_options: realloc failed.\n");
+          fprintf(stderr, "read_options: rrd_add_ptr failed.\n");
           return (2);
         }
-        config_listen_address_list = temp;
+      }
+      break;
 
-        strncpy(new->addr, optarg, sizeof(new->addr)-1);
-        new->privilege = (option == 'l') ? PRIV_HIGH : PRIV_LOW;
+      /* set socket group permissions */
+      case 's':
+      {
+	gid_t group_gid;
+	struct group *grp;
+
+	group_gid = strtoul(optarg, NULL, 10);
+	if (errno != EINVAL && group_gid>0)
+	{
+	  /* we were passed a number */
+	  grp = getgrgid(group_gid);
+	}
+	else
+	{
+	  grp = getgrnam(optarg);
+	}
+
+	if (grp)
+	{
+	  socket_group = grp->gr_gid;
+	}
+	else
+	{
+	  /* no idea what the user wanted... */
+	  fprintf (stderr, "read_options: couldn't map \"%s\" to a group, Sorry\n", optarg);
+	  return (5);
+	}
+      }
+      break;
 
-        temp[config_listen_address_list_len] = new;
-        config_listen_address_list_len++;
+      /* set socket file permissions */
+      case 'm':
+      {
+        long  tmp;
+        char *endptr = NULL;
+
+        tmp = strtol (optarg, &endptr, 8);
+        if ((endptr == optarg) || (! endptr) || (*endptr != '\0')
+            || (tmp > 07777) || (tmp < 0)) {
+          fprintf (stderr, "read_options: Invalid file mode \"%s\".\n",
+              optarg);
+          return (5);
+        }
+
+        socket_permissions = (mode_t)tmp;
+      }
+      break;
+
+      case 'P':
+      {
+        char *optcopy;
+        char *saveptr;
+        char *dummy;
+        char *ptr;
+
+        rrd_free_ptrs ((void *) &permissions, &permissions_len);
+
+        optcopy = strdup (optarg);
+        dummy = optcopy;
+        saveptr = NULL;
+        while ((ptr = strtok_r (dummy, ", ", &saveptr)) != NULL)
+        {
+          dummy = NULL;
+          rrd_add_strdup ((void *) &permissions, &permissions_len, ptr);
+        }
+
+        free (optcopy);
       }
       break;
 
@@ -2675,6 +2992,13 @@ static int read_options (int argc, char **argv) /* {{{ */
           return (3);
         }
 
+        if (rrd_mkdir_p (config_base_dir, 0777) != 0)
+        {
+          fprintf (stderr, "Failed to create base directory '%s': %s\n",
+              config_base_dir, rrd_strerror (errno));
+          return (3);
+        }
+
         /* make sure that the base directory is not resolved via
          * symbolic links.  this makes some performance-enhancing
          * assumptions possible (we don't have to resolve paths
@@ -2682,17 +3006,8 @@ static int read_options (int argc, char **argv) /* {{{ */
          */
         if (realpath(config_base_dir, base_realpath) == NULL)
         {
-          fprintf (stderr, "Invalid base directory '%s'.\n", config_base_dir);
-          return 5;
-        }
-        else if (strncmp(config_base_dir,
-                         base_realpath, sizeof(base_realpath)) != 0)
-        {
-          fprintf(stderr,
-                  "Base directory (-b) resolved via file system links!\n"
-                  "Please consult rrdcached '-b' documentation!\n"
-                  "Consider specifying the real directory (%s)\n",
-                  base_realpath);
+          fprintf (stderr, "Failed to canonicalize the base directory '%s': "
+              "%s\n", config_base_dir, rrd_strerror(errno));
           return 5;
         }
 
@@ -2710,6 +3025,24 @@ static int read_options (int argc, char **argv) /* {{{ */
         }
 
         _config_base_dir_len = len;
+
+        len = strlen (base_realpath);
+        while ((len > 0) && (base_realpath[len - 1] == '/'))
+        {
+          base_realpath[len - 1] = '\0';
+          len--;
+        }
+
+        if (strncmp(config_base_dir,
+                         base_realpath, sizeof(base_realpath)) != 0)
+        {
+          fprintf(stderr,
+                  "Base directory (-b) resolved via file system links!\n"
+                  "Please consult rrdcached '-b' documentation!\n"
+                  "Consider specifying the real directory (%s)\n",
+                  base_realpath);
+          return 5;
+        }
       }
       break;
 
@@ -2732,48 +3065,36 @@ static int read_options (int argc, char **argv) /* {{{ */
 
       case 'j':
       {
-        struct stat statbuf;
-        const char *dir = optarg;
+        const char *dir = journal_dir = strdup(optarg);
 
-        status = stat(dir, &statbuf);
+        status = rrd_mkdir_p(dir, 0777);
         if (status != 0)
         {
-          fprintf(stderr, "Cannot stat '%s' : %s\n", dir, rrd_strerror(errno));
+          fprintf(stderr, "Failed to create journal directory '%s': %s\n",
+              dir, rrd_strerror(errno));
           return 6;
         }
 
-        if (!S_ISDIR(statbuf.st_mode)
-            || access(dir, R_OK|W_OK|X_OK) != 0)
+        if (access(dir, R_OK|W_OK|X_OK) != 0)
         {
           fprintf(stderr, "Must specify a writable directory with -j! (%s)\n",
                   errno ? rrd_strerror(errno) : "");
           return 6;
         }
-
-        journal_cur = malloc(PATH_MAX + 1);
-        journal_old = malloc(PATH_MAX + 1);
-        if (journal_cur == NULL || journal_old == NULL)
-        {
-          fprintf(stderr, "malloc failure for journal files\n");
-          return 6;
-        }
-        else 
-        {
-          snprintf(journal_cur, PATH_MAX, "%s/rrd.journal", dir);
-          snprintf(journal_old, PATH_MAX, "%s/rrd.journal.old", dir);
-        }
       }
       break;
 
       case 'h':
       case '?':
-        printf ("RRDCacheD %s  Copyright (C) 2008 Florian octo Forster\n"
+        printf ("RRDCacheD %s\n"
+            "Copyright (C) 2008,2009 Florian octo Forster and Kevin Brintnall\n"
             "\n"
             "Usage: rrdcached [options]\n"
             "\n"
             "Valid options are:\n"
             "  -l <address>  Socket address to listen to.\n"
-            "  -L <address>  Socket address to listen to ('FLUSH' only).\n"
+            "  -P <perms>    Sets the permissions to assign to all following "
+                            "sockets\n"
             "  -w <seconds>  Interval in which to write data.\n"
             "  -z <delay>    Delay writes up to <delay> seconds to spread load\n"
             "  -t <threads>  Number of write threads.\n"
@@ -2784,12 +3105,20 @@ static int read_options (int argc, char **argv) /* {{{ */
             "  -g            Do not fork and run in the foreground.\n"
             "  -j <dir>      Directory in which to create the journal files.\n"
             "  -F            Always flush all updates at shutdown\n"
+            "  -s <id|name>  Group owner of all following UNIX sockets\n"
+            "                (the socket will also have read/write permissions "
+                            "for that group)\n"
+            "  -m <mode>     File permissions (octal) of all following UNIX "
+                            "sockets\n"
             "\n"
             "For more information and a detailed description of all options "
             "please refer\n"
             "to the rrdcached(1) manual page.\n",
             VERSION);
-        status = -1;
+        if (option == 'h')
+          status = -1;
+        else
+          status = 1;
         break;
     } /* switch (option) */
   } /* while (getopt) */
@@ -2806,9 +3135,11 @@ static int read_options (int argc, char **argv) /* {{{ */
     fprintf(stderr, "WARNING: -B does not make sense without -b!\n"
             "  Consult the rrdcached documentation\n");
 
-  if (journal_cur == NULL)
+  if (journal_dir == NULL)
     config_flush_at_shutdown = 1;
 
+  rrd_free_ptrs ((void *) &permissions, &permissions_len);
+
   return (status);
 } /* }}} int read_options */