Major rework

11 files changed, 322 insertions, 266 deletions

diff --git a/sources/target_skeleton/etc/group b/sources/target_skeleton/etc/group
index becc56cb4..a21ef0f76 100644
--- a/sources/target_skeleton/etc/group
+++ b/sources/target_skeleton/etc/group
@@ -1,18 +1,10 @@
 root:x:0:
-wheel:x:10:
-bin:x:1:bin,daemon
-daemon:x:2:bin,daemon
-sys:x:3:bin,adm
-adm:x:4:adm,daemon
+daemon:x:1:
+bin:x:2:
+sys:x:3:
+adm:x:4:
 tty:x:5:
 disk:x:6:
-lp:x:7:daemon,lp
-mem:x:8:
-kmem:x:9:
-operator:x:11:
-uucp:x:14:uucp
-dip:x:40:
-utmp:x:45:
-www:x:63:
-nobody:x:65534:
-users:x:100:
+utmp:x:43:
+staff:x:50:
+default:x:1000:
diff --git a/sources/target_skeleton/etc/init.d/S05ramdisk1 b/sources/target_skeleton/etc/init.d/S05ramdisk1
deleted file mode 100755
index b8a6d70ad..000000000
--- a/sources/target_skeleton/etc/init.d/S05ramdisk1
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/sh
-
-# Build a ramdisk to overlay on /dev so we can scribble on it
-# all we want without needing rw access to the underlying filesystem
-
-SIZE=140
-INODES=1000
-
-echo -n "Building device ramdisk: "
-
-/bin/umount /dev/ram1 >/dev/null 2>&1
-
-/bin/dd if=/dev/zero of=/dev/ram1 bs=1k count=$SIZE >/dev/null 2>&1
-if [ $? != 0 ] ; then
-	echo "failed."
-	exit 1;
-fi
-
-/sbin/mkfs.minix -n30 -i$INODES /dev/ram1 $SIZE >/dev/null 2>&1
-if [ $? != 0 ] ; then
-	echo "failed."
-	exit 1;
-fi
-
-/bin/mount /dev/ram1 /mnt -t minix -o rw >/dev/null 2>&1
-if [ $? != 0 ] ; then
-	echo "failed."
-	exit 1;
-fi
-
-/bin/cp -a /dev/* /mnt >/dev/null 2>&1
-if [ $? != 0 ] ; then
-	echo "failed."
-	exit 1;
-fi
-
-/bin/umount /mnt >/dev/null 2>&1
-if [ $? != 0 ] ; then
-	echo "failed."
-	exit 1;
-fi
-
-/bin/mount /dev/ram1 /dev -t minix -o rw >/dev/null 2>&1
-if [ $? != 0 ] ; then
-	echo "failed."
-	exit 1;
-else
-	echo "done." 
-fi
-
-exit 0
diff --git a/sources/target_skeleton/etc/init.d/S20syslogd b/sources/target_skeleton/etc/init.d/S20syslogd
deleted file mode 100755
index a88a6ff07..000000000
--- a/sources/target_skeleton/etc/init.d/S20syslogd
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-echo -n "Starting system log daemon: "
-# start syslogging
-/sbin/syslogd -m 0
-echo "ok"
-
-
diff --git a/sources/target_skeleton/etc/init.d/S50hostname b/sources/target_skeleton/etc/init.d/S50hostname
deleted file mode 100755
index 7437bc2de..000000000
--- a/sources/target_skeleton/etc/init.d/S50hostname
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-hostname tester.dev.null
diff --git a/sources/target_skeleton/etc/init.d/S50networking b/sources/target_skeleton/etc/init.d/S50networking
new file mode 100755
index 000000000..7104f3321
--- /dev/null
+++ b/sources/target_skeleton/etc/init.d/S50networking
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+# start lo all the time
+ifconfig lo 127.0.0.1 up
+route add -net 127.0.0.0 netmask 255.0.0.0 lo
+
+hostname dev.null
diff --git a/sources/target_skeleton/etc/inittab b/sources/target_skeleton/etc/inittab
index f159816da..2e91bd1e6 100644
--- a/sources/target_skeleton/etc/inittab
+++ b/sources/target_skeleton/etc/inittab
@@ -16,15 +16,17 @@
 # main rc script
 ::sysinit:/etc/init.d/rcS
 
-# main setup program
-::respawn:-/bin/sh
+# Set up a couple of getty's
+tty1::respawn:/sbin/getty 38400 tty1
+tty2::respawn:/sbin/getty 38400 tty2
 
-# convenience shell
-tty2::askfirst:-/bin/sh
+# Put a getty on the serial port
+#ttyS0::respawn:/sbin/getty -L ttyS0 115200 vt100
 
-# set up stuff for logging
-null::sysinit:/bin/dmesg > /dev/tty4
+# Logging junk
+tty2::once:/bin/touch /var/log/messages
 tty3::respawn:/usr/bin/tail -f /var/log/messages
+tty4::once:/bin/dmesg
 tty4::respawn:/usr/bin/tail -f /proc/kmsg
 
 # Stuff to do for the 3-finger salute
diff --git a/sources/target_skeleton/etc/passwd b/sources/target_skeleton/etc/passwd
index 397ed3521..e7e879813 100644
--- a/sources/target_skeleton/etc/passwd
+++ b/sources/target_skeleton/etc/passwd
@@ -1,11 +1,12 @@
-root:x:0:0:root:/root:/bin/ash
-bin:x:1:1:bin:/bin:/bin/sh
-daemon:x:2:2:daemon:/usr/sbin:/bin/sh
-adm:x:3:4:adm:/adm:/bin/sh
-lp:x:4:7:lp:/var/spool/lpd:/bin/sh
-sync:x:5:0:sync:/bin:/bin/sync
-shutdown:x:6:11:shutdown:/sbin:/sbin/shutdown
-halt:x:7:0:halt:/sbin:/sbin/halt
-uucp:x:10:14:uucp:/var/spool/uucp:/bin/sh
-operator:x:11:0:Operator:/var:/bin/sh
+root:x:0:0:root:/root:/bin/sh
+daemon:x:1:1:daemon:/usr/sbin:/bin/sh
+bin:x:2:2:bin:/bin:/bin/sh
+sys:x:3:3:sys:/dev:/bin/sh
+sync:x:4:100:sync:/bin:/bin/sync
+mail:x:8:8:mail:/var/spool/mail:/bin/sh
+proxy:x:13:13:proxy:/bin:/bin/sh
+www-data:x:33:33:www-data:/var/www:/bin/sh
+backup:x:34:34:backup:/var/backups:/bin/sh
+operator:x:37:37:Operator:/var:/bin/sh
 nobody:x:65534:65534:nobody:/home:/bin/sh
+default:x:1000:1000:Default non-root user:/home/default:/bin/sh
diff --git a/sources/target_skeleton/etc/profile b/sources/target_skeleton/etc/profile
index 8797092a9..66ef8fedf 100644
--- a/sources/target_skeleton/etc/profile
+++ b/sources/target_skeleton/etc/profile
@@ -1,3 +1,4 @@
+PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 alias ll='ls -l'
 
 echo " "
diff --git a/sources/target_skeleton/etc/protocols b/sources/target_skeleton/etc/protocols
index c8e983b72..b175544a4 100644
--- a/sources/target_skeleton/etc/protocols
+++ b/sources/target_skeleton/etc/protocols
@@ -1,21 +1,31 @@
-# protocols     This file describes the various protocols that are
-#               available from the TCP/IP subsystem.  It should be
-#               consulted instead of using the numbers in the ARPA
-#               include files, or, worse, just guessing them.
+# /etc/protocols:
+# $Id: protocols,v 1.2 2002/04/26 11:45:52 andersen Exp $
 #
-# Version:      @(#)/etc/protocols      2.00    04/30/93
+# Internet (IP) protocols
 #
-# Author:       Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
+#	from: @(#)protocols	5.1 (Berkeley) 4/17/89
 #
+# Updated for NetBSD based on RFC 1340, Assigned Numbers (July 1992).
 
-ip      0       IP      # internet protocol, pseudo protocol number
-icmp    1       ICMP    # internet control message protocol
-igmp    2       IGMP    # internet group multicast protocol
-ggp     3       GGP     # gateway-gateway protocol
-tcp     6       TCP     # transmission control protocol
-pup     12      PUP     # PARC universal packet protocol
-udp     17      UDP     # user datagram protocol
-idp     22      IDP     # WhatsThis?
-raw     255     RAW     # RAW IP interface
-
-# End of protocols.
+ip	0	IP		# internet protocol, pseudo protocol number
+icmp	1	ICMP		# internet control message protocol
+igmp	2	IGMP		# Internet Group Management
+ggp	3	GGP		# gateway-gateway protocol
+ipencap	4	IP-ENCAP	# IP encapsulated in IP (officially ``IP'')
+st	5	ST		# ST datagram mode
+tcp	6	TCP		# transmission control protocol
+egp	8	EGP		# exterior gateway protocol
+pup	12	PUP		# PARC universal packet protocol
+udp	17	UDP		# user datagram protocol
+hmp	20	HMP		# host monitoring protocol
+xns-idp	22	XNS-IDP		# Xerox NS IDP
+rdp	27	RDP		# "reliable datagram" protocol
+iso-tp4	29	ISO-TP4		# ISO Transport Protocol class 4
+xtp	36	XTP		# Xpress Tranfer Protocol
+ddp	37	DDP		# Datagram Delivery Protocol
+idpr-cmtp	39	IDPR-CMTP	# IDPR Control Message Transport
+rspf	73	RSPF		#Radio Shortest Path First.
+vmtp	81	VMTP		# Versatile Message Transport
+ospf	89	OSPFIGP		# Open Shortest Path First IGP
+ipip	94	IPIP		# Yet Another IP encapsulation
+encap	98	ENCAP		# Yet Another IP encapsulation
diff --git a/sources/target_skeleton/etc/services b/sources/target_skeleton/etc/services
index a030ff539..49d6e4c7c 100644
--- a/sources/target_skeleton/etc/services
+++ b/sources/target_skeleton/etc/services
@@ -1,147 +1,172 @@
-#       $NetBSD: services,v 1.18 1996/03/26 00:07:58 mrg Exp $
+# /etc/services:
+# $Id: services,v 1.2 2002/04/26 11:45:52 andersen Exp $
 #
 # Network services, Internet style
 #
 # Note that it is presently the policy of IANA to assign a single well-known
 # port number for both TCP and UDP; hence, most entries here have two entries
 # even if the protocol doesn't support UDP operations.
-# Updated from RFC 1340, ``Assigned Numbers'' (July 1992).  Not all ports
+# Updated from RFC 1700, ``Assigned Numbers'' (October 1994).  Not all ports
 # are included, only the more common ones.
-#
-#       from: @(#)services      5.8 (Berkeley) 5/9/91
-#
-tcpmux          1/tcp           # TCP port service multiplexer
-echo            7/tcp
-echo            7/udp
-discard         9/tcp           sink null
-discard         9/udp           sink null
-systat          11/tcp          users
-daytime         13/tcp
-daytime         13/udp
-netstat         15/tcp
-qotd            17/tcp          quote
-msp             18/tcp          # message send protocol
-msp             18/udp          # message send protocol
-chargen         19/tcp          ttytst source
-chargen         19/udp          ttytst source
-ftp-data        20/tcp          # default ftp data port
-ftp             21/tcp
-ssh             22/tcp
-ssh             22/udp
-telnet          23/tcp
+
+tcpmux		1/tcp				# TCP port service multiplexer
+echo		7/tcp
+echo		7/udp
+discard		9/tcp		sink null
+discard		9/udp		sink null
+systat		11/tcp		users
+daytime		13/tcp
+daytime		13/udp
+netstat		15/tcp
+qotd		17/tcp		quote
+msp		18/tcp				# message send protocol
+msp		18/udp				# message send protocol
+chargen		19/tcp		ttytst source
+chargen		19/udp		ttytst source
+ftp-data	20/tcp
+ftp		21/tcp
+fsp		21/udp		fspd
+ssh		22/tcp				# SSH Remote Login Protocol
+ssh		22/udp				# SSH Remote Login Protocol
+telnet		23/tcp
 # 24 - private
-smtp            25/tcp          mail
+smtp		25/tcp		mail
 # 26 - unassigned
-time            37/tcp          timserver
-time            37/udp          timserver
-rlp             39/udp          resource        # resource location
-nameserver      42/tcp          name            # IEN 116
-whois           43/tcp          nicname
-domain          53/tcp          nameserver      # name-domain server
-domain          53/udp          nameserver
-mtp             57/tcp                          # deprecated
-bootps          67/tcp          # BOOTP server
-bootps          67/udp
-bootpc          68/tcp          # BOOTP client
-bootpc          68/udp
-tftp            69/udp
-gopher          70/tcp          # Internet Gopher
-gopher          70/udp
-rje             77/tcp          netrjs
-finger          79/tcp
-www             80/tcp          http    # WorldWideWeb HTTP
-www             80/udp                  # HyperText Transfer Protocol
-link            87/tcp          ttylink
-kerberos        88/tcp          krb5    # Kerberos v5
-kerberos        88/udp
-supdup          95/tcp
+time		37/tcp		timserver
+time		37/udp		timserver
+rlp		39/udp		resource	# resource location
+nameserver	42/tcp		name		# IEN 116
+whois		43/tcp		nicname
+re-mail-ck	50/tcp				# Remote Mail Checking Protocol
+re-mail-ck	50/udp				# Remote Mail Checking Protocol
+domain		53/tcp		nameserver	# name-domain server
+domain		53/udp		nameserver
+mtp		57/tcp				# deprecated
+bootps		67/tcp				# BOOTP server
+bootps		67/udp
+bootpc		68/tcp				# BOOTP client
+bootpc		68/udp
+tftp		69/udp
+gopher		70/tcp				# Internet Gopher
+gopher		70/udp
+rje		77/tcp		netrjs
+finger		79/tcp
+www		80/tcp		http		# WorldWideWeb HTTP
+www		80/udp				# HyperText Transfer Protocol
+link		87/tcp		ttylink
+kerberos	88/tcp		kerberos5 krb5	# Kerberos v5
+kerberos	88/udp		kerberos5 krb5	# Kerberos v5
+supdup		95/tcp
 # 100 - reserved
-hostnames       101/tcp         hostname        # usually from sri-nic
-iso-tsap        102/tcp         tsap            # part of ISODE.
-csnet-ns        105/tcp         cso-ns  # also used by CSO name server
-csnet-ns        105/udp         cso-ns
-rtelnet         107/tcp         # Remote Telnet
-rtelnet         107/udp
-pop2            109/tcp         pop-2 postoffice        # POP version 2
-pop2            109/udp
-pop3            110/tcp         pop-3 # POP version 3
-pop3            110/udp
-sunrpc          111/tcp
-sunrpc          111/udp
-auth            113/tcp         authentication tap ident
-sftp            115/tcp
-uucp-path       117/tcp
-nntp            119/tcp         readnews untp   # USENET News Transfer Protocol
-ntp             123/tcp
-ntp             123/udp                         # Network Time Protocol
-netbios-ns      137/tcp                         # NETBIOS Name Service
-netbios-ns      137/udp
-netbios-dgm     138/tcp                         # NETBIOS Datagram Service
-netbios-dgm     138/udp
-netbios-ssn     139/tcp                         # NETBIOS session service
-netbios-ssn     139/udp
-imap2           143/tcp         imap            # Interim Mail Access Proto v2
-imap2           143/udp
-snmp            161/udp                         # Simple Net Mgmt Proto
-snmp-trap       162/udp         snmptrap        # Traps for SNMP
-cmip-man        163/tcp                         # ISO mgmt over IP (CMOT)
-cmip-man        163/udp
-cmip-agent      164/tcp
-cmip-agent      164/udp
-xdmcp           177/tcp                         # X Display Mgr. Control Proto
-xdmcp           177/udp
-nextstep        178/tcp         NeXTStep NextStep       # NeXTStep window
-nextstep        178/udp         NeXTStep NextStep       # server
-bgp             179/tcp                         # Border Gateway Proto.
-bgp             179/udp
-prospero        191/tcp                         # Cliff Neuman's Prospero
-prospero        191/udp
-irc             194/tcp                         # Internet Relay Chat
-irc             194/udp
-smux            199/tcp                         # SNMP Unix Multiplexer
-smux            199/udp
-at-rtmp         201/tcp                         # AppleTalk routing
-at-rtmp         201/udp
-at-nbp          202/tcp                         # AppleTalk name binding
-at-nbp          202/udp
-at-echo         204/tcp                         # AppleTalk echo
-at-echo         204/udp
-at-zis          206/tcp                         # AppleTalk zone information
-at-zis          206/udp
-z3950           210/tcp         wais            # NISO Z39.50 database
-z3950           210/udp         wais
-ipx             213/tcp                         # IPX
-ipx             213/udp
-imap3           220/tcp                         # Interactive Mail Access
-imap3           220/udp                         # Protocol v3
-ulistserv       372/tcp                         # UNIX Listserv
-ulistserv       372/udp
+hostnames	101/tcp		hostname	# usually from sri-nic
+iso-tsap	102/tcp		tsap		# part of ISODE.
+csnet-ns	105/tcp		cso-ns		# also used by CSO name server
+csnet-ns	105/udp		cso-ns
+# unfortunately the poppassd (Eudora) uses a port which has already
+# been assigned to a different service. We list the poppassd as an
+# alias here. This should work for programs asking for this service.
+# (due to a bug in inetd the 3com-tsmux line is disabled)
+#3com-tsmux	106/tcp		poppassd
+#3com-tsmux	106/udp		poppassd
+rtelnet		107/tcp				# Remote Telnet
+rtelnet		107/udp
+pop-2		109/tcp		postoffice	# POP version 2
+pop-2		109/udp
+pop-3		110/tcp				# POP version 3
+pop-3		110/udp
+sunrpc		111/tcp		portmapper	# RPC 4.0 portmapper TCP
+sunrpc		111/udp		portmapper	# RPC 4.0 portmapper UDP
+auth		113/tcp		authentication tap ident
+sftp		115/tcp
+uucp-path	117/tcp
+nntp		119/tcp		readnews untp	# USENET News Transfer Protocol
+ntp		123/tcp
+ntp		123/udp				# Network Time Protocol
+netbios-ns	137/tcp				# NETBIOS Name Service
+netbios-ns	137/udp
+netbios-dgm	138/tcp				# NETBIOS Datagram Service
+netbios-dgm	138/udp
+netbios-ssn	139/tcp				# NETBIOS session service
+netbios-ssn	139/udp
+imap2		143/tcp				# Interim Mail Access Proto v2
+imap2		143/udp
+snmp		161/udp				# Simple Net Mgmt Proto
+snmp-trap	162/udp		snmptrap	# Traps for SNMP
+cmip-man	163/tcp				# ISO mgmt over IP (CMOT)
+cmip-man	163/udp
+cmip-agent	164/tcp
+cmip-agent	164/udp
+xdmcp		177/tcp				# X Display Mgr. Control Proto
+xdmcp		177/udp
+nextstep	178/tcp		NeXTStep NextStep	# NeXTStep window
+nextstep	178/udp		NeXTStep NextStep	# server
+bgp		179/tcp				# Border Gateway Proto.
+bgp		179/udp
+prospero	191/tcp				# Cliff Neuman's Prospero
+prospero	191/udp
+irc		194/tcp				# Internet Relay Chat
+irc		194/udp
+smux		199/tcp				# SNMP Unix Multiplexer
+smux		199/udp
+at-rtmp		201/tcp				# AppleTalk routing
+at-rtmp		201/udp
+at-nbp		202/tcp				# AppleTalk name binding
+at-nbp		202/udp
+at-echo		204/tcp				# AppleTalk echo
+at-echo		204/udp
+at-zis		206/tcp				# AppleTalk zone information
+at-zis		206/udp
+qmtp		209/tcp				# The Quick Mail Transfer Protocol
+qmtp		209/udp				# The Quick Mail Transfer Protocol
+z3950		210/tcp		wais		# NISO Z39.50 database
+z3950		210/udp		wais
+ipx		213/tcp				# IPX
+ipx		213/udp
+imap3		220/tcp				# Interactive Mail Access
+imap3		220/udp				# Protocol v3
+ulistserv	372/tcp				# UNIX Listserv
+ulistserv	372/udp
+https		443/tcp				# MCom
+https		443/udp				# MCom
+snpp		444/tcp				# Simple Network Paging Protocol
+snpp		444/udp				# Simple Network Paging Protocol
+saft		487/tcp				# Simple Asynchronous File Transfer
+saft		487/udp				# Simple Asynchronous File Transfer
+npmp-local	610/tcp		dqs313_qmaster	# npmp-local / DQS
+npmp-local	610/udp		dqs313_qmaster	# npmp-local / DQS
+npmp-gui	611/tcp		dqs313_execd	# npmp-gui / DQS
+npmp-gui	611/udp		dqs313_execd	# npmp-gui / DQS
+hmmp-ind	612/tcp		dqs313_intercell# HMMP Indication / DQS
+hmmp-ind	612/udp		dqs313_intercell# HMMP Indication / DQS
 #
 # UNIX specific services
 #
-exec            512/tcp
-biff            512/udp         comsat
-login           513/tcp
-who             513/udp         whod
-shell           514/tcp         cmd             # no passwords used
-syslog          514/udp
-printer         515/tcp         spooler         # line printer spooler
-talk            517/udp
-ntalk           518/udp
-route           520/udp         router routed   # RIP
-timed           525/udp         timeserver
-tempo           526/tcp         newdate
-courier         530/tcp         rpc
-conference      531/tcp         chat
-netnews         532/tcp         readnews
-netwall         533/udp                         # -for emergency broadcasts
-uucp            540/tcp         uucpd           # uucp daemon
-remotefs        556/tcp         rfs_server rfs  # Brunhoff remote filesystem
-#
-webster         765/tcp                         # Network dictionary
-webster         765/udp
-# temporary entry (not officially registered by the Samba Team!)
-swat            901/tcp         # Samba Web Administration Tool
+exec		512/tcp
+biff		512/udp		comsat
+login		513/tcp
+who		513/udp		whod
+shell		514/tcp		cmd		# no passwords used
+syslog		514/udp
+printer		515/tcp		spooler		# line printer spooler
+talk		517/udp
+ntalk		518/udp
+route		520/udp		router routed	# RIP
+timed		525/udp		timeserver
+tempo		526/tcp		newdate
+courier		530/tcp		rpc
+conference	531/tcp		chat
+netnews		532/tcp		readnews
+netwall		533/udp				# -for emergency broadcasts
+uucp		540/tcp		uucpd		# uucp daemon
+afpovertcp	548/tcp				# AFP over TCP
+afpovertcp	548/udp				# AFP over TCP
+remotefs	556/tcp		rfs_server rfs	# Brunhoff remote filesystem
+klogin		543/tcp				# Kerberized `rlogin' (v5)
+kshell		544/tcp		krcmd		# Kerberized `rsh' (v5)
+kerberos-adm	749/tcp				# Kerberos `kadmin' (v5)
+#
+webster		765/tcp				# Network dictionary
+webster		765/udp
 #
 # From ``Assigned Numbers'':
 #
@@ -157,37 +182,116 @@ swat            901/tcp         # Samba Web Administration Tool
 #> does register or list uses of these ports as a convienence to the
 #> community.
 #
-ingreslock      1524/tcp
-ingreslock      1524/udp
-prospero-np     1525/tcp                # Prospero non-privileged
-prospero-np     1525/udp
-rfe             5002/tcp                # Radio Free Ethernet
-rfe             5002/udp                # Actually uses UDP only
+ingreslock	1524/tcp
+ingreslock	1524/udp
+prospero-np	1525/tcp			# Prospero non-privileged
+prospero-np	1525/udp
+datametrics	1645/tcp	old-radius	# datametrics / old radius entry
+datametrics	1645/udp	old-radius	# datametrics / old radius entry
+sa-msg-port	1646/tcp	old-radacct	# sa-msg-port / old radacct entry
+sa-msg-port	1646/udp	old-radacct	# sa-msg-port / old radacct entry
+radius		1812/tcp			# Radius
+radius		1812/udp			# Radius
+radacct		1813/tcp			# Radius Accounting
+radacct		1813/udp			# Radius Accounting
+cvspserver	2401/tcp			# CVS client/server operations
+cvspserver	2401/udp			# CVS client/server operations
+mysql		3306/tcp			# MySQL
+mysql		3306/udp			# MySQL
+rfe		5002/tcp			# Radio Free Ethernet
+rfe		5002/udp			# Actually uses UDP only
+cfengine	5308/tcp			# CFengine
+cfengine	5308/udp			# CFengine
+bbs		7000/tcp			# BBS service
 #
 #
 # Kerberos (Project Athena/MIT) services
-# Note that these are for Kerberos v4, and are unofficial.
-#
-klogin          543/tcp                 # Kerberos `rlogin'
-kshell          544/tcp         krcmd   # Kerberos `rsh'
-kerberos-adm    749/tcp                 # Kerberos `kadmin' (v5)
-kerberos4       750/udp         kdc     # Kerberos (server) udp
-kerberos4       750/tcp         kdc     # Kerberos (server) tcp
-kerberos-master 751/udp                 # Kerberos admin server udp
-kerberos-master 751/tcp                 # Kerberos admin server tcp
-krbupdate       760/tcp         kreg    # BSD Kerberos registration
-kpasswd         761/tcp         kpwd    # BSD Kerberos `passwd'
-eklogin         2105/tcp                # Kerberos encrypted `rlogin'
+# Note that these are for Kerberos v4, and are unofficial.  Sites running
+# v4 should uncomment these and comment out the v5 entries above.
+#
+kerberos4	750/udp		kerberos-iv kdc	# Kerberos (server) udp
+kerberos4	750/tcp		kerberos-iv kdc	# Kerberos (server) tcp
+kerberos_master	751/udp				# Kerberos authentication
+kerberos_master	751/tcp				# Kerberos authentication
+passwd_server	752/udp				# Kerberos passwd server
+krb_prop	754/tcp				# Kerberos slave propagation
+krbupdate	760/tcp		kreg		# Kerberos registration
+kpasswd		761/tcp		kpwd		# Kerberos "passwd"
+kpop		1109/tcp			# Pop with Kerberos
+knetd		2053/tcp			# Kerberos de-multiplexor
+zephyr-srv	2102/udp			# Zephyr server
+zephyr-clt	2103/udp			# Zephyr serv-hm connection
+zephyr-hm	2104/udp			# Zephyr hostmanager
+eklogin		2105/tcp			# Kerberos encrypted rlogin
 #
 # Unofficial but necessary (for NetBSD) services
 #
-supfilesrv      871/tcp                 # SUP server
-supfiledbg      1127/tcp                # SUP debugging
+supfilesrv	871/tcp				# SUP server
+supfiledbg	1127/tcp			# SUP debugging
+#
+# Datagram Delivery Protocol services
 #
-# AppleTalk DDP entries (DDP: Datagram Delivery Protocol)
+rtmp		1/ddp				# Routing Table Maintenance Protocol
+nbp		2/ddp				# Name Binding Protocol
+echo		4/ddp				# AppleTalk Echo Protocol
+zip		6/ddp				# Zone Information Protocol
 #
-rtmp            1/ddp                   # Routing Table Maintenance Protocol
-nbp             2/ddp                   # Name Binding Protocol
-echo            4/ddp                   # AppleTalk Echo Protocol
-zip             6/ddp                   # Zone Information Protocol
+# Services added for the Debian GNU/Linux distribution
+poppassd	106/tcp				# Eudora
+poppassd	106/udp				# Eudora
+mailq		174/tcp				# Mailer transport queue for Zmailer
+mailq		174/tcp				# Mailer transport queue for Zmailer
+omirr		808/tcp		omirrd		# online mirror
+omirr		808/udp		omirrd		# online mirror
+rmtcfg		1236/tcp			# Gracilis Packeten remote config server
+xtel		1313/tcp			# french minitel
+coda_opcons	1355/udp			# Coda opcons            (Coda fs)
+coda_venus	1363/udp			# Coda venus             (Coda fs)
+coda_auth	1357/udp			# Coda auth              (Coda fs)
+coda_udpsrv	1359/udp			# Coda udpsrv            (Coda fs)
+coda_filesrv	1361/udp			# Coda filesrv           (Coda fs)
+codacon		1423/tcp	venus.cmu	# Coda Console           (Coda fs)
+coda_aux1	1431/tcp			# coda auxiliary service (Coda fs)
+coda_aux1	1431/udp			# coda auxiliary service (Coda fs)
+coda_aux2	1433/tcp			# coda auxiliary service (Coda fs)
+coda_aux2	1433/udp			# coda auxiliary service (Coda fs)
+coda_aux3	1435/tcp			# coda auxiliary service (Coda fs)
+coda_aux3	1435/udp			# coda auxiliary service (Coda fs)
+cfinger		2003/tcp			# GNU Finger
+afbackup	2988/tcp			# Afbackup system
+afbackup	2988/udp			# Afbackup system
+icp		3130/tcp			# Internet Cache Protocol (Squid)
+icp		3130/udp			# Internet Cache Protocol (Squid)
+postgres	5432/tcp			# POSTGRES
+postgres	5432/udp			# POSTGRES
+fax		4557/tcp			# FAX transmission service        (old)
+hylafax		4559/tcp			# HylaFAX client-server protocol  (new)
+noclog		5354/tcp			# noclogd with TCP (nocol)
+noclog		5354/udp			# noclogd with UDP (nocol)
+hostmon		5355/tcp			# hostmon uses TCP (nocol)
+hostmon		5355/udp			# hostmon uses TCP (nocol)
+ircd		6667/tcp			# Internet Relay Chat
+ircd		6667/udp			# Internet Relay Chat
+webcache	8080/tcp			# WWW caching service
+webcache	8080/udp			# WWW caching service
+tproxy		8081/tcp			# Transparent Proxy
+tproxy		8081/udp			# Transparent Proxy
+mandelspawn	9359/udp	mandelbrot	# network mandelbrot
+amanda		10080/udp			# amanda backup services
+amandaidx	10082/tcp			# amanda backup services
+amidxtape	10083/tcp			# amanda backup services
+isdnlog		20011/tcp			# isdn logging system
+isdnlog		20011/udp			# isdn logging system
+vboxd		20012/tcp			# voice box system
+vboxd		20012/udp			# voice box system
+binkp           24554/tcp			# Binkley
+binkp           24554/udp			# Binkley
+asp		27374/tcp			# Address Search Protocol
+asp		27374/udp			# Address Search Protocol
+tfido           60177/tcp			# Ifmail
+tfido           60177/udp			# Ifmail
+fido            60179/tcp			# Ifmail
+fido            60179/udp			# Ifmail
+
+# Local services
 
diff --git a/sources/target_skeleton/etc/shadow b/sources/target_skeleton/etc/shadow
index d2cccb998..4941a1ac5 100644
--- a/sources/target_skeleton/etc/shadow
+++ b/sources/target_skeleton/etc/shadow
@@ -9,3 +9,4 @@ halt:*:10933:0:99999:7:::
 uucp:*:10933:0:99999:7:::
 operator:*:10933:0:99999:7:::
 nobody:*:10933:0:99999:7:::
+default::10933:0:99999:7:::