Updated Solaris-specific patch from Brian Utterback

bk: 644de04eJLvVYSnd_j1FOSQyBmHcKw

diff --git a/ntpd/ntp_proto.c b/ntpd/ntp_proto.c
index 7de94c421cf833a4adb446a44d9f83d7a0fbe6de..db121f3366778cbc48adfa49675a1037be66be3e 100644 (file)
--- a/ntpd/ntp_proto.c
+++ b/ntpd/ntp_proto.c
@@ -2898,15 +2898,16 @@ clock_update(
                 */
                if ((fmri = getenv("SMF_FMRI")) != NULL) {
                        if (smf_maintain_instance(fmri, 0) < 0) {
-                               printf("smf_maintain_instance: %s\n",
-                                   scf_strerror(scf_error()));
+                               msyslog(LOG_ERR, "smf_maintain_instance: %s",
+                                                scf_strerror(scf_error()));
                                exit(1);
                        }
                        /*
                         * Sleep until SMF kills us.
                         */
                        msyslog(LOG_ERR, "%s placed into maintenance. "
-                               "Set system clock by hand before clearing.");
+                               "Set system clock by hand before clearing.",
+                               fmri);
                        for (;;)
                                pause();
                }