diff options
-rw-r--r-- | usr.sbin/ppp/alias_cmd.c | 8 | ||||
-rw-r--r-- | usr.sbin/ppp/bundle.c | 12 | ||||
-rw-r--r-- | usr.sbin/ppp/command.c | 14 | ||||
-rw-r--r-- | usr.sbin/ppp/ip.c | 12 | ||||
-rw-r--r-- | usr.sbin/ppp/ipcp.c | 12 | ||||
-rw-r--r-- | usr.sbin/ppp/main.c | 12 | ||||
-rw-r--r-- | usr.sbin/ppp/nat_cmd.c | 8 |
7 files changed, 53 insertions, 25 deletions
diff --git a/usr.sbin/ppp/alias_cmd.c b/usr.sbin/ppp/alias_cmd.c index 1ca4ab4..efe0d67 100644 --- a/usr.sbin/ppp/alias_cmd.c +++ b/usr.sbin/ppp/alias_cmd.c @@ -2,7 +2,7 @@ * The code in this file was written by Eivind Eklund <perhaps@yes.no>, * who places it in the public domain without restriction. * - * $Id: alias_cmd.c,v 1.16 1998/06/27 14:17:59 brian Exp $ + * $Id: alias_cmd.c,v 1.17 1998/08/26 17:39:36 brian Exp $ */ #include <sys/types.h> @@ -14,12 +14,16 @@ #include <netinet/ip.h> #include <sys/un.h> -#include <alias.h> #include <stdio.h> #include <stdlib.h> #include <string.h> #include <termios.h> +#ifdef __OpenBSD__ +#include "alias.h" +#else +#include <alias.h> +#endif #include "defs.h" #include "command.h" #include "log.h" diff --git a/usr.sbin/ppp/bundle.c b/usr.sbin/ppp/bundle.c index 2949386..569d893 100644 --- a/usr.sbin/ppp/bundle.c +++ b/usr.sbin/ppp/bundle.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: bundle.c,v 1.33 1998/08/25 17:48:42 brian Exp $ + * $Id: bundle.c,v 1.34 1998/08/26 17:39:36 brian Exp $ */ #include <sys/param.h> @@ -37,9 +37,6 @@ #include <netinet/ip.h> #include <sys/un.h> -#ifndef NOALIAS -#include <alias.h> -#endif #include <errno.h> #include <fcntl.h> #include <paths.h> @@ -52,6 +49,13 @@ #include <termios.h> #include <unistd.h> +#ifndef NOALIAS +#ifdef __OpenBSD__ +#include "alias.h" +#else +#include <alias.h> +#endif +#endif #include "defs.h" #include "command.h" #include "mbuf.h" diff --git a/usr.sbin/ppp/command.c b/usr.sbin/ppp/command.c index fc9e26e..1b74fc5 100644 --- a/usr.sbin/ppp/command.c +++ b/usr.sbin/ppp/command.c @@ -17,7 +17,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: command.c,v 1.164 1998/08/29 23:02:39 brian Exp $ + * $Id: command.c,v 1.165 1998/08/29 23:02:42 brian Exp $ * */ #include <sys/types.h> @@ -30,9 +30,6 @@ #include <netdb.h> #include <sys/un.h> -#ifndef NOALIAS -#include <alias.h> -#endif #include <ctype.h> #include <errno.h> #include <fcntl.h> @@ -44,6 +41,13 @@ #include <termios.h> #include <unistd.h> +#ifndef NOALIAS +#ifdef __OpenBSD__ +#include "alias.h" +#else +#include <alias.h> +#endif +#endif #include "defs.h" #include "command.h" #include "mbuf.h" @@ -127,7 +131,7 @@ #define NEG_DNS 50 const char Version[] = "2.0"; -const char VersionDate[] = "$Date: 1998/08/29 23:02:39 $"; +const char VersionDate[] = "$Date: 1998/08/29 23:02:42 $"; static int ShowCommand(struct cmdargs const *); static int TerminalCommand(struct cmdargs const *); diff --git a/usr.sbin/ppp/ip.c b/usr.sbin/ppp/ip.c index f837c9b..a7ffb30 100644 --- a/usr.sbin/ppp/ip.c +++ b/usr.sbin/ppp/ip.c @@ -17,7 +17,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: ip.c,v 1.51 1998/08/25 17:48:42 brian Exp $ + * $Id: ip.c,v 1.52 1998/08/26 17:39:37 brian Exp $ * * TODO: * o Return ICMP message for filterd packet @@ -36,15 +36,19 @@ #include <arpa/inet.h> #include <sys/un.h> -#ifndef NOALIAS -#include <alias.h> -#endif #include <errno.h> #include <stdio.h> #include <stdlib.h> #include <string.h> #include <unistd.h> +#ifndef NOALIAS +#ifdef __OpenBSD__ +#include "alias.h" +#else +#include <alias.h> +#endif +#endif #include "mbuf.h" #include "log.h" #include "defs.h" diff --git a/usr.sbin/ppp/ipcp.c b/usr.sbin/ppp/ipcp.c index d580edd..40e1dfa 100644 --- a/usr.sbin/ppp/ipcp.c +++ b/usr.sbin/ppp/ipcp.c @@ -17,7 +17,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: ipcp.c,v 1.64 1998/08/26 17:39:37 brian Exp $ + * $Id: ipcp.c,v 1.65 1998/09/04 18:25:59 brian Exp $ * * TODO: * o More RFC1772 backward compatibility @@ -33,9 +33,6 @@ #include <sys/sockio.h> #include <sys/un.h> -#ifndef NOALIAS -#include <alias.h> -#endif #include <fcntl.h> #include <resolv.h> #include <stdlib.h> @@ -44,6 +41,13 @@ #include <termios.h> #include <unistd.h> +#ifndef NOALIAS +#ifdef __OpenBSD__ +#include "alias.h" +#else +#include <alias.h> +#endif +#endif #include "ua.h" #include "defs.h" #include "command.h" diff --git a/usr.sbin/ppp/main.c b/usr.sbin/ppp/main.c index e84192d..e092574 100644 --- a/usr.sbin/ppp/main.c +++ b/usr.sbin/ppp/main.c @@ -17,7 +17,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: main.c,v 1.141 1998/08/07 18:42:49 brian Exp $ + * $Id: main.c,v 1.142 1998/08/09 09:13:54 brian Exp $ * * TODO: */ @@ -28,9 +28,6 @@ #include <netinet/ip.h> #include <sys/un.h> -#ifndef NOALIAS -#include <alias.h> -#endif #include <errno.h> #include <fcntl.h> #include <paths.h> @@ -41,6 +38,13 @@ #include <termios.h> #include <unistd.h> +#ifndef NOALIAS +#ifdef __OpenBSD__ +#include "alias.h" +#else +#include <alias.h> +#endif +#endif #include "probe.h" #include "mbuf.h" #include "log.h" diff --git a/usr.sbin/ppp/nat_cmd.c b/usr.sbin/ppp/nat_cmd.c index 1ca4ab4..efe0d67 100644 --- a/usr.sbin/ppp/nat_cmd.c +++ b/usr.sbin/ppp/nat_cmd.c @@ -2,7 +2,7 @@ * The code in this file was written by Eivind Eklund <perhaps@yes.no>, * who places it in the public domain without restriction. * - * $Id: alias_cmd.c,v 1.16 1998/06/27 14:17:59 brian Exp $ + * $Id: alias_cmd.c,v 1.17 1998/08/26 17:39:36 brian Exp $ */ #include <sys/types.h> @@ -14,12 +14,16 @@ #include <netinet/ip.h> #include <sys/un.h> -#include <alias.h> #include <stdio.h> #include <stdlib.h> #include <string.h> #include <termios.h> +#ifdef __OpenBSD__ +#include "alias.h" +#else +#include <alias.h> +#endif #include "defs.h" #include "command.h" #include "log.h" |