Merge pull request #2335 from pqarmitage/updates

doc update and stop setting MAGIC_PRESERVE_ATIME
acassen · Aug 23, 2023 · b6d1db2 · b6d1db2
2 parents 4c5f005 + b2b6539
commit b6d1db2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/doc/man/man5/keepalived.conf.5.in b/doc/man/man5/keepalived.conf.5.in
@@ -1794,11 +1794,13 @@ The syntax for vrrp_instance is :
     #  of `keepalived -v` for OLD_CHKSUM_COMPAT.]
     \fBold_unicast_checksum \fR[never]
 
-    # Some manufacturers (e.g. Cisco) interpret RFC5798 5.2.8 as applying
-    #  only to IPv6, since the pseudo-header in RFC2460 is specified only
-    #  for IPv6. Keepalived by default uses a pseudo-header for VRRPv3 IPv4
-    #  as well. Setting this option turns off including the pseudo-header
-    #  in the checksum calculation for VRRPv3 IPv4.
+    # Some manufacturers (e.g. Cisco and Juniper) interpret RFC5798 5.2.8
+    #  as applying only to IPv6, since the pseudo-header in RFC2460 is
+    #  specified only for IPv6, although most open source implementations,
+    #  including tcpdump/wireshark, include the pseudo-header for IPv4.
+    #  Keepalived by default uses a pseudo-header for VRRPv3 IPv4 as well.
+    #  Setting this option turns off including the pseudo-header in the
+    #  checksum calculation for VRRPv3 IPv4.
     \fBv3_checksum_as_v2\fR [<BOOL>]
 
     # interface specific settings, same as global parameters.

diff --git a/lib/keepalived_magic.h b/lib/keepalived_magic.h
@@ -31,7 +31,7 @@
 static inline magic_t
 ka_magic_open(void)
 {
-	magic_t magic = magic_open(MAGIC_PRESERVE_ATIME | MAGIC_ERROR | MAGIC_NO_CHECK_CDF | MAGIC_NO_CHECK_COMPRESS);
+	magic_t magic = magic_open(MAGIC_ERROR | MAGIC_NO_CHECK_CDF | MAGIC_NO_CHECK_COMPRESS);
 	if (!magic)
 		log_message(LOG_INFO, "Unable to open magic");
 	else if (magic_load(magic, NULL)) {