2 files changed, 37 insertions, 0 deletions

diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index bbe00cb2d..7371faf2e 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -25,6 +25,15 @@ if USE_COVERAGE
   XLIB = -lgcov
 endif
 
+noinst_PROGRAMS = \
+ gnunet-config-diff
+
+gnunet_config_diff_SOURCES = \
+ gnunet-config-diff.c
+gnunet_config_diff_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la  
+
+
 lib_LTLIBRARIES = libgnunetutil.la
 
 libgnunetutil_la_SOURCES = \
diff --git a/src/util/gnunet-config-diff.c b/src/util/gnunet-config-diff.c
new file mode 100644
index 000000000..3c0af8f24
--- /dev/null
+++ b/src/util/gnunet-config-diff.c
@@ -0,0 +1,28 @@
+#include "platform.h"
+#include <gnunet_util_lib.h>
+
+int main(int argc,
+         char **argv)
+{
+  struct GNUNET_CONFIGURATION_Handle *i1;
+  struct GNUNET_CONFIGURATION_Handle *i2;
+
+  if (argc != 3)
+    {
+      fprintf (stderr,
+               "Invoke using `%s DEFAULTS-IN DIFFS'\n",
+               argv[0]);
+      return 1;
+    }
+  i1 = GNUNET_CONFIGURATION_create ();
+  i2 = GNUNET_CONFIGURATION_create ();
+  if ( (GNUNET_OK !=
+        GNUNET_CONFIGURATION_load (i1, argv[1])) ||
+       (GNUNET_OK !=
+        GNUNET_CONFIGURATION_load (i2, argv[2])) )
+    return 1;
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_write_diffs (i1, i2, argv[2]))
+    return 2;
+  return 0;
+}