From 8271e80ae6f559b053fb4fe247ae2cebced2a5dd Mon Sep 17 00:00:00 2001
From: Axel Kittenberger <axkibe@gmail.com>
Date: Mon, 5 Jan 2009 13:45:12 +0000
Subject: [PATCH] prepare 1.26 bugfix release

---
 ChangeLog       | 3 +++
 configure.in    | 2 +-
 lsyncd.c        | 4 ++--
 lsyncd.conf.xml | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 14af867..730ee90 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+05-01-2009:  Release of lsyncd 1.26
+	fix: segfault on multitargets
+
 14-12-2008:  Release of lsyncd 1.25
 	fix: mv dir and cp -r working
 	fix: working with reiserfs
diff --git a/configure.in b/configure.in
index f3f94f0..091ce56 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 AC_INIT(lsyncd.c)
 m4_define(LSYNCD_PACKAGE,lsyncd)
-m4_define(LSYNCD_VERSION,1.25)
+m4_define(LSYNCD_VERSION,1.26)
 AM_INIT_AUTOMAKE(LSYNCD_PACKAGE,LSYNCD_VERSION)
 
 AC_ARG_ENABLE([xml_config],
diff --git a/lsyncd.c b/lsyncd.c
index fd1c183..70b3359 100644
--- a/lsyncd.c
+++ b/lsyncd.c
@@ -1481,8 +1481,8 @@ bool parse_config(bool fullparse) {
 		fprintf(stderr, "error in config file: version specifier missing in \"%s\",\n", conf_filename);
 		exit(LSYNCD_BADCONFIGFILE);
 	}
-	if (xmlStrcmp(xc, BAD_CAST "1.25")) {
-		fprintf(stderr, "error in config file: expected a \"1.25\" versioned file, found \"%s\"\n", xc);
+	if (xmlStrcmp(xc, BAD_CAST "1") && xmlStrcmp(xc, BAD_CAST "1.25")) { //1.25, backward stuff
+		fprintf(stderr, "error in config file: expected a \"1\" versioned file, found \"%s\"\n", xc);
 		exit(LSYNCD_BADCONFIGFILE);
 	}
 
diff --git a/lsyncd.conf.xml b/lsyncd.conf.xml
index 3241950..b9bd46f 100644
--- a/lsyncd.conf.xml
+++ b/lsyncd.conf.xml
@@ -1,4 +1,4 @@
-<lsyncd version="1.25">
+<lsyncd version="1">
 
 <!-- 
 This is a default config file template for lsyncd.