Merge branch 'master' into ff/plugins-ng

[collectd.git] / src / collectd.c

diff --git a/src/collectd.c b/src/collectd.c
index a93cc28..e130647 100644 (file)
--- a/src/collectd.c
+++ b/src/collectd.c
@@ -4,8 +4,7 @@
  *
  * 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.
+ * Free Software Foundation; only version 2 of the License is applicable.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -223,6 +222,8 @@ static int start_client (void)
 #if HAVE_LIBRRD
 static int start_server (void)
 {
+       /* FIXME */
+#if 0
        char *host;
        char *type;
        char *instance;
@@ -251,6 +252,7 @@ static int start_server (void)
                if (values   != NULL) free (values);   values   = NULL;
        }
        
+#endif
        return (0);
 } /* static int start_server (void) */
 #endif /* HAVE_LIBRRD */