Browse Source

update copyright block, patches

I removed all of the code in fake-sensors, I don't think Henning wants
all the credit for an empty file.
OPENBSD_5_7
Brent Cook 10 years ago
committed by Brent Cook
parent
commit
8e4c175c42
3 changed files with 10 additions and 8 deletions
  1. +4
    -2
      compat/fake-sensors.c
  2. +2
    -2
      include/sys/types.h
  3. +4
    -4
      patches/0006-EAI_NODATA-does-not-exist-everywhere.patch

+ 4
- 2
compat/fake-sensors.c View File

@ -1,7 +1,6 @@
/* $OpenBSD: sensors.c,v 1.46 2012/09/20 12:43:16 patrick Exp $ */
/* /*
* Copyright (c) 2006 Henning Brauer <henning@openbsd.org> * Copyright (c) 2006 Henning Brauer <henning@openbsd.org>
* Copyright (c) 2014 Brent Cook <bcook@openbsd.org>
* *
* Permission to use, copy, modify, and distribute this software for any * Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above * purpose with or without fee is hereby granted, provided that the above
@ -18,6 +17,9 @@
#include "ntpd.h" #include "ntpd.h"
/*
* These stubs indicate that no sensors exist on systems without a sensor framework.
*/
void void
sensor_init(void) sensor_init(void)
{ {


+ 2
- 2
include/sys/types.h View File

@ -5,8 +5,8 @@
#include_next <sys/types.h> #include_next <sys/types.h>
#ifndef LIBCRYPTOCOMPAT_SYS_TYPES_H
#define LIBCRYPTOCOMPAT_SYS_TYPES_H
#ifndef LIBCOMPAT_SYS_TYPES_H
#define LIBCOMPAT_SYS_TYPES_H
#include <stdint.h> #include <stdint.h>


+ 4
- 4
patches/0006-EAI_NODATA-does-not-exist-everywhere.patch View File

@ -1,7 +1,7 @@
From 447c73c470e1157036d8cfc3d3328a5ba48655f3 Mon Sep 17 00:00:00 2001
From ec73e05867d8e80b1f5d056f35eea8f9011b8c3c Mon Sep 17 00:00:00 2001
From: Brent Cook <busterb@gmail.com> From: Brent Cook <busterb@gmail.com>
Date: Tue, 30 Dec 2014 09:04:08 -0600 Date: Tue, 30 Dec 2014 09:04:08 -0600
Subject: [PATCH 06/12] EAI_NODATA does not exist everywhere
Subject: [PATCH 06/14] EAI_NODATA does not exist everywhere
FreeBSD says it is deprecated and should be removed. FreeBSD says it is deprecated and should be removed.
--- ---
@ -9,7 +9,7 @@ FreeBSD says it is deprecated and should be removed.
1 file changed, 8 insertions(+), 2 deletions(-) 1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/usr.sbin/ntpd/config.c b/src/usr.sbin/ntpd/config.c diff --git a/src/usr.sbin/ntpd/config.c b/src/usr.sbin/ntpd/config.c
index b651c62..9fa4c17 100644
index b651c62..d571dd7 100644
--- a/src/usr.sbin/ntpd/config.c --- a/src/usr.sbin/ntpd/config.c
+++ b/src/usr.sbin/ntpd/config.c +++ b/src/usr.sbin/ntpd/config.c
@@ -128,8 +128,14 @@ host_dns(const char *s, struct ntp_addr **hn) @@ -128,8 +128,14 @@ host_dns(const char *s, struct ntp_addr **hn)
@ -20,10 +20,10 @@ index b651c62..9fa4c17 100644
- return (0); - return (0);
+ switch (error) { + switch (error) {
+ case EAI_AGAIN: + case EAI_AGAIN:
+ case EAI_NONAME:
+#ifdef EAI_NODATA +#ifdef EAI_NODATA
+ case EAI_NODATA: + case EAI_NODATA:
+#endif +#endif
+ case EAI_NONAME:
+ return (0); + return (0);
+ } + }
if (error) { if (error) {


Loading…
Cancel
Save