add header guard when generating bind.keys.h

(cherry picked from commit bfbe6925dfa5997a51086ecf7004c726b8331954)
(cherry picked from commit f7755696a59c6dd1f1718419f5bbe3d632693f75)

diff --git a/bin/named/bind.keys.h b/bin/named/bind.keys.h
index 0c4b4771c04cafbccca9f8b7cea3079643630ed8..746dfa289dcce1035830a160e2d2ab0c0979d979 100644 (file)
--- a/bin/named/bind.keys.h
+++ b/bin/named/bind.keys.h
@@ -1,3 +1,5 @@
+#ifndef BIND_KEYS_H
+#define BIND_KEYS_H 1
 #define TRUSTED_KEYS "\
 # The bind.keys file is used to override the built-in DNSSEC trust anchors\n\
 # which are included as part of BIND 9.  The only trust anchors it contains\n\
@@ -103,3 +105,4 @@ managed-keys {\n\
                 R1AkUTV74bU=\";\n\
 };\n\
 "
+#endif /* BIND_KEYS_H */

diff --git a/bin/named/bindkeys.pl b/bin/named/bindkeys.pl
index 1a02938a55d0f264b3cadc04c39f03b25aba9702..baafd5a6640130d2721766f6c6a5fdf5e0d89cf0 100755 (executable)
--- a/bin/named/bindkeys.pl
+++ b/bin/named/bindkeys.pl
@@ -34,6 +34,9 @@ $lines =~ s/managed-keys/trusted-keys/;
 $lines =~ s/\s+initial-key//g;
 my $tkey = '#define TRUSTED_KEYS "\\' . "\n" . $lines . "\"\n";
 
+print "#ifndef BIND_KEYS_H\n";
+print "#define BIND_KEYS_H 1\n";
 print $tkey;
 print "\n";
 print $mkey;
+print "#endif /* BIND_KEYS_H */\n";