Merge branch 'collectd-3.9'

diff --git a/ChangeLog b/ChangeLog
index 0e3c7a7..0a181fe 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,7 +8,7 @@
        * A plugin for moniroting an NTP instance and the local clock drift
          has been added.
 
-2006-06-18, Version 3.9.4
+2006-06-25, Version 3.9.4
        * The Solaris code in the `swap' plugin has been changed to reflect
          the numbers returned by `swap -s'. Thanks to Christophe Kalt for
          working this out.

diff --git a/collectd.spec b/collectd.spec
index aea8a3f..fe6430a 100644 (file)
--- a/collectd.spec
+++ b/collectd.spec
@@ -102,7 +102,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0444,root,root) %{_libdir}/%{name}/sensors.so*
 
 %changelog
-* Tue Jun 18 2006 Florian octo Forster <octo@verplant.org> 3.9.4-1
+* Tue Jun 25 2006 Florian octo Forster <octo@verplant.org> 3.9.4-1
 - New upstream version
 
 * Tue Jun 01 2006 Florian octo Forster <octo@verplant.org> 3.9.3-1

diff --git a/debian/changelog b/debian/changelog
index 4e5bd89..fb3e5c7 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,7 @@ collectd (3.9.4) unstable; urgency=low
 
   * New upstream version 
 
- -- Florian Forster <octo@leeloo.home.verplant.org>  Sun, 18 Jun 2006 19:50:44 +0200
+ -- Florian Forster <octo@leeloo.home.verplant.org>  Sun, 25 Jun 2006 19:50:44 +0200
 
 collectd (3.9.3) unstable; urgency=low
 

diff --git a/src/configfile.c b/src/configfile.c
index 3926586..40b46fa 100644 (file)
--- a/src/configfile.c
+++ b/src/configfile.c
@@ -258,6 +258,27 @@ static int cf_callback_mode (const char *shortvar, const char *var,
                operating_mode = MODE_SERVER;
        else if (strcasecmp (value, "Local") == 0)
                operating_mode = MODE_LOCAL;
+#else /* !HAVE_LIBRRD */
+       else if (strcasecmp (value, "Server") == 0)
+       {
+               fprintf (stderr, "Invalid mode `Server': "
+                               "You need to link against librrd for this "
+                               "mode to be available.\n");
+               syslog (LOG_ERR, "Invalid mode `Server': "
+                               "You need to link against librrd for this "
+                               "mode to be available.");
+               return (LC_CBRET_ERROR);
+       }
+       else if (strcasecmp (value, "Local") == 0)
+       {
+               fprintf (stderr, "Invalid mode `Local': "
+                               "You need to link against librrd for this "
+                               "mode to be available.\n");
+               syslog (LOG_ERR, "Invalid mode `Local': "
+                               "You need to link against librrd for this "
+                               "mode to be available.");
+               return (LC_CBRET_ERROR);
+       }
 #endif
        else if (strcasecmp (value, "Log") == 0)
                operating_mode = MODE_LOG;