[SCM] GNU Mailutils branch, master, updated. release-3.0-50-g985be0a

[Sergey Poznyakoff]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Mailutils".

http://git.savannah.gnu.org/cgit/mailutils.git/commit/?id=985be0a2ebef0671c1eee2f160c8c366e806316e

The branch, master has been updated
       via  985be0a2ebef0671c1eee2f160c8c366e806316e (commit)
      from  eef0d16dc96ab8570c8da92283c81408c63edcee (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 985be0a2ebef0671c1eee2f160c8c366e806316e
Author: Sergey Poznyakoff <address@hidden>
Date:   Tue Dec 13 20:08:11 2016 +0200

    libmu_sieve: minor fix
    
    * libmu_sieve/util.c (mu_sieve_value_get): Treat actual string
    and expected string list as equivalent types.

-----------------------------------------------------------------------

Summary of changes:
 gint               |    2 +-
 libmu_sieve/util.c |    6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/gint b/gint
index fd86bf7..42f4712 160000
--- a/gint
+++ b/gint
@@ -1 +1 @@
-Subproject commit fd86bf7d44b0c970771830692ae7491447ebe8b1
+Subproject commit 42f4712085b40173eaea58e14b1a579291a6fe3a
diff --git a/libmu_sieve/util.c b/libmu_sieve/util.c
index 9a0b7db..ae46d52 100644
--- a/libmu_sieve/util.c
+++ b/libmu_sieve/util.c
@@ -99,7 +99,11 @@ void
 mu_sieve_value_get (mu_sieve_machine_t mach, mu_sieve_value_t *val,
                    mu_sieve_data_type type, void *ret)
 {
-  if (val->type != type)
+  if (val->type == SVT_STRING && type == SVT_STRING_LIST)
+    /* compatible types; note that the operation is not commutative: it's
+       OK if actual type is single string and string list is expected, but
+       not vice-versa. */;
+  else if (val->type != type)
     {
       if (val->tag)
        mu_sieve_error (mach,


hooks/post-receive
-- 
GNU Mailutils