From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Sat, 19 Jul 2014 16:42:05 +0000 (-0700)
Subject: Update to the recent versions.
X-Git-Tag: 0.7.0~203
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ffedc6bef9bd5b23843604a8bd16a684c9c7339a;p=thirdparty%2Frspamd.git

Update to the recent versions.
---

diff --git a/contrib/uthash/utstring.h b/contrib/uthash/utstring.h
index 4ef7b5690d..f11f34b77e 100644
--- a/contrib/uthash/utstring.h
+++ b/contrib/uthash/utstring.h
@@ -44,6 +44,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 typedef struct {
     char *d;
+    void **pd;
     size_t n; /* allocd size */
     size_t i; /* index of first unused byte */
 } UT_string;
@@ -54,6 +55,7 @@ do {                                                       \
      (s)->d = (char*)realloc((s)->d, (s)->n + amt);        \
      if ((s)->d == NULL) oom();                            \
      (s)->n += amt;                                        \
+     if ((s)->pd) *((s)->pd) = (s)->d;                     \
   }                                                        \
 } while(0)
 
@@ -78,7 +80,7 @@ do {                                                       \
 
 #define utstring_new(s)                                    \
 do {                                                       \
-   s = (UT_string*)calloc(sizeof(UT_string),1);            \
+   s = (UT_string*)calloc(1, sizeof(UT_string));          \
    if (!s) oom();                                          \
    utstring_init(s);                                       \
 } while(0)
diff --git a/src/rdns b/src/rdns
index a7f457e254..44e4c9ba12 160000
--- a/src/rdns
+++ b/src/rdns
@@ -1 +1 @@
-Subproject commit a7f457e2548cfb8f5c6199aa0ed2e9486171710f
+Subproject commit 44e4c9ba12d2504379443e7f7a7f94ad088a28e3
diff --git a/src/ucl b/src/ucl
index d84b73bb28..e3e15c4802 160000
--- a/src/ucl
+++ b/src/ucl
@@ -1 +1 @@
-Subproject commit d84b73bb28b0bd762c3a5cd3183e6ba5e86b4a19
+Subproject commit e3e15c4802bb8bf764ff4936e345f28676dad120