Merge branch 'master' into next

* master:
  * Use BF_LONG for consistency

src/crypto/bf_util.c

@@ -32,8 +32,8 @@ static const char eggdrop_blowfish_base64_index[256] = {
 
 union bf_data {
   struct {
-    u_int32_t left;
-    u_int32_t right;
+    BF_LONG left;
+    BF_LONG right;
   } lr;
   BF_LONG bf_long;
 };