Merge master

diff --cc etc/cnid_dbd/cnid_metad.c
Simple merge

diff --cc etc/cnid_dbd/main.c
Simple merge

diff --cc libatalk/unicode/util_unistr.c
index 3c9a194b5dd6169813d68c40e9b94577fe1a13d2,decd8c0a5019980274e81404200f2de0573c0bb9..e5ea4ba0fcea2cd8def574b835432305a0024c50
--- 1/libatalk/unicode/util_unistr.c
--- 2/libatalk/unicode/util_unistr.c
+++ b/libatalk/unicode/util_unistr.c
@@@ -192,7 -192,7 +191,7 @@@ ucs2_t *strcasechr_sp(const ucs2_t *s, 
  {
        if (*s == 0) return NULL;
        while (s[1] != 0) {
-               if (toupper_sp(c_sp) == toupper_sp((uint32_t)*s << 16 | (uint32_t)s[1])) return (ucs2_t *)s;
 -              if (tolower_sp(c_sp) == tolower_sp((u_int32_t)*s << 16 | (u_int32_t)s[1])) return (ucs2_t *)s;
++              if (tolower_sp(c_sp) == tolower_sp((uint32_t)*s << 16 | (uint32_t)s[1])) return (ucs2_t *)s;
                s++;
        }