3fcc829ef4
fix gid confusion when starting ntpd with -u groupname CAN-2005-2496
45 lines
1014 B
Plaintext
45 lines
1014 B
Plaintext
$OpenBSD: patch-ntpdate_ntpdate_c,v 1.2 2006/01/24 19:58:58 sturm Exp $
|
|
--- ntpdate/ntpdate.c.orig Thu Mar 3 12:01:15 2005
|
|
+++ ntpdate/ntpdate.c Tue Jan 24 20:52:44 2006
|
|
@@ -10,17 +10,6 @@
|
|
#include <netinfo/ni.h>
|
|
#endif
|
|
|
|
-#include "ntp_machine.h"
|
|
-#include "ntp_fp.h"
|
|
-#include "ntp.h"
|
|
-#include "ntp_io.h"
|
|
-#include "ntp_unixtime.h"
|
|
-#include "ntpdate.h"
|
|
-#include "ntp_string.h"
|
|
-#include "ntp_syslog.h"
|
|
-#include "ntp_select.h"
|
|
-#include "ntp_stdlib.h"
|
|
-
|
|
#ifdef HAVE_UNISTD_H
|
|
# include <unistd.h>
|
|
#endif
|
|
@@ -45,8 +34,22 @@
|
|
#ifdef HAVE_SYS_RESOURCE_H
|
|
# include <sys/resource.h>
|
|
#endif /* HAVE_SYS_RESOURCE_H */
|
|
+#ifdef HAVE_NETINET_IN_H
|
|
+# include <netinet/in.h>
|
|
+#endif /* HAVE_NETINET_IN_H */
|
|
|
|
#include <arpa/inet.h>
|
|
+
|
|
+#include "ntp_machine.h"
|
|
+#include "ntp_fp.h"
|
|
+#include "ntp.h"
|
|
+#include "ntp_io.h"
|
|
+#include "ntp_unixtime.h"
|
|
+#include "ntpdate.h"
|
|
+#include "ntp_string.h"
|
|
+#include "ntp_syslog.h"
|
|
+#include "ntp_select.h"
|
|
+#include "ntp_stdlib.h"
|
|
|
|
#ifdef __QNXNTO__
|
|
# include "adjtime.h"
|