diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1998-09-17 01:25:17 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1998-09-17 01:25:17 +0000 |
| commit | dbbfc0e5c8258daa107270492efa0d4ff0488e9a (patch) | |
| tree | 306e6d84e9fe01e469abedf53c89a70f62caebf0 /distrib | |
| parent | 6e8b61756170e9d220f041935aebab6f33d8808c (diff) | |
do not permit duplicate hostnames in /etc/hosts
encode /etc/hostname.* files with an IP address, not a hostname
Diffstat (limited to 'distrib')
| -rw-r--r-- | distrib/miniroot/install.sub | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index eb20965482c..2ab61ff5ecb 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,5 +1,5 @@ #!/bin/sh -# $OpenBSD: install.sub,v 1.85 1998/09/17 00:50:01 deraadt Exp $ +# $OpenBSD: install.sub,v 1.86 1998/09/17 01:25:16 deraadt Exp $ # $NetBSD: install.sub,v 1.5.2.8 1996/09/02 23:25:02 pk Exp $ # # Copyright (c) 1997,1998 Todd Miller, Theo de Raadt @@ -438,13 +438,13 @@ addhostent() { # $2 - symbolic name # Create an entry in the hosts table. If no host table - # exists, create one. If the IP address already exists, + # exists, create one. If the symbolic name already exists, # replace it's entry. if [ ! -f /tmp/hosts ]; then echo "127.0.0.1 localhost" > /tmp/hosts fi - sed "/^$1 /d" < /tmp/hosts > /tmp/hosts.new + sed "/ $2 $2.$FQDN\$/d" < /tmp/hosts > /tmp/hosts.new mv /tmp/hosts.new /tmp/hosts echo "$1 $2 $2.$FQDN" >> /tmp/hosts @@ -462,7 +462,7 @@ addifconfig() { echo "dhcp" > /tmp/hostname.$1 addhostent 127.0.0.1 $2 else - echo "inet $2 $4 NONE $5" > /tmp/hostname.$1 + echo "inet $3 $4 NONE $5" > /tmp/hostname.$1 addhostent $3 $2 fi } |