Merge whimsy.udel.edu:/backroom/ntp-stable

into whimsy.udel.edu:/backroom/ntp-dev

bk: 3dd6c75bVLPHP3armRBgZgb4YJHLCg

diff --cc ntpd/ntp_control.c
index 1c8b039079d8979de3a780715f6a254fe3382447,9f061926a7bada11a62eb672d6409cd7a68c132d..ccbda847e489aa82a0c4153484c48fd30b86883d
--- 1/ntpd/ntp_control.c
--- 2/ntpd/ntp_control.c
+++ b/ntpd/ntp_control.c
@@@ -2728,12 -2727,13 +2728,13 @@@ report_event
                /*
                 * Dump it all. Later, maybe less.
                 */
-               for (i = 1; i <= CP_MAXCODE; i++)
+               for (i = 1; i <= CP_MAXCODE; i++) {
 -#ifdef PUBKEY
 +#ifdef OPENSSL
                        if (i > CP_VARLIST)
                                continue;
 -#endif /* PUBKEY */
 +#endif /* OPENSSL */
                        ctl_putpeer(i, peer);
+               }
  #ifdef REFCLOCK
                /*
                 * for clock exception events: add clock variables to