Code cleanup: requested_key -> request_key

bk: 49f0446dbNpIlkKtrhrppS21PCtjvQ

diff --git a/ChangeLog b/ChangeLog
index 756ba58b09feccc4b731fc00c088f758e2289a16..dea51159aa554f0e4702b506d45c83fb4804af4a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* Code cleanup: requested_key -> request_key.
 * [Bug 833] ignore whitespace at end of remote configuration lines
 * [Bug 1033] ntpdc/ntpq crash prompting for keyid on Windows
 * [Bug 1154] mDNS registration should be done later, repeatedly and only

diff --git a/include/ntp_config.h b/include/ntp_config.h
index 6d81e190a858abcf08a2cee6c0c86d779b4cc21e..c0c1d79d54ca037dbef537021e6e3b686f786b9f 100644 (file)
--- a/include/ntp_config.h
+++ b/include/ntp_config.h
@@ -89,7 +89,7 @@ struct auth_node {
     queue *crypto_cmd_list;
     char *keys;
     char *keysdir;
-    int requested_key;
+    int request_key;
     int revoke;
     queue *trusted_key_list;
     char *ntp_signd_socket;

diff --git a/ntpd/ntp_config.c b/ntpd/ntp_config.c
index 33fd325bd644933f162b28aa3b819fe710fa66c1..0a01937e2a7e094d9318fe5336ed2cb911c5b106 100644 (file)
--- a/ntpd/ntp_config.c
+++ b/ntpd/ntp_config.c
@@ -281,7 +281,7 @@ init_auth_node(void)
 #else
        my_config.auth.ntp_signd_socket = NULL;
 #endif
-       my_config.auth.requested_key = 0;
+       my_config.auth.request_key = 0;
        my_config.auth.revoke = 0;
        my_config.auth.trusted_key_list = NULL;
 }
@@ -1036,13 +1036,13 @@ config_auth(void)
                ctl_auth_keyid = my_config.auth.control_key;
 
        /* Requested Key Command */
-       if (my_config.auth.requested_key) {
+       if (my_config.auth.request_key) {
 #ifdef DEBUG
                if (debug > 3)
                        printf("set info_auth_key to %08lx\n",
-                              (long unsigned int) my_config.auth.requested_key);
+                              (long unsigned int) my_config.auth.request_key);
 #endif
-               info_auth_keyid = (keyid_t) my_config.auth.requested_key;
+               info_auth_keyid = (keyid_t) my_config.auth.request_key;
        }
 
        /* Trusted Key Command */

diff --git a/ntpd/ntp_parser.c b/ntpd/ntp_parser.c
index a1b3d8a85bbe57b1867aedc4cb2ccc35a96ccd49..b66519d1cdf4f7d9c44785ad97a9467ae57013da 100644 (file)
--- a/ntpd/ntp_parser.c
+++ b/ntpd/ntp_parser.c
@@ -425,7 +425,7 @@
 
 /* Enabling traces.  */
 #ifndef YYDEBUG
-# define YYDEBUG 0
+# define YYDEBUG 1
 #endif
 
 /* Enabling verbose error messages.  */
@@ -459,7 +459,7 @@ typedef union YYSTYPE
     script_info *Sim_script;
 }
 /* Line 193 of yacc.c.  */
-#line 463 "ntp_parser.c"
+#line 463 "../../ntpd/ntp_parser.c"
        YYSTYPE;
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
@@ -472,7 +472,7 @@ typedef union YYSTYPE
 
 
 /* Line 216 of yacc.c.  */
-#line 476 "ntp_parser.c"
+#line 476 "../../ntpd/ntp_parser.c"
 
 #ifdef short
 # undef short
@@ -2327,7 +2327,7 @@ yyreduce:
 
   case 55:
 #line 421 "ntp_parser.y"
-    { my_config.auth.requested_key = (yyvsp[(2) - (2)].Integer); }
+    { my_config.auth.request_key = (yyvsp[(2) - (2)].Integer); }
     break;
 
   case 56:
@@ -3230,7 +3230,7 @@ yyreduce:
 
 
 /* Line 1267 of yacc.c.  */
-#line 3234 "ntp_parser.c"
+#line 3234 "../../ntpd/ntp_parser.c"
       default: break;
     }
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);

diff --git a/ntpd/ntp_parser.h b/ntpd/ntp_parser.h
index d747a9f2852e07b48b70759d3ee8393da578e6e2..bb73c4589c17c2ac2eb6b34638c240d9b41d9a11 100644 (file)
--- a/ntpd/ntp_parser.h
+++ b/ntpd/ntp_parser.h
@@ -356,7 +356,7 @@
 
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
-#line 49 "ntp_parser.y"
+#line 51 "ntp_parser.y"
 {
     char   *String;
     double  Double;
@@ -372,7 +372,7 @@ typedef union YYSTYPE
     script_info *Sim_script;
 }
 /* Line 1529 of yacc.c.  */
-#line 376 "ntp_parser.h"
+#line 376 "../../ntpd/ntp_parser.h"
        YYSTYPE;
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1

diff --git a/ntpd/ntp_parser.y b/ntpd/ntp_parser.y
index ebbb977725a43197668858ba8b6fb7766ccf13c6..ceb0c7dd7b1e865b02d0d8fee02514901fc83be3 100644 (file)
--- a/ntpd/ntp_parser.y
+++ b/ntpd/ntp_parser.y
@@ -418,7 +418,7 @@ authentication_command
        |       T_Keysdir T_String
                        { my_config.auth.keysdir = $2; }
        |       T_Requestkey T_Integer
-                       { my_config.auth.requested_key = $2; }
+                       { my_config.auth.request_key = $2; }
        |       T_Trustedkey integer_list
                        { my_config.auth.trusted_key_list = $2; }
        |       T_NtpSignDsocket T_String