Merge remote-tracking branch 'dweismueller/telnet' into next

Conflicts:
	make.sh
This commit is contained in:
Michael Tremer
2012-09-17 19:10:23 +02:00
20 changed files with 2968 additions and 5 deletions

View File

@@ -4,7 +4,6 @@ bin/ping
#usr/bin/rlogin
#usr/bin/rsh
#usr/bin/talk
#usr/bin/telnet
#usr/bin/tftp
usr/bin/whois
#usr/sbin/ftpd
@@ -13,7 +12,6 @@ usr/bin/whois
#usr/sbin/rlogind
#usr/sbin/rshd
#usr/sbin/talkd
#usr/sbin/telnetd
#usr/sbin/tftpd
#usr/sbin/uucpd
#usr/share/info/inetutils.info
@@ -26,7 +24,6 @@ usr/bin/whois
#usr/share/man/man1/rlogin.1
#usr/share/man/man1/rsh.1
#usr/share/man/man1/talk.1
#usr/share/man/man1/telnet.1
#usr/share/man/man1/tftp.1
#usr/share/man/man5/syslog.conf.5
#usr/share/man/man8/ftpd.8
@@ -37,5 +34,4 @@ usr/bin/whois
#usr/share/man/man8/rshd.8
#usr/share/man/man8/syslogd.8
#usr/share/man/man8/talkd.8
#usr/share/man/man8/telnetd.8
#usr/share/man/man8/tftpd.8

View File

@@ -0,0 +1,3 @@
usr/bin/telnet
#usr/man/man1/telnet.1
#usr/man/man5/issue.net.5