summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--README.queueing6
-rw-r--r--autotest/puppet_rspec.rb26
-rwxr-xr-xconf/gentoo/init.d/puppetmaster60
-rw-r--r--conf/osx/PackageInfo.plist60
-rw-r--r--conf/redhat/client.init78
-rw-r--r--conf/redhat/server.init74
-rw-r--r--conf/solaris/smf/puppetd.xml104
-rw-r--r--conf/solaris/smf/puppetmasterd.xml104
-rwxr-xr-xconf/solaris/smf/svc-puppetd4
-rwxr-xr-xconf/solaris/smf/svc-puppetmasterd4
-rw-r--r--conf/suse/client.init6
-rw-r--r--conf/suse/puppet.spec10
-rw-r--r--conf/suse/server.init32
-rwxr-xr-xexamples/etc/init.d/sleeper16
-rw-r--r--examples/mcx_dock_default.pp216
-rw-r--r--examples/mcx_dock_full.pp216
-rw-r--r--examples/mcx_nogroup.pp216
-rw-r--r--examples/modules/sample-module/lib/puppet/parser/functions/hostname_to_dn.rb6
-rwxr-xr-xext/bin/sleeper24
-rwxr-xr-xext/module_puppet12
-rwxr-xr-xext/nagios/naggen16
-rwxr-xr-xext/puppet-test30
-rw-r--r--ext/puppetstoredconfigclean.rb36
-rwxr-xr-xinstall.rb36
-rw-r--r--lib/puppet.rb12
-rw-r--r--lib/puppet/external/dot.rb8
-rwxr-xr-xlib/puppet/external/nagios.rb40
-rw-r--r--lib/puppet/external/nagios/grammar.ry186
-rw-r--r--lib/puppet/parser/functions/regsubst.rb64
-rw-r--r--lib/puppet/parser/functions/sprintf.rb12
-rw-r--r--lib/puppet/provider/package/appdmg.rb10
-rwxr-xr-xlib/puppet/provider/package/apt.rb6
-rwxr-xr-xlib/puppet/provider/package/aptitude.rb2
-rwxr-xr-xlib/puppet/provider/package/fink.rb6
-rw-r--r--lib/puppet/provider/package/portage.rb2
-rw-r--r--lib/puppet/provider/package/yumhelper.py2
-rwxr-xr-xlib/puppet/provider/service/redhat.rb2
-rw-r--r--lib/puppet/provider/user/hpux.rb4
-rwxr-xr-xlib/puppet/sslcertificates.rb2
-rw-r--r--lib/puppet/type.rb2
-rw-r--r--lib/puppet/type/file/target.rb2
-rwxr-xr-xlib/puppet/type/mount.rb2
-rw-r--r--lib/puppet/type/service.rb2
-rwxr-xr-xlib/puppet/type/tidy.rb6
-rw-r--r--lib/puppet/util.rb2
-rw-r--r--lib/puppet/util/log.rb30
-rw-r--r--lib/puppet/util/pidlock.rb118
-rw-r--r--spec/unit/other/selinux.rb130
-rwxr-xr-xspec/unit/parser/ast/arithmetic_operator.rb30
-rwxr-xr-xspec/unit/parser/ast/boolean_operator.rb2
-rw-r--r--spec/unit/parser/functions/regsubst.rb84
-rw-r--r--spec/unit/parser/functions/sprintf.rb22
-rwxr-xr-xspec/unit/parser/parser.rb6
-rw-r--r--test/data/providers/mailalias/aliases/test130
-rw-r--r--test/data/snippets/append.pp10
-rw-r--r--test/data/snippets/multilinecomments.pp2
-rw-r--r--test/data/types/hosts/26
-rw-r--r--test/data/types/hosts/solaris4
-rw-r--r--test/data/types/mount/freebsd.fstab14
-rw-r--r--test/data/types/mount/solaris.fstab20
-rw-r--r--test/data/types/port/1944
-rw-r--r--test/data/types/port/darwin7128
-rwxr-xr-xtest/language/ast/casestatement.rb24
-rwxr-xr-xtest/language/ast/resource.rb6
-rwxr-xr-xtest/language/ast/resource_reference.rb6
-rwxr-xr-xtest/language/ast/selector.rb6
-rwxr-xr-xtest/language/ast/variable.rb6
-rwxr-xr-xtest/language/resource.rb2
-rwxr-xr-xtest/language/snippets.rb2
-rwxr-xr-xtest/lib/puppettest.rb8
-rw-r--r--test/lib/puppettest/support/utils.rb8
-rw-r--r--test/lib/puppettest/testcase.rb2
-rwxr-xr-xtest/network/authconfig.rb2
-rwxr-xr-xtest/network/authorization.rb2
-rwxr-xr-xtest/network/authstore.rb30
-rwxr-xr-xtest/network/client_request.rb2
-rwxr-xr-xtest/network/handler/fileserver.rb2
-rwxr-xr-xtest/network/handler/report.rb6
-rwxr-xr-xtest/network/handler/runner.rb2
-rwxr-xr-xtest/network/rights.rb2
-rwxr-xr-xtest/network/xmlrpc/webrick_servlet.rb10
-rwxr-xr-xtest/other/dsl.rb4
-rwxr-xr-xtest/other/events.rb2
-rwxr-xr-xtest/other/overrides.rb2
-rwxr-xr-xtest/other/puppet.rb2
-rwxr-xr-xtest/other/relationships.rb8
-rwxr-xr-xtest/other/report.rb4
-rwxr-xr-xtest/ral/manager/provider.rb2
-rwxr-xr-xtest/ral/manager/type.rb2
-rwxr-xr-xtest/ral/providers/cron/crontab.rb4
-rwxr-xr-xtest/ral/providers/group.rb2
-rwxr-xr-xtest/ral/providers/host/netinfo.rb20
-rwxr-xr-xtest/ral/providers/host/parsed.rb4
-rwxr-xr-xtest/ral/providers/mailalias/aliases.rb4
-rwxr-xr-xtest/ral/providers/mount/netinfo.rb20
-rwxr-xr-xtest/ral/providers/package.rb2
-rwxr-xr-xtest/ral/providers/package/aptitude.rb108
-rwxr-xr-xtest/ral/providers/parsedfile.rb4
-rwxr-xr-xtest/ral/providers/port/parsed.rb4
-rwxr-xr-xtest/ral/providers/provider.rb4
-rwxr-xr-xtest/ral/providers/service/base.rb62
-rwxr-xr-xtest/ral/providers/sshkey/parsed.rb4
-rwxr-xr-xtest/ral/providers/user/useradd.rb36
-rwxr-xr-xtest/ral/type/cron.rb2
-rwxr-xr-xtest/ral/type/exec.rb2
-rwxr-xr-xtest/ral/type/group.rb2
-rwxr-xr-xtest/ral/type/host.rb2
-rwxr-xr-xtest/ral/type/mailalias.rb2
-rwxr-xr-xtest/ral/type/port.rb2
-rwxr-xr-xtest/ral/type/resources.rb18
-rwxr-xr-xtest/ral/type/service.rb2
-rwxr-xr-xtest/ral/type/sshkey.rb2
-rwxr-xr-xtest/ral/type/user.rb2
-rwxr-xr-xtest/ral/type/yumrepo.rb2
-rwxr-xr-xtest/test10
-rwxr-xr-xtest/util/autoload.rb2
-rwxr-xr-xtest/util/features.rb22
-rwxr-xr-xtest/util/fileparsing.rb8
-rwxr-xr-xtest/util/inifile.rb2
-rwxr-xr-xtest/util/instance_loader.rb2
-rwxr-xr-xtest/util/pidlock.rb232
-rwxr-xr-xtest/util/settings.rb4
-rwxr-xr-xtest/util/storage.rb2
123 files changed, 5550 insertions, 5550 deletions
diff --git a/README.queueing b/README.queueing
index 27d7aceb4..8c4a18029 100644
--- a/README.queueing
+++ b/README.queueing
@@ -56,7 +56,7 @@ tested with two of the most popular services - StompServer and ActiveMQ.
+ StompServer
- http://rubyforge.org/projects/stompserver/
+ http://rubyforge.org/projects/stompserver/
StompServer is a lightweight queueing service written in Ruby which is
suitable for testing or low volume puppet usage. Works well when both
@@ -67,7 +67,7 @@ Just install the stompserver gem and run 'stompserver'.
+ Apache ActiveMQ
- http://activemq.apache.org
+ http://activemq.apache.org
Considered by many to be the most popular message service in use today,
ActiveMQ has hundreds of features for scaling, persistence and so on.
@@ -76,7 +76,7 @@ Although installation is fairly simple, the configuration can seem quite
intimidating, but for our use a one line change to the standard configuration
is all that is required and is explained at:
- http://activemq.apache.org/stomp.html
+ http://activemq.apache.org/stomp.html
Other customization of the internal workings of ActiveMQ, if any, will depend
on your needs and deployment. A quick skimming of the ActiveMQ documentation
diff --git a/autotest/puppet_rspec.rb b/autotest/puppet_rspec.rb
index 2bc2fbb2d..55695000a 100644
--- a/autotest/puppet_rspec.rb
+++ b/autotest/puppet_rspec.rb
@@ -16,30 +16,30 @@ Autotest.add_hook :initialize do |at|
# force a complete re-run for all of these:
- # main puppet lib
- at.add_mapping(%r!^lib/puppet\.rb$!) { |filename, _|
+ # main puppet lib
+ at.add_mapping(%r!^lib/puppet\.rb$!) { |filename, _|
at.files_matching %r!spec/(unit|integration)/.*\.rb!
- }
+ }
- # the spec_helper
- at.add_mapping(%r!^spec/spec_helper\.rb$!) { |filename, _|
+ # the spec_helper
+ at.add_mapping(%r!^spec/spec_helper\.rb$!) { |filename, _|
at.files_matching %r!spec/(unit|integration)/.*\.rb!
- }
+ }
- # the puppet test libraries
- at.add_mapping(%r!^test/lib/puppettest/.*!) { |filename, _|
+ # the puppet test libraries
+ at.add_mapping(%r!^test/lib/puppettest/.*!) { |filename, _|
at.files_matching %r!spec/(unit|integration)/.*\.rb!
- }
+ }
# the puppet spec libraries
- at.add_mapping(%r!^spec/lib/spec.*!) { |filename, _|
+ at.add_mapping(%r!^spec/lib/spec.*!) { |filename, _|
at.files_matching %r!spec/(unit|integration)/.*\.rb!
- }
+ }
# the monkey patches for rspec
- at.add_mapping(%r!^spec/lib/monkey_patches/.*!) { |filename, _|
+ at.add_mapping(%r!^spec/lib/monkey_patches/.*!) { |filename, _|
at.files_matching %r!spec/(unit|integration)/.*\.rb!
- }
+ }
end
# a place for overrides when necessary.
diff --git a/conf/gentoo/init.d/puppetmaster b/conf/gentoo/init.d/puppetmaster
index 438ac21e8..9a48754a2 100755
--- a/conf/gentoo/init.d/puppetmaster
+++ b/conf/gentoo/init.d/puppetmaster
@@ -3,49 +3,49 @@
# Distributed under the terms of the GNU General Public License v2
depend() {
- need net
- before puppet
- use dns logger
+ need net
+ before puppet
+ use dns logger
}
checkconfig() {
- if [[ ! -d "${PUPPETMASTER_PID_DIR}" ]] ; then
- eerror "Please make sure PUPPETMASTER_PID_DIR is defined and points to a existing directory"
- return 1
- fi
+ if [[ ! -d "${PUPPETMASTER_PID_DIR}" ]] ; then
+ eerror "Please make sure PUPPETMASTER_PID_DIR is defined and points to a existing directory"
+ return 1
+ fi
- local site_manifest="/etc/puppet/manifests/site.pp"
- [[ -n "${PUPPETMASTER_MANIFEST}" ]] && site_manifest="${PUPPETMASTER_MANIFEST}"
+ local site_manifest="/etc/puppet/manifests/site.pp"
+ [[ -n "${PUPPETMASTER_MANIFEST}" ]] && site_manifest="${PUPPETMASTER_MANIFEST}"
- if [ ! -f "${site_manifest}" ] ; then
- eerror "Please create ${site_manifest} before running puppet"
- return 1
- fi
+ if [ ! -f "${site_manifest}" ] ; then
+ eerror "Please create ${site_manifest} before running puppet"
+ return 1
+ fi
- return 0
+ return 0
}
start() {
- checkconfig || return $?
+ checkconfig || return $?
- local options=""
- [[ -n "${PUPPETMASTER_MANIFEST}" ]] && options="${options} --manifest=${PUPPETMASTER_MANIFEST}"
- [[ -n "${PUPPETMASTER_LOG}" ]] && options="${options} --logdest=${PUPPETMASTER_LOG}"
- [[ -n "${PUPPETMASTER_EXTRA_OPTS}" ]] && options="${options} ${PUPPETMASTER_EXTRA_OPTS}"
+ local options=""
+ [[ -n "${PUPPETMASTER_MANIFEST}" ]] && options="${options} --manifest=${PUPPETMASTER_MANIFEST}"
+ [[ -n "${PUPPETMASTER_LOG}" ]] && options="${options} --logdest=${PUPPETMASTER_LOG}"
+ [[ -n "${PUPPETMASTER_EXTRA_OPTS}" ]] && options="${options} ${PUPPETMASTER_EXTRA_OPTS}"
- ebegin "Starting puppetmaster"
- start-stop-daemon --start --quiet --exec /usr/bin/ruby /usr/bin/puppetmasterd \
- -- ${options}
- eend $? "Failed to start puppetmaster"
+ ebegin "Starting puppetmaster"
+ start-stop-daemon --start --quiet --exec /usr/bin/ruby /usr/bin/puppetmasterd \
+ -- ${options}
+ eend $? "Failed to start puppetmaster"
}
stop() {
- ebegin "Stopping puppetmaster"
- start-stop-daemon --stop --quiet \
- --pidfile ${PUPPETMASTER_PID_DIR}/puppetmasterd.pid
- local ret=$?
- eend ${ret} "Failed to stop puppetmaster"
- rm -f ${PUPPETMASTER_PID_DIR}/puppetmasterd.pid
- return ${ret}
+ ebegin "Stopping puppetmaster"
+ start-stop-daemon --stop --quiet \
+ --pidfile ${PUPPETMASTER_PID_DIR}/puppetmasterd.pid
+ local ret=$?
+ eend ${ret} "Failed to stop puppetmaster"
+ rm -f ${PUPPETMASTER_PID_DIR}/puppetmasterd.pid
+ return ${ret}
}
diff --git a/conf/osx/PackageInfo.plist b/conf/osx/PackageInfo.plist
index 9706a80a6..08930e1ab 100644
--- a/conf/osx/PackageInfo.plist
+++ b/conf/osx/PackageInfo.plist
@@ -2,35 +2,35 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
- <key>CFBundleIdentifier</key>
- <string>com.reductivelabs.puppet</string>
- <key>CFBundleShortVersionString</key>
- <string>{SHORTVERSION}</string>
- <key>IFMajorVersion</key>
- <integer>{MAJORVERSION}</integer>
- <key>IFMinorVersion</key>
- <integer>{MINORVERSION}</integer>
- <key>IFPkgFlagAllowBackRev</key>
- <false/>
- <key>IFPkgFlagAuthorizationAction</key>
- <string>RootAuthorization</string>
- <key>IFPkgFlagDefaultLocation</key>
- <string>/</string>
- <key>IFPkgFlagFollowLinks</key>
- <true/>
- <key>IFPkgFlagInstallFat</key>
- <false/>
- <key>IFPkgFlagIsRequired</key>
- <false/>
- <key>IFPkgFlagOverwritePermissions</key>
- <false/>
- <key>IFPkgFlagRelocatable</key>
- <false/>
- <key>IFPkgFlagRestartAction</key>
- <string>None</string>
- <key>IFPkgFlagRootVolumeOnly</key>
- <true/>
- <key>IFPkgFlagUpdateInstalledLanguages</key>
- <false/>
+ <key>CFBundleIdentifier</key>
+ <string>com.reductivelabs.puppet</string>
+ <key>CFBundleShortVersionString</key>
+ <string>{SHORTVERSION}</string>
+ <key>IFMajorVersion</key>
+ <integer>{MAJORVERSION}</integer>
+ <key>IFMinorVersion</key>
+ <integer>{MINORVERSION}</integer>
+ <key>IFPkgFlagAllowBackRev</key>
+ <false/>
+ <key>IFPkgFlagAuthorizationAction</key>
+ <string>RootAuthorization</string>
+ <key>IFPkgFlagDefaultLocation</key>
+ <string>/</string>
+ <key>IFPkgFlagFollowLinks</key>
+ <true/>
+ <key>IFPkgFlagInstallFat</key>
+ <false/>
+ <key>IFPkgFlagIsRequired</key>
+ <false/>
+ <key>IFPkgFlagOverwritePermissions</key>
+ <false/>
+ <key>IFPkgFlagRelocatable</key>
+ <false/>
+ <key>IFPkgFlagRestartAction</key>
+ <string>None</string>
+ <key>IFPkgFlagRootVolumeOnly</key>
+ <true/>
+ <key>IFPkgFlagUpdateInstalledLanguages</key>
+ <false/>
</dict>
</plist>
diff --git a/conf/redhat/client.init b/conf/redhat/client.init
index 44caab140..114fb1821 100644
--- a/conf/redhat/client.init
+++ b/conf/redhat/client.init
@@ -33,28 +33,28 @@ PUPPET_OPTS=""
##[ -n "$INIT_VERSION" ] && PUPPET_OPTS="${PUPPET_OPTS} --fullrun"
start() {
- echo -n $"Starting puppet: "
- daemon $puppetd ${PUPPET_OPTS} ${PUPPET_EXTRA_OPTS}
- RETVAL=$?
- echo
+ echo -n $"Starting puppet: "
+ daemon $puppetd ${PUPPET_OPTS} ${PUPPET_EXTRA_OPTS}
+ RETVAL=$?
+ echo
[ $RETVAL = 0 ] && touch ${lockfile}
return $RETVAL
}
stop() {
- echo -n $"Stopping puppet: "
- killproc $puppetd
- RETVAL=$?
- echo
- [ $RETVAL = 0 ] && rm -f ${lockfile} ${pidfile}
+ echo -n $"Stopping puppet: "
+ killproc $puppetd
+ RETVAL=$?
+ echo
+ [ $RETVAL = 0 ] && rm -f ${lockfile} ${pidfile}
}
reload() {
- echo -n $"Restarting puppet: "
- killproc $puppetd -HUP
- RETVAL=$?
- echo
- return $RETVAL
+ echo -n $"Restarting puppet: "
+ killproc $puppetd -HUP
+ RETVAL=$?
+ echo
+ return $RETVAL
}
restart() {
@@ -63,40 +63,40 @@ restart() {
}
genconfig() {
- echo -n $"Generate configuration puppet: "
- $puppetd ${PUPPET_OPTS} ${PUPPET_EXTRA_OPTS} --genconfig
+ echo -n $"Generate configuration puppet: "
+ $puppetd ${PUPPET_OPTS} ${PUPPET_EXTRA_OPTS} --genconfig
}
case "$1" in
- start)
- start
- ;;
- stop)
- stop
- ;;
- restart)
- restart
- ;;
- reload|force-reload)
+ start)
+ start
+ ;;
+ stop)
+ stop
+ ;;
+ restart)
+ restart
+ ;;
+ reload|force-reload)
reload
- ;;
- condrestart|try-restart)
- [ -f "$pidfile" ] && restart
- ;;
- status)
+ ;;
+ condrestart|try-restart)
+ [ -f "$pidfile" ] && restart
+ ;;
+ status)
status -p "$pidfile" $puppetd
RETVAL=$?
- ;;
- once)
+ ;;
+ once)
shift
$puppetd -o ${PUPPET_OPTS} ${PUPPET_EXTRA_OPTS} $@
;;
- genconfig)
- genconfig
- ;;
- *)
- echo $"Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart|once|genconfig}"
- exit 1
+ genconfig)
+ genconfig
+ ;;
+ *)
+ echo $"Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart|once|genconfig}"
+ exit 1
esac
exit $RETVAL
diff --git a/conf/redhat/server.init b/conf/redhat/server.init
index 6871b9a92..48c8e4ed5 100644
--- a/conf/redhat/server.init
+++ b/conf/redhat/server.init
@@ -18,7 +18,7 @@ lockfile=/var/lock/subsys/puppetmaster
. /etc/rc.d/init.d/functions
if [ -f /etc/sysconfig/puppetmaster ]; then
- . /etc/sysconfig/puppetmaster
+ . /etc/sysconfig/puppetmaster
fi
PUPPETMASTER_OPTS=""
@@ -30,7 +30,7 @@ elif [ -n "$PUPPETMASTER_PORTS" ] && [ ${#PUPPETMASTER_PORTS[@]} -eq 1 ]; then
fi
[ -n "$PUPPETMASTER_LOG" ] && PUPPETMASTER_OPTS="${PUPPETMASTER_OPTS} --logdest=${PUPPETMASTER_LOG}"
PUPPETMASTER_OPTS="${PUPPETMASTER_OPTS} \
- ${PUPPETMASTER_EXTRA_OPTS}"
+ ${PUPPETMASTER_EXTRA_OPTS}"
RETVAL=0
@@ -38,10 +38,10 @@ prog=puppetmasterd
PUPPETMASTER=/usr/sbin/$prog
start() {
- echo -n $"Starting puppetmaster: "
+ echo -n $"Starting puppetmaster: "
- # Confirm the manifest exists
- if [ -r $PUPPETMASTER_MANIFEST ]; then
+ # Confirm the manifest exists
+ if [ -r $PUPPETMASTER_MANIFEST ]; then
if [ -n "$PUPPETMASTER_PORTS" ] && [ ${#PUPPETMASTER_PORTS[@]} -gt 1 ]; then
for ((i=0; i<${#PUPPETMASTER_PORTS[@]}; i++)); do
echo -en "\nPort: ${PUPPETMASTER_PORTS[$i]}"
@@ -52,18 +52,18 @@ start() {
daemon $PUPPETMASTER $PUPPETMASTER_OPTS
RETVAL=$?
fi
- else
- failure $"Manifest does not exist: $PUPPETMASTER_MANIFEST"
- echo
- return 1
- fi
- [ $RETVAL -eq 0 ] && touch "$lockfile"
- echo
- return $RETVAL
+ else
+ failure $"Manifest does not exist: $PUPPETMASTER_MANIFEST"
+ echo
+ return 1
+ fi
+ [ $RETVAL -eq 0 ] && touch "$lockfile"
+ echo
+ return $RETVAL
}
stop() {
- echo -n $"Stopping puppetmaster: "
+ echo -n $"Stopping puppetmaster: "
if [ -n "$PUPPETMASTER_PORTS" ] && [ ${#PUPPETMASTER_PORTS[@]} -gt 1 ]; then
for ((i=0; i<${#PUPPETMASTER_PORTS[@]}; i++)); do
echo -en "\nPort: ${PUPPETMASTER_PORTS[$i]}"
@@ -74,9 +74,9 @@ stop() {
killproc $PUPPETMASTER
RETVAL=$?
fi
- echo
- [ $RETVAL -eq 0 ] && rm -f "$lockfile"
- return $RETVAL
+ echo
+ [ $RETVAL -eq 0 ] && rm -f "$lockfile"
+ return $RETVAL
}
restart() {
@@ -97,7 +97,7 @@ puppetmaster_status() {
ret=$?; [ $ret != 0 ] && RETVAL=$ret
done
else
- status $PUPPETMASTER
+ status $PUPPETMASTER
RETVAL=$?
fi
return $RETVAL
@@ -105,26 +105,26 @@ puppetmaster_status() {
case "$1" in
start)
- start
- ;;
- stop)
- stop
- ;;
- restart|reload|force-reload)
+ start
+ ;;
+ stop)
+ stop
+ ;;
+ restart|reload|force-reload)
restart
- ;;
- condrestart)
- [ -f "$lockfile" ] && restart
- ;;
- status)
- puppetmaster_status
- ;;
- genconfig)
- genconfig
- ;;
- *)
- echo $"Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart|genconfig}"
- exit 1
+ ;;
+ condrestart)
+ [ -f "$lockfile" ] && restart
+ ;;
+ status)
+ puppetmaster_status
+ ;;
+ genconfig)
+ genconfig
+ ;;
+ *)
+ echo $"Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart|genconfig}"
+ exit 1
esac
exit $RETVAL
diff --git a/conf/solaris/smf/puppetd.xml b/conf/solaris/smf/puppetd.xml
index ad1b45231..4b62bac6d 100644
--- a/conf/solaris/smf/puppetd.xml
+++ b/conf/solaris/smf/puppetd.xml
@@ -7,71 +7,71 @@
<service
- name='network/puppetd'
- type='service'
- version='1'>
+ name='network/puppetd'
+ type='service'
+ version='1'>
- <create_default_instance enabled='true'/>
- <single_instance/>
+ <create_default_instance enabled='true'/>
+ <single_instance/>
- <dependency name='config-file'
- grouping='require_all'
- restart_on='none'
- type='path'>
- <service_fmri value='file:///etc/puppet/puppet.conf'/>
- </dependency>
+ <dependency name='config-file'
+ grouping='require_all'
+ restart_on='none'
+ type='path'>
+ <service_fmri value='file:///etc/puppet/puppet.conf'/>
+ </dependency>
- <dependency name='loopback'
- grouping='require_all'
- restart_on='error'
- type='service'>
- <service_fmri value='svc:/network/loopback:default'/>
- </dependency>
+ <dependency name='loopback'
+ grouping='require_all'
+ restart_on='error'
+ type='service'>
+ <service_fmri value='svc:/network/loopback:default'/>
+ </dependency>
- <dependency name='physical'
- grouping='require_all'
- restart_on='error'
- type='service'>
- <service_fmri value='svc:/network/physical:default'/>
- </dependency>
+ <dependency name='physical'
+ grouping='require_all'
+ restart_on='error'
+ type='service'>
+ <service_fmri value='svc:/network/physical:default'/>
+ </dependency>
- <dependency name='fs-local'
- grouping='require_all'
- restart_on='none'
- type='service'>
- <service_fmri value='svc:/system/filesystem/local'/>
- </dependency>
+ <dependency name='fs-local'
+ grouping='require_all'
+ restart_on='none'
+ type='service'>
+ <service_fmri value='svc:/system/filesystem/local'/>
+ </dependency>
- <exec_method
- type='method'
- name='start'
+ <exec_method
+ type='method'
+ name='start'
exec='/opt/csw/lib/svc/method/svc-puppetd start'
- timeout_seconds='60' />
+ timeout_seconds='60' />
- <exec_method
- type='method'
- name='stop'
+ <exec_method
+ type='method'
+ name='stop'
exec='/opt/csw/lib/svc/method/svc-puppetd stop'
- timeout_seconds='60' />
+ timeout_seconds='60' />
- <exec_method
- type='method'
- name='refresh'
+ <exec_method
+ type='method'
+ name='refresh'
exec='/opt/csw/lib/svc/method/svc-puppetd reload'
- timeout_seconds='60' />
+ timeout_seconds='60' />
- <stability value='Unstable' />
+ <stability value='Unstable' />
- <template>
- <common_name>
- <loctext xml:lang='C'>Puppet Client Daemon</loctext>
- </common_name>
- <documentation>
- <manpage title='puppetd' section='1' />
- <doc_link name='reductivelabs.com'
- uri='http://www.reductivelabs.com/projects/puppet' />
- </documentation>
- </template>
+ <template>
+ <common_name>
+ <loctext xml:lang='C'>Puppet Client Daemon</loctext>
+ </common_name>
+ <documentation>
+ <manpage title='puppetd' section='1' />
+ <doc_link name='reductivelabs.com'
+ uri='http://www.reductivelabs.com/projects/puppet' />
+ </documentation>
+ </template>
</service>
</service_bundle>
diff --git a/conf/solaris/smf/puppetmasterd.xml b/conf/solaris/smf/puppetmasterd.xml
index 17c52916f..b7190eff0 100644
--- a/conf/solaris/smf/puppetmasterd.xml
+++ b/conf/solaris/smf/puppetmasterd.xml
@@ -7,71 +7,71 @@
<service
- name='network/puppetmasterd'
- type='service'
- version='1'>
+ name='network/puppetmasterd'
+ type='service'
+ version='1'>
- <create_default_instance enabled='true'/>
- <single_instance/>
+ <create_default_instance enabled='true'/>
+ <single_instance/>
- <dependency name='config-file'
- grouping='require_all'
- restart_on='none'
- type='path'>
- <service_fmri value='file:///etc/puppet/puppet.conf'/>
- </dependency>
+ <dependency name='config-file'
+ grouping='require_all'
+ restart_on='none'
+ type='path'>
+ <service_fmri value='file:///etc/puppet/puppet.conf'/>
+ </dependency>
- <dependency name='loopback'
- grouping='require_all'
- restart_on='error'
- type='service'>
- <service_fmri value='svc:/network/loopback:default'/>
- </dependency>
+ <dependency name='loopback'
+ grouping='require_all'
+ restart_on='error'
+ type='service'>
+ <service_fmri value='svc:/network/loopback:default'/>
+ </dependency>
- <dependency name='physical'
- grouping='require_all'
- restart_on='error'
- type='service'>
- <service_fmri value='svc:/network/physical:default'/>
- </dependency>
+ <dependency name='physical'
+ grouping='require_all'
+ restart_on='error'
+ type='service'>
+ <service_fmri value='svc:/network/physical:default'/>
+ </dependency>
- <dependency name='fs-local'
- grouping='require_all'
- restart_on='none'
- type='service'>
- <service_fmri value='svc:/system/filesystem/local'/>
- </dependency>
+ <dependency name='fs-local'
+ grouping='require_all'
+ restart_on='none'
+ type='service'>
+ <service_fmri value='svc:/system/filesystem/local'/>
+ </dependency>
- <exec_method
- type='method'
- name='start'
+ <exec_method
+ type='method'
+ name='start'
exec='/opt/csw/lib/svc/method/svc-puppetmasterd start'
- timeout_seconds='60' />
+ timeout_seconds='60' />
- <exec_method
- type='method'
- name='stop'
+ <exec_method
+ type='method'
+ name='stop'
exec='/opt/csw/lib/svc/method/svc-puppetmasterd stop'
- timeout_seconds='60' />
+ timeout_seconds='60' />
- <exec_method
- type='method'
- name='refresh'
+ <exec_method
+ type='method'
+ name='refresh'
exec='/opt/csw/lib/svc/method/svc-puppetmasterd reload'
- timeout_seconds='60' />
+ timeout_seconds='60' />
- <stability value='Unstable' />
+ <stability value='Unstable' />
- <template>
- <common_name>
- <loctext xml:lang='C'>Puppet Server Daemon</loctext>
- </common_name>
- <documentation>
- <manpage title='puppetmasterd' section='1' />
- <doc_link name='reductivelabs.com'
- uri='http://www.reductivelabs.com/projects/puppet' />
- </documentation>
- </template>
+ <template>
+ <common_name>
+ <loctext xml:lang='C'>Puppet Server Daemon</loctext>
+ </common_name>
+ <documentation>
+ <manpage title='puppetmasterd' section='1' />
+ <doc_link name='reductivelabs.com'
+ uri='http://www.reductivelabs.com/projects/puppet' />
+ </documentation>
+ </template>
</service>
</service_bundle>
diff --git a/conf/solaris/smf/svc-puppetd b/conf/solaris/smf/svc-puppetd
index a89f03f0c..5fbcfe796 100755
--- a/conf/solaris/smf/svc-puppetd
+++ b/conf/solaris/smf/svc-puppetd
@@ -45,8 +45,8 @@ reload)
kill -HUP `cat $pidfile`
- printf " puppetd"
- echo ""
+ printf " puppetd"
+ echo ""
;;
status)
if [ -f $pidfile ]; then
diff --git a/conf/solaris/smf/svc-puppetmasterd b/conf/solaris/smf/svc-puppetmasterd
index e1a8d85bc..20ae85baf 100755
--- a/conf/solaris/smf/svc-puppetmasterd
+++ b/conf/solaris/smf/svc-puppetmasterd
@@ -41,8 +41,8 @@ reload)
kill -HUP `cat $pidfile`
- printf " puppetmasterd"
- echo ""
+ printf " puppetmasterd"
+ echo ""
;;
status)
if [ -f $pidfile ]; then
diff --git a/conf/suse/client.init b/conf/suse/client.init
index 1edd5ef30..d168e8cb4 100644
--- a/conf/suse/client.init
+++ b/conf/suse/client.init
@@ -66,7 +66,7 @@ case "$1" in
# startproc should return 0, even if service is
# already running to match LSB spec.
- startproc $puppetd ${PUPPET_OPTS} ${PUPPET_EXTRA_OPTS} && touch ${lockfile}
+ startproc $puppetd ${PUPPET_OPTS} ${PUPPET_EXTRA_OPTS} && touch ${lockfile}
# Remember status and be verbose
rc_status -v
;;
@@ -112,8 +112,8 @@ case "$1" in
## signalling, do nothing (!)
# If it supports signalling:
- echo -n "Reload puppet services."
- killproc -HUP $puppetd
+ echo -n "Reload puppet services."
+ killproc -HUP $puppetd
rc_status -v
;;
status)
diff --git a/conf/suse/puppet.spec b/conf/suse/puppet.spec
index f1fa0ba2d..b7f7d6162 100644
--- a/conf/suse/puppet.spec
+++ b/conf/suse/puppet.spec
@@ -110,19 +110,19 @@ exit 0
%preun
if [ "$1" = 0 ] ; then
- /sbin/service puppet stop > /dev/null 2>&1
- /sbin/chkconfig --del puppet
+ /sbin/service puppet stop > /dev/null 2>&1
+ /sbin/chkconfig --del puppet
fi
%preun server
if [ "$1" = 0 ] ; then
- /sbin/service puppetmaster stop > /dev/null 2>&1
- /sbin/chkconfig --del puppetmaster
+ /sbin/service puppetmaster stop > /dev/null 2>&1
+ /sbin/chkconfig --del puppetmaster
fi
%postun server
if [ "$1" -ge 1 ]; then
- /sbin/service puppetmaster try-restart > /dev/null 2>&1
+ /sbin/service puppetmaster try-restart > /dev/null 2>&1
fi
%clean
diff --git a/conf/suse/server.init b/conf/suse/server.init
index 34200af88..36a310784 100644
--- a/conf/suse/server.init
+++ b/conf/suse/server.init
@@ -36,15 +36,15 @@ pidfile=/var/run/puppet/puppetmasterd.pid
[ -f /etc/rc.status ] && . /etc/rc.status
if [ -f /etc/sysconfig/puppetmaster ]; then
- . /etc/sysconfig/puppetmaster
+ . /etc/sysconfig/puppetmaster
fi
[ -z "$PUPPETMASTER_MANIFEST" ] && PUPPETMASTER_MANIFEST=/etc/puppet/manifests/site.pp
[ -z "$PUPPETMASTER_LOG" ] && PUPPETMASTER_LOG="/var/log/puppet/puppetmaster.log"
PUPPETMASTER_OPTS="
- --manifest=$PUPPETMASTER_MANIFEST \
- --logdest=${PUPPETMASTER_LOG} \
- ${PUPPETMASTER_EXTRA_OPTS}"
+ --manifest=$PUPPETMASTER_MANIFEST \
+ --logdest=${PUPPETMASTER_LOG} \
+ ${PUPPETMASTER_EXTRA_OPTS}"
PUPPET_OPTS=""
[ -n "${PUPPET_SERVER}" ] && PUPPET_OPTS="--server=${PUPPET_SERVER}"
[ -n "$PUPPET_LOG" ] && PUPPET_OPTS="${PUPPET_OPTS} --logdest=${PUPPET_LOG}"
@@ -54,10 +54,10 @@ prog=puppetmasterd
PUPPETMASTER=/usr/sbin/$prog
start() {
- echo -n $"Starting puppetmaster: "
+ echo -n $"Starting puppetmaster: "
- echo
- return $RETVAL
+ echo
+ return $RETVAL
}
# First reset status of this service
rc_reset
@@ -84,13 +84,13 @@ case "$1" in
# startproc should return 0, even if service is
# already running to match LSB spec.
- # Confirm the manifest exists
- if [ -r $PUPPETMASTER_MANIFEST ]; then
- startproc $PUPPETMASTER $PUPPETMASTER_OPTS && touch "$lockfile"
- else
- rc_failed
- echo "Manifest does not exist: $PUPPETMASTER_MANIFEST"
- fi
+ # Confirm the manifest exists
+ if [ -r $PUPPETMASTER_MANIFEST ]; then
+ startproc $PUPPETMASTER $PUPPETMASTER_OPTS && touch "$lockfile"
+ else
+ rc_failed
+ echo "Manifest does not exist: $PUPPETMASTER_MANIFEST"
+ fi
# Remember status and be verbose
rc_status -v
;;
@@ -136,8 +136,8 @@ case "$1" in
## signalling, do nothing (!)
# If it supports signalling:
- echo -n "Reload puppet services."
- killproc -HUP $PUPPETMASTER
+ echo -n "Reload puppet services."
+ killproc -HUP $PUPPETMASTER
rc_status -v
;;
status)
diff --git a/examples/etc/init.d/sleeper b/examples/etc/init.d/sleeper
index 6da5eae32..63f7e9c2e 100755
--- a/examples/etc/init.d/sleeper
+++ b/examples/etc/init.d/sleeper
@@ -51,22 +51,22 @@ function status
case "$1" in
start)
start
- ;;
+ ;;
stop)
stop
- ;;
+ ;;
restart)
stop; start
- ;;
+ ;;
status)
output=`status`
#status
exit $?
- ;;
- *)
- echo "Usage: $N {start|stop|restart|force-reload}" >&2
- exit 1
- ;;
+ ;;
+ *)
+ echo "Usage: $N {start|stop|restart|force-reload}" >&2
+ exit 1
+ ;;
esac
exit 0
diff --git a/examples/mcx_dock_default.pp b/examples/mcx_dock_default.pp
index 1f65a7316..78d678956 100644
--- a/examples/mcx_dock_default.pp
+++ b/examples/mcx_dock_default.pp
@@ -4,114 +4,114 @@ mcx { '/Groups/mcx_dock':
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
- <key>com.apple.dock</key>
- <dict>
- <key>AppItems-Raw</key>
- <dict>
- <key>state</key>
- <string>always</string>
- <key>upk</key>
- <dict>
- <key>mcx_input_key_names</key>
- <array>
- <string>AppItems-Raw</string>
- </array>
- <key>mcx_output_key_name</key>
- <string>static-apps</string>
- <key>mcx_remove_duplicates</key>
- <true/>
- </dict>
- <key>value</key>
- <array>
- <dict>
- <key>mcx_typehint</key>
- <integer>1</integer>
- <key>tile-data</key>
- <dict>
- <key>file-data</key>
- <dict>
- <key>_CFURLString</key>
- <string>/Applications/Mail.app</string>
- <key>_CFURLStringType</key>
- <integer>0</integer>
- </dict>
- <key>file-label</key>
- <string>Mail</string>
- </dict>
- <key>tile-type</key>
- <string>file-tile</string>
- </dict>
- <dict>
- <key>mcx_typehint</key>
- <integer>1</integer>
- <key>tile-data</key>
- <dict>
- <key>file-data</key>
- <dict>
- <key>_CFURLString</key>
- <string>/Applications/Safari.app</string>
- <key>_CFURLStringType</key>
- <integer>0</integer>
- </dict>
- <key>file-label</key>
- <string>Safari</string>
- </dict>
- <key>tile-type</key>
- <string>file-tile</string>
- </dict>
- </array>
- </dict>
- <key>DocItems-Raw</key>
- <dict>
- <key>state</key>
- <string>always</string>
- <key>upk</key>
- <dict>
- <key>mcx_input_key_names</key>
- <array>
- <string>DocItems-Raw</string>
- </array>
- <key>mcx_output_key_name</key>
- <string>static-others</string>
- <key>mcx_remove_duplicates</key>
- <true/>
- </dict>
- <key>value</key>
- <array/>
- </dict>
- <key>MCXDockSpecialFolders-Raw</key>
- <dict>
- <key>state</key>
- <string>always</string>
- <key>upk</key>
- <dict>
- <key>mcx_input_key_names</key>
- <array>
- <string>MCXDockSpecialFolders-Raw</string>
- </array>
- <key>mcx_output_key_name</key>
- <string>MCXDockSpecialFolders</string>
- <key>mcx_remove_duplicates</key>
- <true/>
- </dict>
- <key>value</key>
- <array/>
- </dict>
- <key>contents-immutable</key>
- <dict>
- <key>state</key>
- <string>always</string>
- <key>value</key>
- <false/>
- </dict>
- <key>static-only</key>
- <dict>
- <key>state</key>
- <string>always</string>
- <key>value</key>
- <false/>
- </dict>
- </dict>
+ <key>com.apple.dock</key>
+ <dict>
+ <key>AppItems-Raw</key>
+ <dict>
+ <key>state</key>
+ <string>always</string>
+ <key>upk</key>
+ <dict>
+ <key>mcx_input_key_names</key>
+ <array>
+ <string>AppItems-Raw</string>
+ </array>
+ <key>mcx_output_key_name</key>
+ <string>static-apps</string>
+ <key>mcx_remove_duplicates</key>
+ <true/>
+ </dict>
+ <key>value</key>
+ <array>
+ <dict>
+ <key>mcx_typehint</key>
+ <integer>1</integer>
+ <key>tile-data</key>
+ <dict>
+ <key>file-data</key>
+ <dict>
+ <key>_CFURLString</key>
+ <string>/Applications/Mail.app</string>
+ <key>_CFURLStringType</key>
+ <integer>0</integer>
+ </dict>
+ <key>file-label</key>
+ <string>Mail</string>
+ </dict>
+ <key>tile-type</key>
+ <string>file-tile</string>
+ </dict>
+ <dict>
+ <key>mcx_typehint</key>
+ <integer>1</integer>
+ <key>tile-data</key>
+ <dict>
+ <key>file-data</key>
+ <dict>
+ <key>_CFURLString</key>
+ <string>/Applications/Safari.app</string>
+ <key>_CFURLStringType</key>
+ <integer>0</integer>
+ </dict>
+ <key>file-label</key>
+ <string>Safari</string>
+ </dict>
+ <key>tile-type</key>
+ <string>file-tile</string>
+ </dict>
+ </array>
+ </dict>
+ <key>DocItems-Raw</key>
+ <dict>
+ <key>state</key>
+ <string>always</string>
+ <key>upk</key>
+ <dict>
+ <key>mcx_input_key_names</key>
+ <array>
+ <string>DocItems-Raw</string>
+ </array>
+ <key>mcx_output_key_name</key>
+ <string>static-others</string>
+ <key>mcx_remove_duplicates</key>
+ <true/>
+ </dict>
+ <key>value</key>
+ <array/>
+ </dict>
+ <key>MCXDockSpecialFolders-Raw</key>
+ <dict>
+ <key>state</key>
+ <string>always</string>
+ <key>upk</key>
+ <dict>
+ <key>mcx_input_key_names</key>
+ <array>
+ <string>MCXDockSpecialFolders-Raw</string>
+ </array>
+ <key>mcx_output_key_name</key>
+ <string>MCXDockSpecialFolders</string>
+ <key>mcx_remove_duplicates</key>
+ <true/>
+ </dict>
+ <key>value</key>
+ <array/>
+ </dict>
+ <key>contents-immutable</key>
+ <dict>
+ <key>state</key>
+ <string>always</string>
+ <key>value</key>
+ <false/>
+ </dict>
+ <key>static-only</key>
+ <dict>
+ <key>state</key>
+ <string>always</string>
+ <key>value</key>
+ <false/>
+ </dict>
+ </dict>
</dict>
</plist>
'
diff --git a/examples/mcx_dock_full.pp b/examples/mcx_dock_full.pp
index 60760332a..4fbf508fa 100644
--- a/examples/mcx_dock_full.pp
+++ b/examples/mcx_dock_full.pp
@@ -11,114 +11,114 @@ mcx {
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
- <key>com.apple.dock</key>
- <dict>
- <key>AppItems-Raw</key>
- <dict>
- <key>state</key>
- <string>always</string>
- <key>upk</key>
- <dict>
- <key>mcx_input_key_names</key>
- <array>
- <string>AppItems-Raw</string>
- </array>
- <key>mcx_output_key_name</key>
- <string>static-apps</string>
- <key>mcx_remove_duplicates</key>
- <true/>
- </dict>
- <key>value</key>
- <array>
- <dict>
- <key>mcx_typehint</key>
- <integer>1</integer>
- <key>tile-data</key>
- <dict>
- <key>file-data</key>
- <dict>
- <key>_CFURLString</key>
- <string>/Applications/Mail.app</string>
- <key>_CFURLStringType</key>
- <integer>0</integer>
- </dict>
- <key>file-label</key>
- <string>Mail</string>
- </dict>
- <key>tile-type</key>
- <string>file-tile</string>
- </dict>
- <dict>
- <key>mcx_typehint</key>
- <integer>1</integer>
- <key>tile-data</key>
- <dict>
- <key>file-data</key>
- <dict>
- <key>_CFURLString</key>
- <string>/Applications/Safari.app</string>
- <key>_CFURLStringType</key>
- <integer>0</integer>
- </dict>
- <key>file-label</key>
- <string>Safari</string>
- </dict>
- <key>tile-type</key>
- <string>file-tile</string>
- </dict>
- </array>
- </dict>
- <key>DocItems-Raw</key>
- <dict>
- <key>state</key>
- <string>always</string>
- <key>upk</key>
- <dict>
- <key>mcx_input_key_names</key>
- <array>
- <string>DocItems-Raw</string>
- </array>
- <key>mcx_output_key_name</key>
- <string>static-others</string>
- <key>mcx_remove_duplicates</key>
- <true/>
- </dict>
- <key>value</key>
- <array/>
- </dict>
- <key>MCXDockSpecialFolders-Raw</key>
- <dict>
- <key>state</key>
- <string>always</string>
- <key>upk</key>
- <dict>
- <key>mcx_input_key_names</key>
- <array>
- <string>MCXDockSpecialFolders-Raw</string>
- </array>
- <key>mcx_output_key_name</key>
- <string>MCXDockSpecialFolders</string>
- <key>mcx_remove_duplicates</key>
- <true/>
- </dict>
- <key>value</key>
- <array/>
- </dict>
- <key>contents-immutable</key>
- <dict>
- <key>state</key>
- <string>always</string>
- <key>value</key>
- <false/>
- </dict>
- <key>static-only</key>
- <dict>
- <key>state</key>
- <string>always</string>
- <key>value</key>
- <false/>
- </dict>
- </dict>
+ <key>com.apple.dock</key>
+ <dict>
+ <key>AppItems-Raw</key>
+ <dict>
+ <key>state</key>
+ <string>always</string>
+ <key>upk</key>
+ <dict>
+ <key>mcx_input_key_names</key>
+ <array>
+ <string>AppItems-Raw</string>
+ </array>
+ <key>mcx_output_key_name</key>
+ <string>static-apps</string>
+ <key>mcx_remove_duplicates</key>
+ <true/>
+ </dict>
+ <key>value</key>
+ <array>
+ <dict>
+ <key>mcx_typehint</key>
+ <integer>1</integer>
+ <key>tile-data</key>
+ <dict>
+ <key>file-data</key>
+ <dict>
+ <key>_CFURLString</key>
+ <string>/Applications/Mail.app</string>
+ <key>_CFURLStringType</key>
+ <integer>0</integer>
+ </dict>
+ <key>file-label</key>
+ <string>Mail</string>
+ </dict>
+ <key>tile-type</key>
+ <string>file-tile</string>
+ </dict>
+ <dict>
+ <key>mcx_typehint</key>
+ <integer>1</integer>
+ <key>tile-data</key>
+ <dict>
+ <key>file-data</key>
+ <dict>
+ <key>_CFURLString</key>
+ <string>/Applications/Safari.app</string>
+ <key>_CFURLStringType</key>
+ <integer>0</integer>
+ </dict>
+ <key>file-label</key>
+ <string>Safari</string>
+ </dict>
+ <key>tile-type</key>
+ <string>file-tile</string>
+ </dict>
+ </array>
+ </dict>
+ <key>DocItems-Raw</key>
+ <dict>
+ <key>state</key>
+ <string>always</string>
+ <key>upk</key>
+ <dict>
+ <key>mcx_input_key_names</key>
+ <array>
+ <string>DocItems-Raw</string>
+ </array>
+ <key>mcx_output_key_name</key>
+ <string>static-others</string>
+ <key>mcx_remove_duplicates</key>
+ <true/>
+ </dict>
+ <key>value</key>
+ <array/>
+ </dict>
+ <key>MCXDockSpecialFolders-Raw</key>
+ <dict>
+ <key>state</key>
+ <string>always</string>
+ <key>upk</key>
+ <dict>
+ <key>mcx_input_key_names</key>
+ <array>
+ <string>MCXDockSpecialFolders-Raw</string>
+ </array>
+ <key>mcx_output_key_name</key>
+ <string>MCXDockSpecialFolders</string>
+ <key>mcx_remove_duplicates</key>
+ <true/>
+ </dict>
+ <key>value</key>
+ <array/>
+ </dict>
+ <key>contents-immutable</key>
+ <dict>
+ <key>state</key>
+ <string>always</string>
+ <key>value</key>
+ <false/>
+ </dict>
+ <key>static-only</key>
+ <dict>
+ <key>state</key>
+ <string>always</string>
+ <key>value</key>
+ <false/>
+ </dict>
+ </dict>
</dict>
</plist>
'
diff --git a/examples/mcx_nogroup.pp b/examples/mcx_nogroup.pp
index ea689f33c..67d20e605 100644
--- a/examples/mcx_nogroup.pp
+++ b/examples/mcx_nogroup.pp
@@ -4,114 +4,114 @@ mcx { '/Groups/doesnotexist':
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
- <key>com.apple.dock</key>
- <dict>
- <key>AppItems-Raw</key>
- <dict>
- <key>state</key>
- <string>always</string>
- <key>upk</key>
- <dict>
- <key>mcx_input_key_names</key>
- <array>
- <string>AppItems-Raw</string>
- </array>
- <key>mcx_output_key_name</key>
- <string>static-apps</string>
- <key>mcx_remove_duplicates</key>
- <true/>
- </dict>
- <key>value</key>
- <array>
- <dict>
- <key>mcx_typehint</key>
- <integer>1</integer>
- <key>tile-data</key>
- <dict>
- <key>file-data</key>
- <dict>
- <key>_CFURLString</key>
- <string>/Applications/Mail.app</string>
- <key>_CFURLStringType</key>
- <integer>0</integer>
- </dict>
- <key>file-label</key>
- <string>Mail</string>
- </dict>
- <key>tile-type</key>
- <string>file-tile</string>
- </dict>
- <dict>
- <key>mcx_typehint</key>
- <integer>1</integer>
- <key>tile-data</key>
- <dict>
- <key>file-data</key>
- <dict>
- <key>_CFURLString</key>
- <string>/Applications/Safari.app</string>
- <key>_CFURLStringType</key>
- <integer>0</integer>
- </dict>
- <key>file-label</key>
- <string>Safari</string>
- </dict>
- <key>tile-type</key>
- <string>file-tile</string>
- </dict>
- </array>
- </dict>
- <key>DocItems-Raw</key>
- <dict>
- <key>state</key>
- <string>always</string>
- <key>upk</key>
- <dict>
- <key>mcx_input_key_names</key>
- <array>
- <string>DocItems-Raw</string>
- </array>
- <key>mcx_output_key_name</key>
- <string>static-others</string>
- <key>mcx_remove_duplicates</key>
- <true/>
- </dict>
- <key>value</key>
- <array/>
- </dict>
- <key>MCXDockSpecialFolders-Raw</key>
- <dict>
- <key>state</key>
- <string>always</string>
- <key>upk</key>
- <dict>
- <key>mcx_input_key_names</key>
- <array>
- <string>MCXDockSpecialFolders-Raw</string>
- </array>
- <key>mcx_output_key_name</key>
- <string>MCXDockSpecialFolders</string>
- <key>mcx_remove_duplicates</key>
- <true/>
- </dict>
- <key>value</key>
- <array/>
- </dict>
- <key>contents-immutable</key>
- <dict>
- <key>state</key>
- <string>always</string>
- <key>value</key>
- <false/>
- </dict>
- <key>static-only</key>
- <dict>
- <key>state</key>
- <string>always</string>
- <key>value</key>
- <false/>
- </dict>
- </dict>
+ <key>com.apple.dock</key>
+ <dict>
+ <key>AppItems-Raw</key>
+ <dict>
+ <key>state</key>
+ <string>always</string>
+ <key>upk</key>
+ <dict>
+ <key>mcx_input_key_names</key>
+ <array>
+ <string>AppItems-Raw</string>
+ </array>
+ <key>mcx_output_key_name</key>
+ <string>static-apps</string>
+ <key>mcx_remove_duplicates</key>
+ <true/>
+ </dict>
+ <key>value</key>
+ <array>
+ <dict>
+ <key>mcx_typehint</key>
+ <integer>1</integer>
+ <key>tile-data</key>
+ <dict>
+ <key>file-data</key>
+ <dict>
+ <key>_CFURLString</key>
+ <string>/Applications/Mail.app</string>
+ <key>_CFURLStringType</key>
+ <integer>0</integer>
+ </dict>
+ <key>file-label</key>
+ <string>Mail</string>
+ </dict>
+ <key>tile-type</key>
+ <string>file-tile</string>
+ </dict>
+ <dict>
+ <key>mcx_typehint</key>
+ <integer>1</integer>
+ <key>tile-data</key>
+ <dict>
+ <key>file-data</key>
+ <dict>
+ <key>_CFURLString</key>
+ <string>/Applications/Safari.app</string>
+ <key>_CFURLStringType</key>
+ <integer>0</integer>
+ </dict>
+ <key>file-label</key>
+ <string>Safari</string>
+ </dict>
+ <key>tile-type</key>
+ <string>file-tile</string>
+ </dict>
+ </array>
+ </dict>
+ <key>DocItems-Raw</key>
+ <dict>
+ <key>state</key>
+ <string>always</string>
+ <key>upk</key>
+ <dict>
+ <key>mcx_input_key_names</key>
+ <array>
+ <string>DocItems-Raw</string>
+ </array>
+ <key>mcx_output_key_name</key>
+ <string>static-others</string>
+ <key>mcx_remove_duplicates</key>
+ <true/>
+ </dict>
+ <key>value</key>
+ <array/>
+ </dict>
+ <key>MCXDockSpecialFolders-Raw</key>
+ <dict>
+ <key>state</key>
+ <string>always</string>
+ <key>upk</key>
+ <dict>
+ <key>mcx_input_key_names</key>
+ <array>
+ <string>MCXDockSpecialFolders-Raw</string>
+ </array>
+ <key>mcx_output_key_name</key>
+ <string>MCXDockSpecialFolders</string>
+ <key>mcx_remove_duplicates</key>
+ <true/>
+ </dict>
+ <key>value</key>
+ <array/>
+ </dict>
+ <key>contents-immutable</key>
+ <dict>
+ <key>state</key>
+ <string>always</string>
+ <key>value</key>
+ <false/>
+ </dict>
+ <key>static-only</key>
+ <dict>
+ <key>state</key>
+ <string>always</string>
+ <key>value</key>
+ <false/>
+ </dict>
+ </dict>
</dict>
</plist>
'
diff --git a/examples/modules/sample-module/lib/puppet/parser/functions/hostname_to_dn.rb b/examples/modules/sample-module/lib/puppet/parser/functions/hostname_to_dn.rb
index 9f732b5bc..9dfa3f54c 100644
--- a/examples/modules/sample-module/lib/puppet/parser/functions/hostname_to_dn.rb
+++ b/examples/modules/sample-module/lib/puppet/parser/functions/hostname_to_dn.rb
@@ -30,7 +30,7 @@
# See: http://reductivelabs.com/trac/puppet/wiki/WritingYourOwnFunctions
module Puppet::Parser::Functions
- newfunction(:hostname_to_dn, :type => :rvalue, :doc => "Given 'foo.bar.com', return 'dc=foo,dc=bar,dc=com'.") do |args|
- args[0].split(/\./).map do |s| "dc=%s"%[s] end.join(",")
- end
+ newfunction(:hostname_to_dn, :type => :rvalue, :doc => "Given 'foo.bar.com', return 'dc=foo,dc=bar,dc=com'.") do |args|
+ args[0].split(/\./).map do |s| "dc=%s"%[s] end.join(",")
+ end
end
diff --git a/ext/bin/sleeper b/ext/bin/sleeper
index 980d66ac1..9837db2ec 100755
--- a/ext/bin/sleeper
+++ b/ext/bin/sleeper
@@ -38,20 +38,20 @@ end
debug = false
result = GetoptLong.new(
- [ "--debug", "-d", GetoptLong::NO_ARGUMENT ],
- [ "--help", "-h", GetoptLong::NO_ARGUMENT ]
+ [ "--debug", "-d", GetoptLong::NO_ARGUMENT ],
+ [ "--help", "-h", GetoptLong::NO_ARGUMENT ]
)
result.each { |opt,arg|
- case opt
- when "--help"
- puts "There is no help yet"
- exit
- when "--debug"
- debug = true
- else
- raise "Invalid option '#{opt}'"
- end
+ case opt
+ when "--help"
+ puts "There is no help yet"
+ exit
+ when "--debug"
+ debug = true
+ else
+ raise "Invalid option '#{opt}'"
+ end
}
trap(:INT) {
@@ -59,7 +59,7 @@ trap(:INT) {
}
unless debug
- daemonize()
+ daemonize()
end
# Sleep for no more than two minutes
diff --git a/ext/module_puppet b/ext/module_puppet
index 4ee273451..5834627e2 100755
--- a/ext/module_puppet
+++ b/ext/module_puppet
@@ -52,12 +52,12 @@ require 'puppet/network/client'
require 'getoptlong'
options = [
- [ "--debug", "-d", GetoptLong::NO_ARGUMENT ],
- [ "--help", "-h", GetoptLong::NO_ARGUMENT ],
- [ "--logdest", "-l", GetoptLong::REQUIRED_ARGUMENT ],
- [ "--verbose", "-v", GetoptLong::NO_ARGUMENT ],
- [ "--use-nodes", GetoptLong::NO_ARGUMENT ],
- [ "--version", "-V", GetoptLong::NO_ARGUMENT ]
+ [ "--debug", "-d", GetoptLong::NO_ARGUMENT ],
+ [ "--help", "-h", GetoptLong::NO_ARGUMENT ],
+ [ "--logdest", "-l", GetoptLong::REQUIRED_ARGUMENT ],
+ [ "--verbose", "-v", GetoptLong::NO_ARGUMENT ],
+ [ "--use-nodes", GetoptLong::NO_ARGUMENT ],
+ [ "--version", "-V", GetoptLong::NO_ARGUMENT ]
]
# Add all of the config parameters as valid options.
diff --git a/ext/nagios/naggen b/ext/nagios/naggen
index ffbd32ba2..6ff09e260 100755
--- a/ext/nagios/naggen
+++ b/ext/nagios/naggen
@@ -225,10 +225,10 @@ class NagiosWriter
end
arguments = [
- [ "--compare", "-c", GetoptLong::NO_ARGUMENT ],
- [ "--debug", "-d", GetoptLong::NO_ARGUMENT ],
- [ "--verbose", "-v", GetoptLong::NO_ARGUMENT ],
- [ "--help", "-h", GetoptLong::NO_ARGUMENT ]
+ [ "--compare", "-c", GetoptLong::NO_ARGUMENT ],
+ [ "--debug", "-d", GetoptLong::NO_ARGUMENT ],
+ [ "--verbose", "-v", GetoptLong::NO_ARGUMENT ],
+ [ "--help", "-h", GetoptLong::NO_ARGUMENT ]
]
Puppet.settings.addargs(arguments)
@@ -237,8 +237,8 @@ result = GetoptLong.new(*arguments)
$options = {}
result.each { |opt,arg|
- case opt
- when "--help"
+ case opt
+ when "--help"
begin
require 'rdoc/usage'
RDoc::usage && exit
@@ -264,9 +264,9 @@ result.each { |opt,arg|
$options[:debug] = true
when "--debug"
$options[:debug] = true
- else
+ else
Puppet.settings.handlearg(opt, arg)
- end
+ end
}
# Read in Puppet settings, so we know how Puppet's configured.
diff --git a/ext/puppet-test b/ext/puppet-test
index 3901cc801..bf6c2de39 100755
--- a/ext/puppet-test
+++ b/ext/puppet-test
@@ -408,21 +408,21 @@ end
$cmdargs = [
- [ "--compile", "-c", GetoptLong::NO_ARGUMENT ],
- [ "--describe", GetoptLong::REQUIRED_ARGUMENT ],
- [ "--retrieve", "-R", GetoptLong::REQUIRED_ARGUMENT ],
- [ "--fork", GetoptLong::REQUIRED_ARGUMENT ],
- [ "--fqdn", "-F", GetoptLong::REQUIRED_ARGUMENT ],
- [ "--suite", "-s", GetoptLong::REQUIRED_ARGUMENT ],
- [ "--test", "-t", GetoptLong::REQUIRED_ARGUMENT ],
- [ "--pause", "-p", GetoptLong::NO_ARGUMENT ],
- [ "--repeat", "-r", GetoptLong::REQUIRED_ARGUMENT ],
- [ "--node", "-n", GetoptLong::REQUIRED_ARGUMENT ],
- [ "--debug", "-d", GetoptLong::NO_ARGUMENT ],
- [ "--help", "-h", GetoptLong::NO_ARGUMENT ],
- [ "--list", "-l", GetoptLong::NO_ARGUMENT ],
- [ "--verbose", "-v", GetoptLong::NO_ARGUMENT ],
- [ "--version", "-V", GetoptLong::NO_ARGUMENT ],
+ [ "--compile", "-c", GetoptLong::NO_ARGUMENT ],
+ [ "--describe", GetoptLong::REQUIRED_ARGUMENT ],
+ [ "--retrieve", "-R", GetoptLong::REQUIRED_ARGUMENT ],
+ [ "--fork", GetoptLong::REQUIRED_ARGUMENT ],
+ [ "--fqdn", "-F", GetoptLong::REQUIRED_ARGUMENT ],
+ [ "--suite", "-s", GetoptLong::REQUIRED_ARGUMENT ],
+ [ "--test", "-t", GetoptLong::REQUIRED_ARGUMENT ],
+ [ "--pause", "-p", GetoptLong::NO_ARGUMENT ],
+ [ "--repeat", "-r", GetoptLong::REQUIRED_ARGUMENT ],
+ [ "--node", "-n", GetoptLong::REQUIRED_ARGUMENT ],
+ [ "--debug", "-d", GetoptLong::NO_ARGUMENT ],
+ [ "--help", "-h", GetoptLong::NO_ARGUMENT ],
+ [ "--list", "-l", GetoptLong::NO_ARGUMENT ],
+ [ "--verbose", "-v", GetoptLong::NO_ARGUMENT ],
+ [ "--version", "-V", GetoptLong::NO_ARGUMENT ],
]
# Add all of the config parameters as valid $options.
diff --git a/ext/puppetstoredconfigclean.rb b/ext/puppetstoredconfigclean.rb
index a96ec4faf..1b8354dae 100644
--- a/ext/puppetstoredconfigclean.rb
+++ b/ext/puppetstoredconfigclean.rb
@@ -11,36 +11,36 @@ require 'getoptlong'
config = '/etc/puppet/puppet.conf'
def printusage(error_code)
- puts "Usage: #{$0} [ list of hostnames as stored in hosts table ]"
- puts "\n Options:"
- puts "--config <puppet config file>"
- exit(error_code)
+ puts "Usage: #{$0} [ list of hostnames as stored in hosts table ]"
+ puts "\n Options:"
+ puts "--config <puppet config file>"
+ exit(error_code)
end
opts = GetoptLong.new(
- [ "--config", "-c", GetoptLong::REQUIRED_ARGUMENT ],
+ [ "--config", "-c", GetoptLong::REQUIRED_ARGUMENT ],
[ "--help", "-h", GetoptLong::NO_ARGUMENT ],
[ "--usage", "-u", GetoptLong::NO_ARGUMENT ],
[ "--version", "-v", GetoptLong::NO_ARGUMENT ]
)
begin
- opts.each do |opt, arg|
- case opt
- when "--config"
- config = arg
+ opts.each do |opt, arg|
+ case opt
+ when "--config"
+ config = arg
- when "--help"
- printusage(0)
+ when "--help"
+ printusage(0)
- when "--usage"
- printusage(0)
+ when "--usage"
+ printusage(0)
- when "--version"
- puts "%s" % Puppet.version
- exit
- end
- end
+ when "--version"
+ puts "%s" % Puppet.version
+ exit
+ end
+ end
rescue GetoptLong::InvalidOption => detail
$stderr.puts "Try '#{$0} --help'"
exit(1)
diff --git a/install.rb b/install.rb
index bc7df98b3..662cd0678 100755
--- a/install.rb
+++ b/install.rb
@@ -355,24 +355,24 @@ def build_man(bins)
end
def run_tests(test_list)
- begin
- require 'test/unit/ui/console/testrunner'
- $:.unshift "lib"
- test_list.each do |test|
- next if File.directory?(test)
- require test
- end
-
- tests = []
- ObjectSpace.each_object { |o| tests << o if o.kind_of?(Class) }
- tests.delete_if { |o| !o.ancestors.include?(Test::Unit::TestCase) }
- tests.delete_if { |o| o == Test::Unit::TestCase }
-
- tests.each { |test| Test::Unit::UI::Console::TestRunner.run(test) }
- $:.shift
- rescue LoadError
- puts "Missing testrunner library; skipping tests"
- end
+ begin
+ require 'test/unit/ui/console/testrunner'
+ $:.unshift "lib"
+ test_list.each do |test|
+ next if File.directory?(test)
+ require test
+ end
+
+ tests = []
+ ObjectSpace.each_object { |o| tests << o if o.kind_of?(Class) }
+ tests.delete_if { |o| !o.ancestors.include?(Test::Unit::TestCase) }
+ tests.delete_if { |o| o == Test::Unit::TestCase }
+
+ tests.each { |test| Test::Unit::UI::Console::TestRunner.run(test) }
+ $:.shift
+ rescue LoadError
+ puts "Missing testrunner library; skipping tests"
+ end
end
##
diff --git a/lib/puppet.rb b/lib/puppet.rb
index b216503c2..6e7aa2318 100644
--- a/lib/puppet.rb
+++ b/lib/puppet.rb
@@ -71,8 +71,8 @@ module Puppet
@@settings.setdefaults(section, hash)
end
- # configuration parameter access and stuff
- def self.[](param)
+ # configuration parameter access and stuff
+ def self.[](param)
case param
when :debug
if Puppet::Util::Log.level == :debug
@@ -83,12 +83,12 @@ module Puppet
else
return @@settings[param]
end
- end
+ end
- # configuration parameter access and stuff
- def self.[]=(param,value)
+ # configuration parameter access and stuff
+ def self.[]=(param,value)
@@settings[param] = value
- end
+ end
def self.clear
@@settings.clear
diff --git a/lib/puppet/external/dot.rb b/lib/puppet/external/dot.rb
index b94568c12..caeee21ca 100644
--- a/lib/puppet/external/dot.rb
+++ b/lib/puppet/external/dot.rb
@@ -229,7 +229,7 @@ module DOT
t + "]\n"
end
- end # class DOTNode
+ end # class DOTNode
# A subgraph element is the same to graph, but has another header in dot
# notation.
@@ -276,7 +276,7 @@ module DOT
hdr + options + nodes + t + "}\n"
end
- end # class DOTSubgraph
+ end # class DOTSubgraph
# This is a graph.
@@ -287,7 +287,7 @@ module DOT
@dot_string = 'digraph'
end
- end # class DOTDigraph
+ end # class DOTDigraph
# This is an edge.
@@ -314,7 +314,7 @@ module DOT
}.compact.join( "\n" ) + "\n" + t + "]\n"
end
- end # class DOTEdge
+ end # class DOTEdge
class DOTDirectedEdge < DOTEdge
diff --git a/lib/puppet/external/nagios.rb b/lib/puppet/external/nagios.rb
index 0dcae4c6d..d7f64d59b 100755
--- a/lib/puppet/external/nagios.rb
+++ b/lib/puppet/external/nagios.rb
@@ -27,24 +27,24 @@ module Nagios
NAGIOSVERSION
end
- class Config
- def Config.import(config)
-
- text = String.new
-
- File.open(config) { |file|
- file.each { |line|
- text += line
- }
- }
- parser = Nagios::Parser.new
- return parser.parse(text)
- end
-
- def Config.each
- Nagios::Object.objects.each { |object|
- yield object
- }
- end
- end
+ class Config
+ def Config.import(config)
+
+ text = String.new
+
+ File.open(config) { |file|
+ file.each { |line|
+ text += line
+ }
+ }
+ parser = Nagios::Parser.new
+ return parser.parse(text)
+ end
+
+ def Config.each
+ Nagios::Object.objects.each { |object|
+ yield object
+ }
+ end
+ end
end
diff --git a/lib/puppet/external/nagios/grammar.ry b/lib/puppet/external/nagios/grammar.ry
index 87c909280..dc203be5c 100644
--- a/lib/puppet/external/nagios/grammar.ry
+++ b/lib/puppet/external/nagios/grammar.ry
@@ -5,51 +5,51 @@ token DEFINE NAME STRING PARAM LCURLY RCURLY VALUE RETURN COMMENT INLINECOMMENT
rule
decls: decl { return val[0] if val[0] }
- | decls decl {
- if val[1].nil?
- result = val[0]
- else
- if val[0].nil?
- result = val[1]
- else
- result = [ val[0], val[1] ].flatten
- end
- end
- }
- ;
+ | decls decl {
+ if val[1].nil?
+ result = val[0]
+ else
+ if val[0].nil?
+ result = val[1]
+ else
+ result = [ val[0], val[1] ].flatten
+ end
+ end
+ }
+ ;
decl: object { result = [val[0]] }
- | RETURN { result = nil }
- | comment
- ;
-
+ | RETURN { result = nil }
+ | comment
+ ;
+
comment: COMMENT RETURN { result = nil }
- ;
+ ;
object: DEFINE NAME LCURLY RETURN vars RCURLY {
- result = Nagios::Base.create(val[1],val[4])
- }
- ;
+ result = Nagios::Base.create(val[1],val[4])
+ }
+ ;
vars: var
- | vars var {
- val[1].each {|p,v|
- val[0][p] = v
- }
- result = val[0]
- }
- ;
+ | vars var {
+ val[1].each {|p,v|
+ val[0][p] = v
+ }
+ result = val[0]
+ }
+ ;
var: PARAM VALUE icomment returns { result = {val[0],val[1]} }
- ;
+ ;
returns: RETURN
| returns RETURN
;
icomment: # nothing
- | INLINECOMMENT
- ;
+ | INLINECOMMENT
+ ;
end
@@ -58,61 +58,61 @@ end
class ::Nagios::Parser::SyntaxError < RuntimeError; end
def parse(src)
- @src = src
+ @src = src
- # state variables
- @invar = false
- @inobject = false
- @done = false
+ # state variables
+ @invar = false
+ @inobject = false
+ @done = false
- @line = 0
- @yydebug = true
+ @line = 0
+ @yydebug = true
do_parse
end
# The lexer. Very simple.
def token
- @src.sub!(/\A\n/,'')
- if $&
- @line += 1
- return [ :RETURN, "\n" ]
- end
-
- if @done
- return nil
- end
- yytext = String.new
-
-
- # remove comments from this line
- @src.sub!(/\A[ \t]*;.*\n/,"\n")
- if $&
- return [:INLINECOMMENT, ""]
- end
-
- @src.sub!(/\A#.*\n/,"\n")
- if $&
- return [:COMMENT, ""]
- end
-
- @src.sub!(/#.*/,'')
-
- if @src.length == 0
- @done = true
- return [false, '$']
- end
-
- if @invar
- @src.sub!(/\A[ \t]+/,'')
- @src.sub!(/\A([^;\n]+)(\n|;)/,'\2')
- if $1
- yytext += $1
- end
- @invar = false
- return [:VALUE, yytext]
- else
- @src.sub!(/\A[\t ]*(\S+)([\t ]*|$)/,'')
+ @src.sub!(/\A\n/,'')
+ if $&
+ @line += 1
+ return [ :RETURN, "\n" ]
+ end
+
+ if @done
+ return nil
+ end
+ yytext = String.new
+
+
+ # remove comments from this line
+ @src.sub!(/\A[ \t]*;.*\n/,"\n")
+ if $&
+ return [:INLINECOMMENT, ""]
+ end
+
+ @src.sub!(/\A#.*\n/,"\n")
+ if $&
+ return [:COMMENT, ""]
+ end
+
+ @src.sub!(/#.*/,'')
+
+ if @src.length == 0
+ @done = true
+ return [false, '$']
+ end
+
+ if @invar
+ @src.sub!(/\A[ \t]+/,'')
+ @src.sub!(/\A([^;\n]+)(\n|;)/,'\2')
+ if $1
+ yytext += $1
+ end
+ @invar = false
+ return [:VALUE, yytext]
+ else
+ @src.sub!(/\A[\t ]*(\S+)([\t ]*|$)/,'')
if $1
yytext = $1
case yytext
@@ -152,11 +152,11 @@ def token
end
end
end
- end
+ end
end
def next_token
- token
+ token
end
def yydebug
@@ -168,18 +168,18 @@ def yywrap
end
def on_error(token, value, vstack )
- msg = ""
- unless value.nil?
- msg = "line #{@line}: syntax error at '#{value}'"
- else
- msg = "line #{@line}: syntax error at '#{token}'"
- end
- unless @src.size > 0
- msg = "line #{@line}: Unexpected end of file"
- end
- if token == '$end'.intern
- puts "okay, this is silly"
- else
- raise ::Nagios::Parser::SyntaxError, msg
- end
+ msg = ""
+ unless value.nil?
+ msg = "line #{@line}: syntax error at '#{value}'"
+ else
+ msg = "line #{@line}: syntax error at '#{token}'"
+ end
+ unless @src.size > 0
+ msg = "line #{@line}: Unexpected end of file"
+ end
+ if token == '$end'.intern
+ puts "okay, this is silly"
+ else
+ raise ::Nagios::Parser::SyntaxError, msg
+ end
end
diff --git a/lib/puppet/parser/functions/regsubst.rb b/lib/puppet/parser/functions/regsubst.rb
index 2bd39200d..8a1a244ab 100644
--- a/lib/puppet/parser/functions/regsubst.rb
+++ b/lib/puppet/parser/functions/regsubst.rb
@@ -1,6 +1,6 @@
module Puppet::Parser::Functions
newfunction(:regsubst, :type => :rvalue,
- :doc => "
+ :doc => "
Perform regexp replacement on a string.
- **Parameters** (in order):
@@ -36,36 +36,36 @@ Put angle brackets around each octet in the node's IP address::
$x = regsubst($ipaddress, '([0-9]+)', '<\\1>', 'G')
") \
do |args|
- flag_mapping = {
- "E" => Regexp::EXTENDED,
- "I" => Regexp::IGNORECASE,
- "M" => Regexp::MULTILINE,
- }
- if args.length < 3 or args.length > 5
- raise Puppet::ParseError, ("regsub(): wrong number of arguments" +
- " (#{args.length}; min 3, max 5)")
- end
- str, regexp, replacement, flags, lang = args
- reflags = 0
- global = false
- (flags or "").each_byte do |f|
- f = f.chr
- if f == "G"
- global = true
- else
- fvalue = flag_mapping[f]
- if !fvalue
- raise Puppet::ParseError, "regsub(): bad flag `#{f}'"
- end
- reflags |= fvalue
- end
- end
- re = Regexp.compile(regexp, reflags, lang)
- if global
- result = str.gsub(re, replacement)
- else
- result = str.sub(re, replacement)
- end
- return result
+ flag_mapping = {
+ "E" => Regexp::EXTENDED,
+ "I" => Regexp::IGNORECASE,
+ "M" => Regexp::MULTILINE,
+ }
+ if args.length < 3 or args.length > 5
+ raise Puppet::ParseError, ("regsub(): wrong number of arguments" +
+ " (#{args.length}; min 3, max 5)")
+ end
+ str, regexp, replacement, flags, lang = args
+ reflags = 0
+ global = false
+ (flags or "").each_byte do |f|
+ f = f.chr
+ if f == "G"
+ global = true
+ else
+ fvalue = flag_mapping[f]
+ if !fvalue
+ raise Puppet::ParseError, "regsub(): bad flag `#{f}'"
+ end
+ reflags |= fvalue
+ end
+ end
+ re = Regexp.compile(regexp, reflags, lang)
+ if global
+ result = str.gsub(re, replacement)
+ else
+ result = str.sub(re, replacement)
+ end
+ return result
end
end
diff --git a/lib/puppet/parser/functions/sprintf.rb b/lib/puppet/parser/functions/sprintf.rb
index f6daeff49..d84b1866a 100644
--- a/lib/puppet/parser/functions/sprintf.rb
+++ b/lib/puppet/parser/functions/sprintf.rb
@@ -1,12 +1,12 @@
module Puppet::Parser::Functions
newfunction(:sprintf, :type => :rvalue,
- :doc => "Perform printf-style formatting of text.
+ :doc => "Perform printf-style formatting of text.
The first parameter is format string describing how the rest of the parameters should be formatted. See the documentation for the ``Kernel::sprintf()`` function in Ruby for all the details.") do |args|
- if args.length < 1
- raise Puppet::ParseError, 'sprintf() needs at least one argument'
- end
- fmt = args.shift()
- return sprintf(fmt, *args)
+ if args.length < 1
+ raise Puppet::ParseError, 'sprintf() needs at least one argument'
+ end
+ fmt = args.shift()
+ return sprintf(fmt, *args)
end
end
diff --git a/lib/puppet/provider/package/appdmg.rb b/lib/puppet/provider/package/appdmg.rb
index ee8726cbc..4b9730c1c 100644
--- a/lib/puppet/provider/package/appdmg.rb
+++ b/lib/puppet/provider/package/appdmg.rb
@@ -20,7 +20,7 @@ Puppet::Type.type(:package).provide(:appdmg, :parent => Puppet::Provider::Packag
commands :hdiutil => "/usr/bin/hdiutil"
commands :curl => "/usr/bin/curl"
commands :ditto => "/usr/bin/ditto"
-
+
# JJM We store a cookie for each installed .app.dmg in /var/db
def self.instances_by_name
Dir.entries("/var/db").find_all { |f|
@@ -40,7 +40,7 @@ Puppet::Type.type(:package).provide(:appdmg, :parent => Puppet::Provider::Packag
def self.installapp(source, name, orig_source)
appname = File.basename(source);
- ditto "--rsrc", source, "/Applications/#{appname}"
+ ditto "--rsrc", source, "/Applications/#{appname}"
File.open("/var/db/.puppet_appdmg_installed_#{name}", "w") do |t|
t.print "name: '#{name}'\n"
t.print "source: '#{orig_source}'\n"
@@ -77,9 +77,9 @@ Puppet::Type.type(:package).provide(:appdmg, :parent => Puppet::Provider::Packag
mounts.each do |fspath|
Dir.entries(fspath).select { |f|
f =~ /\.app$/i
- }.each do |pkg|
- installapp("#{fspath}/#{pkg}", name, source)
- end
+ }.each do |pkg|
+ installapp("#{fspath}/#{pkg}", name, source)
+ end
end # mounts.each do
ensure
hdiutil "eject", mounts[0]
diff --git a/lib/puppet/provider/package/apt.rb b/lib/puppet/provider/package/apt.rb
index a99ee4c57..ee645242e 100755
--- a/lib/puppet/provider/package/apt.rb
+++ b/lib/puppet/provider/package/apt.rb
@@ -85,9 +85,9 @@ Puppet::Type.type(:package).provide :apt, :parent => :dpkg, :source => :dpkg do
end
end
- #
- # preseeds answers to dpkg-set-selection from the "responsefile"
- #
+ #
+ # preseeds answers to dpkg-set-selection from the "responsefile"
+ #
def run_preseed
if response = @resource[:responsefile] and FileTest.exist?(response)
self.info("Preseeding %s to debconf-set-selections" % response)
diff --git a/lib/puppet/provider/package/aptitude.rb b/lib/puppet/provider/package/aptitude.rb
index 699df0e51..0842856c1 100755
--- a/lib/puppet/provider/package/aptitude.rb
+++ b/lib/puppet/provider/package/aptitude.rb
@@ -26,6 +26,6 @@ Puppet::Type.type(:package).provide :aptitude, :parent => :apt, :source => :dpkg
def purge
aptitude '-y', 'purge', @resource[:name]
- end
+ end
end
diff --git a/lib/puppet/provider/package/fink.rb b/lib/puppet/provider/package/fink.rb
index 4d560666b..1a779f083 100755
--- a/lib/puppet/provider/package/fink.rb
+++ b/lib/puppet/provider/package/fink.rb
@@ -56,9 +56,9 @@ Puppet::Type.type(:package).provide :fink, :parent => :dpkg, :source => :dpkg do
end
end
- #
- # preseeds answers to dpkg-set-selection from the "responsefile"
- #
+ #
+ # preseeds answers to dpkg-set-selection from the "responsefile"
+ #
def run_preseed
if response = @resource[:responsefile] and FileTest.exists?(response)
self.info("Preseeding %s to debconf-set-selections" % response)
diff --git a/lib/puppet/provider/package/portage.rb b/lib/puppet/provider/package/portage.rb
index ae7194f89..4a09a2385 100644
--- a/lib/puppet/provider/package/portage.rb
+++ b/lib/puppet/provider/package/portage.rb
@@ -100,7 +100,7 @@ Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Packa
case packages.size
when 0
- not_found_value = "%s/%s" % [@resource[:category] ? @resource[:category] : "<unspecified category>", @resource[:name]]
+ not_found_value = "%s/%s" % [@resource[:category] ? @resource[:category] : "<unspecified category>", @resource[:name]]
raise Puppet::Error.new("No package found with the specified name [#{not_found_value}]")
when 1
return packages[0]
diff --git a/lib/puppet/provider/package/yumhelper.py b/lib/puppet/provider/package/yumhelper.py
index 6263d3473..7d73cdd23 100644
--- a/lib/puppet/provider/package/yumhelper.py
+++ b/lib/puppet/provider/package/yumhelper.py
@@ -43,7 +43,7 @@ def pkg_lists(my):
# Yum 2.2/2.3 python libraries require a couple of extra function calls to setup package sacks.
# They also don't have a __version__ attribute
try:
- yumver = yum.__version__
+ yumver = yum.__version__
except AttributeError:
my.doRepoSetup()
my.doSackSetup()
diff --git a/lib/puppet/provider/service/redhat.rb b/lib/puppet/provider/service/redhat.rb
index f31903e84..02ff96b2a 100755
--- a/lib/puppet/provider/service/redhat.rb
+++ b/lib/puppet/provider/service/redhat.rb
@@ -37,7 +37,7 @@ Puppet::Type.type(:service).provide :redhat, :parent => :init do
if output =~ /.* off$/
return :false
end
-
+
return :true
end
diff --git a/lib/puppet/provider/user/hpux.rb b/lib/puppet/provider/user/hpux.rb
index 672b77da6..76549ec69 100644
--- a/lib/puppet/provider/user/hpux.rb
+++ b/lib/puppet/provider/user/hpux.rb
@@ -20,11 +20,11 @@ Puppet::Type.type(:user).provide :hpuxuseradd, :parent => :useradd do
has_features :manages_homedir, :allows_duplicates
def deletecmd
- super.insert(1,"-F")
+ super.insert(1,"-F")
end
def modifycmd(param,value)
- super.insert(1,"-F")
+ super.insert(1,"-F")
end
end
diff --git a/lib/puppet/sslcertificates.rb b/lib/puppet/sslcertificates.rb
index 5155b3d5b..fb5c1b749 100755
--- a/lib/puppet/sslcertificates.rb
+++ b/lib/puppet/sslcertificates.rb
@@ -93,7 +93,7 @@ module Puppet::SSLCertificates
ex << ef.create_extension("keyUsage", key_usage.join(",")) if key_usage
ex << ef.create_extension("extendedKeyUsage", ext_key_usage.join(",")) if ext_key_usage
- ex << ef.create_extension("subjectAltName", subject_alt_name.join(",")) if ! subject_alt_name.empty?
+ ex << ef.create_extension("subjectAltName", subject_alt_name.join(",")) if ! subject_alt_name.empty?
#if @ca_config[:cdp_location] then
# ex << ef.create_extension("crlDistributionPoints",
diff --git a/lib/puppet/type.rb b/lib/puppet/type.rb
index 99ac909cd..320f82f0c 100644
--- a/lib/puppet/type.rb
+++ b/lib/puppet/type.rb
@@ -1397,7 +1397,7 @@ class Type
subscribe => File[nagconf]
}
}
-
+
Currently the ``exec``, ``mount`` and ``service`` type support
refreshing.
"
diff --git a/lib/puppet/type/file/target.rb b/lib/puppet/type/file/target.rb
index 1d85e05bc..73787c7e9 100644
--- a/lib/puppet/type/file/target.rb
+++ b/lib/puppet/type/file/target.rb
@@ -45,7 +45,7 @@ module Puppet
end
end
- @resource.send(:property_fix)
+ @resource.send(:property_fix)
:link_created
end
diff --git a/lib/puppet/type/mount.rb b/lib/puppet/type/mount.rb
index bb488c275..2ceacb3fe 100755
--- a/lib/puppet/type/mount.rb
+++ b/lib/puppet/type/mount.rb
@@ -4,7 +4,7 @@ module Puppet
@doc = "Manages mounted filesystems, including putting mount
information into the mount table. The actual behavior depends
on the value of the 'ensure' parameter.
-
+
Note that if a ``mount`` receives an event from another resource,
it will try to remount the filesystems if ``ensure`` is set to ``mounted``."
diff --git a/lib/puppet/type/service.rb b/lib/puppet/type/service.rb
index 894cf6c7e..b296f7c39 100644
--- a/lib/puppet/type/service.rb
+++ b/lib/puppet/type/service.rb
@@ -16,7 +16,7 @@ module Puppet
command matching the service name), but the more information you
can provide the better behaviour you will get. Or, you can just
use a platform that has very good service support.
-
+
Note that if a ``service`` receives an event from another resource,
the service will get restarted. The actual command to restart the
service depends on the platform. You can provide a special command
diff --git a/lib/puppet/type/tidy.rb b/lib/puppet/type/tidy.rb
index 5eb23f2b8..d9469aee4 100755
--- a/lib/puppet/type/tidy.rb
+++ b/lib/puppet/type/tidy.rb
@@ -21,9 +21,9 @@ Puppet::Type.newtype(:tidy) do
newparam(:matches) do
desc "One or more (shell type) file glob patterns, which restrict
- the list of files to be tidied to those whose basenames match
- at least one of the patterns specified. Multiple patterns can
- be specified using an array.
+ the list of files to be tidied to those whose basenames match
+ at least one of the patterns specified. Multiple patterns can
+ be specified using an array.
Example::
diff --git a/lib/puppet/util.rb b/lib/puppet/util.rb
index f8a872122..fc9f36083 100644
--- a/lib/puppet/util.rb
+++ b/lib/puppet/util.rb
@@ -320,7 +320,7 @@ module Util
exit!(1)
end # begin; rescue
end # if child_pid
-
+
# read output in if required
if ! arguments[:squelch]
diff --git a/lib/puppet/util/log.rb b/lib/puppet/util/log.rb
index db6177be2..8f8d46097 100644
--- a/lib/puppet/util/log.rb
+++ b/lib/puppet/util/log.rb
@@ -253,21 +253,21 @@ class Puppet::Util::Log
newdesttype :console do
- RED = {:console => "", :html => "FFA0A0"}
- GREEN = {:console => "", :html => "00CD00"}
- YELLOW = {:console => "", :html => "FFFF60"}
- BLUE = {:console => "", :html => "80A0FF"}
- PURPLE = {:console => "", :html => "FFA500"}
- CYAN = {:console => "", :html => "40FFFF"}
- WHITE = {:console => "", :html => "FFFFFF"}
- HRED = {:console => "", :html => "FFA0A0"}
- HGREEN = {:console => "", :html => "00CD00"}
- HYELLOW = {:console => "", :html => "FFFF60"}
- HBLUE = {:console => "", :html => "80A0FF"}
- HPURPLE = {:console => "", :html => "FFA500"}
- HCYAN = {:console => "", :html => "40FFFF"}
- HWHITE = {:console => "", :html => "FFFFFF"}
- RESET = {:console => "", :html => ""}
+ RED = {:console => "", :html => "FFA0A0"}
+ GREEN = {:console => "", :html => "00CD00"}
+ YELLOW = {:console => "", :html => "FFFF60"}
+ BLUE = {:console => "", :html => "80A0FF"}
+ PURPLE = {:console => "", :html => "FFA500"}
+ CYAN = {:console => "", :html => "40FFFF"}
+ WHITE = {:console => "", :html => "FFFFFF"}
+ HRED = {:console => "", :html => "FFA0A0"}
+ HGREEN = {:console => "", :html => "00CD00"}
+ HYELLOW = {:console => "", :html => "FFFF60"}
+ HBLUE = {:console => "", :html => "80A0FF"}
+ HPURPLE = {:console => "", :html => "FFA500"}
+ HCYAN = {:console => "", :html => "40FFFF"}
+ HWHITE = {:console => "", :html => "FFFFFF"}
+ RESET = {:console => "", :html => "" }
@@colormap = {
:debug => WHITE,
diff --git a/lib/puppet/util/pidlock.rb b/lib/puppet/util/pidlock.rb
index fae8134a5..d24b8378e 100644
--- a/lib/puppet/util/pidlock.rb
+++ b/lib/puppet/util/pidlock.rb
@@ -1,68 +1,68 @@
require 'fileutils'
class Puppet::Util::Pidlock
- attr_reader :lockfile
-
- def initialize(lockfile)
- @lockfile = lockfile
- end
-
- def locked?
- clear_if_stale
- File.exists? @lockfile
- end
-
- def mine?
- Process.pid == lock_pid
- end
+ attr_reader :lockfile
- def anonymous?
- return false unless File.exists?(@lockfile)
- File.read(@lockfile) == ""
- end
-
- def lock(opts = {})
- opts = {:anonymous => false}.merge(opts)
+ def initialize(lockfile)
+ @lockfile = lockfile
+ end
- if locked?
- mine?
- else
- if opts[:anonymous]
- File.open(@lockfile, 'w') { |fd| true }
- else
- File.open(@lockfile, "w") { |fd| fd.write(Process.pid) }
- end
- true
- end
- end
-
- def unlock(opts = {})
- opts = {:anonymous => false}.merge(opts)
+ def locked?
+ clear_if_stale
+ File.exists? @lockfile
+ end
- if mine? or (opts[:anonymous] and anonymous?)
- File.unlink(@lockfile)
- true
- else
- false
- end
- end
+ def mine?
+ Process.pid == lock_pid
+ end
- private
- def lock_pid
- if File.exists? @lockfile
- File.read(@lockfile).to_i
- else
- nil
- end
- end
+ def anonymous?
+ return false unless File.exists?(@lockfile)
+ File.read(@lockfile) == ""
+ end
- def clear_if_stale
- return if lock_pid.nil?
-
- begin
- Process.kill(0, lock_pid)
- rescue Errno::ESRCH
- File.unlink(@lockfile)
- end
- end
+ def lock(opts = {})
+ opts = {:anonymous => false}.merge(opts)
+
+ if locked?
+ mine?
+ else
+ if opts[:anonymous]
+ File.open(@lockfile, 'w') { |fd| true }
+ else
+ File.open(@lockfile, "w") { |fd| fd.write(Process.pid) }
+ end
+ true
+ end
+ end
+
+ def unlock(opts = {})
+ opts = {:anonymous => false}.merge(opts)
+
+ if mine? or (opts[:anonymous] and anonymous?)
+ File.unlink(@lockfile)
+ true
+ else
+ false
+ end
+ end
+
+ private
+ def lock_pid
+ if File.exists? @lockfile
+ File.read(@lockfile).to_i
+ else
+ nil
+ end
+ end
+
+ def clear_if_stale
+ return if lock_pid.nil?
+
+ begin
+ Process.kill(0, lock_pid)
+ rescue Errno::ESRCH
+ File.unlink(@lockfile)
+ end
+ end
end
diff --git a/spec/unit/other/selinux.rb b/spec/unit/other/selinux.rb
index 81ae9e9b9..3e39afcdd 100644
--- a/spec/unit/other/selinux.rb
+++ b/spec/unit/other/selinux.rb
@@ -6,80 +6,80 @@ require 'puppet/type/selboolean'
require 'puppet/type/selmodule'
describe Puppet::Type.type(:file), " when manipulating file contexts" do
- before :each do
- @file = Puppet::Type::File.new(
- :name => "/tmp/foo",
- :ensure => "file",
- :seluser => "user_u",
- :selrole => "role_r",
- :seltype => "type_t" )
- end
- it "should use :seluser to get/set an SELinux user file context attribute" do
- @file.property(:seluser).should == "user_u"
- end
- it "should use :selrole to get/set an SELinux role file context attribute" do
- @file.property(:selrole).should == "role_r"
- end
- it "should use :seltype to get/set an SELinux user file context attribute" do
- @file.property(:seltype).should == "type_t"
- end
+ before :each do
+ @file = Puppet::Type::File.new(
+ :name => "/tmp/foo",
+ :ensure => "file",
+ :seluser => "user_u",
+ :selrole => "role_r",
+ :seltype => "type_t" )
+ end
+ it "should use :seluser to get/set an SELinux user file context attribute" do
+ @file.property(:seluser).should == "user_u"
+ end
+ it "should use :selrole to get/set an SELinux role file context attribute" do
+ @file.property(:selrole).should == "role_r"
+ end
+ it "should use :seltype to get/set an SELinux user file context attribute" do
+ @file.property(:seltype).should == "type_t"
+ end
end
describe Puppet::Type.type(:selboolean), " when manipulating booleans" do
- before :each do
+ before :each do
provider_class = Puppet::Type::Selboolean.provider(Puppet::Type::Selboolean.providers[0])
- Puppet::Type::Selboolean.expects(:defaultprovider).returns provider_class
+ Puppet::Type::Selboolean.expects(:defaultprovider).returns provider_class
- @bool = Puppet::Type::Selboolean.new(
- :name => "foo",
- :value => "on",
- :persistent => true )
- end
- it "should be able to access :name" do
- @bool[:name].should == "foo"
- end
- it "should be able to access :value" do
- @bool.property(:value).should == :on
- end
- it "should set :value to off" do
- @bool[:value] = :off
- @bool.property(:value).should == :off
- end
- it "should be able to access :persistent" do
- @bool[:persistent].should == :true
- end
- it "should set :persistent to false" do
- @bool[:persistent] = false
- @bool[:persistent].should == :false
- end
+ @bool = Puppet::Type::Selboolean.new(
+ :name => "foo",
+ :value => "on",
+ :persistent => true )
+ end
+ it "should be able to access :name" do
+ @bool[:name].should == "foo"
+ end
+ it "should be able to access :value" do
+ @bool.property(:value).should == :on
+ end
+ it "should set :value to off" do
+ @bool[:value] = :off
+ @bool.property(:value).should == :off
+ end
+ it "should be able to access :persistent" do
+ @bool[:persistent].should == :true
+ end
+ it "should set :persistent to false" do
+ @bool[:persistent] = false
+ @bool[:persistent].should == :false
+ end
end
describe Puppet::Type.type(:selmodule), " when checking policy modules" do
- before :each do
+ before :each do
provider_class = Puppet::Type::Selmodule.provider(Puppet::Type::Selmodule.providers[0])
- Puppet::Type::Selmodule.expects(:defaultprovider).returns provider_class
+ Puppet::Type::Selmodule.expects(:defaultprovider).returns provider_class
- @module = Puppet::Type::Selmodule.new(
- :name => "foo",
- :selmoduledir => "/some/path",
- :selmodulepath => "/some/path/foo.pp",
- :syncversion => true)
- end
- it "should be able to access :name" do
- @module[:name].should == "foo"
- end
- it "should be able to access :selmoduledir" do
- @module[:selmoduledir].should == "/some/path"
- end
- it "should be able to access :selmodulepath" do
- @module[:selmodulepath].should == "/some/path/foo.pp"
- end
- it "should be able to access :syncversion" do
- @module.property(:syncversion).should == :true
- end
- it "should set the syncversion value to false" do
- @module[:syncversion] = :false
- @module.property(:syncversion).should == :false
- end
+ @module = Puppet::Type::Selmodule.new(
+ :name => "foo",
+ :selmoduledir => "/some/path",
+ :selmodulepath => "/some/path/foo.pp",
+ :syncversion => true)
+ end
+ it "should be able to access :name" do
+ @module[:name].should == "foo"
+ end
+ it "should be able to access :selmoduledir" do
+ @module[:selmoduledir].should == "/some/path"
+ end
+ it "should be able to access :selmodulepath" do
+ @module[:selmodulepath].should == "/some/path/foo.pp"
+ end
+ it "should be able to access :syncversion" do
+ @module.property(:syncversion).should == :true
+ end
+ it "should set the syncversion value to false" do
+ @module[:syncversion] = :false
+ @module.property(:syncversion).should == :false
+ end
end
diff --git a/spec/unit/parser/ast/arithmetic_operator.rb b/spec/unit/parser/ast/arithmetic_operator.rb
index ce6d42faf..9c1ff864e 100755
--- a/spec/unit/parser/ast/arithmetic_operator.rb
+++ b/spec/unit/parser/ast/arithmetic_operator.rb
@@ -4,7 +4,7 @@ require File.dirname(__FILE__) + '/../../../spec_helper'
describe Puppet::Parser::AST::ArithmeticOperator do
- ast = Puppet::Parser::AST
+ ast = Puppet::Parser::AST
before :each do
@scope = Puppet::Parser::Scope.new()
@@ -27,24 +27,24 @@ describe Puppet::Parser::AST::ArithmeticOperator do
end
it "should call Puppet::Parser::Scope.number?" do
- Puppet::Parser::Scope.expects(:number?).with(1).returns(1)
- Puppet::Parser::Scope.expects(:number?).with(2).returns(2)
-
+ Puppet::Parser::Scope.expects(:number?).with(1).returns(1)
+ Puppet::Parser::Scope.expects(:number?).with(2).returns(2)
+
ast::ArithmeticOperator.new(:lval => @one, :operator => "+", :rval => @two).evaluate(@scope)
end
- %w{ + - * / << >>}.each do |op|
- it "should call ruby Numeric '#{op}'" do
- one = stub 'one'
- two = stub 'two'
- operator = ast::ArithmeticOperator.new :lval => @one, :operator => op, :rval => @two
- Puppet::Parser::Scope.stubs(:number?).with(1).returns(one)
- Puppet::Parser::Scope.stubs(:number?).with(2).returns(two)
- one.expects(:send).with(op,two)
- operator.evaluate(@scope)
- end
- end
+ %w{ + - * / << >>}.each do |op|
+ it "should call ruby Numeric '#{op}'" do
+ one = stub 'one'
+ two = stub 'two'
+ operator = ast::ArithmeticOperator.new :lval => @one, :operator => op, :rval => @two
+ Puppet::Parser::Scope.stubs(:number?).with(1).returns(one)
+ Puppet::Parser::Scope.stubs(:number?).with(2).returns(two)
+ one.expects(:send).with(op,two)
+ operator.evaluate(@scope)
+ end
+ end
it "should work even with numbers embedded in strings" do
two = stub 'two', :safeevaluate => "2"
diff --git a/spec/unit/parser/ast/boolean_operator.rb b/spec/unit/parser/ast/boolean_operator.rb
index 98e173bf0..13f5e6530 100755
--- a/spec/unit/parser/ast/boolean_operator.rb
+++ b/spec/unit/parser/ast/boolean_operator.rb
@@ -16,7 +16,7 @@ describe Puppet::Parser::AST::BooleanOperator do
lval = stub "lval"
lval.expects(:safeevaluate).with(@scope).returns("true")
rval = stub "rval", :safeevaluate => false
- rval.expects(:safeevaluate).never
+ rval.expects(:safeevaluate).never
operator = ast::BooleanOperator.new :rval => rval, :operator => "or", :lval => lval
operator.evaluate(@scope)
diff --git a/spec/unit/parser/functions/regsubst.rb b/spec/unit/parser/functions/regsubst.rb
index 18f49f7d4..0e80ec798 100644
--- a/spec/unit/parser/functions/regsubst.rb
+++ b/spec/unit/parser/functions/regsubst.rb
@@ -14,75 +14,75 @@ describe "the regsubst function" do
it "should raise a ParseError if there is less than 3 arguments" do
lambda { @scope.function_regsubst(["foo", "bar"]) }.should(
- raise_error(Puppet::ParseError))
+ raise_error(Puppet::ParseError))
end
it "should raise a ParseError if there is more than 5 arguments" do
lambda { @scope.function_regsubst(["foo", "bar", "gazonk", "del", "x", "y"]) }.should(
- raise_error(Puppet::ParseError))
+ raise_error(Puppet::ParseError))
end
it "should raise a ParseError when given a bad flag" do
lambda { @scope.function_regsubst(["foo", "bar", "gazonk", "X"]) }.should(
- raise_error(Puppet::ParseError))
+ raise_error(Puppet::ParseError))
end
it "should handle groups" do
- result = @scope.function_regsubst(
- [ '130.236.254.10',
- '^([0-9]+)[.]([0-9]+)[.]([0-9]+)[.]([0-9]+)$',
- '\4-\3-\2-\1'
- ])
- result.should(eql("10-254-236-130"))
+ result = @scope.function_regsubst(
+ [ '130.236.254.10',
+ '^([0-9]+)[.]([0-9]+)[.]([0-9]+)[.]([0-9]+)$',
+ '\4-\3-\2-\1'
+ ])
+ result.should(eql("10-254-236-130"))
end
it "should handle simple regexps" do
- result = @scope.function_regsubst(
- [ "the monkey breaks banana trees",
- "b[an]*a",
- "coconut"
- ])
- result.should(eql("the monkey breaks coconut trees"))
+ result = @scope.function_regsubst(
+ [ "the monkey breaks banana trees",
+ "b[an]*a",
+ "coconut"
+ ])
+ result.should(eql("the monkey breaks coconut trees"))
end
it "should handle case-sensitive regexps" do
- result = @scope.function_regsubst(
- [ "the monkey breaks baNAna trees",
- "b[an]+a",
- "coconut"
- ])
- result.should(eql("the monkey breaks baNAna trees"))
+ result = @scope.function_regsubst(
+ [ "the monkey breaks baNAna trees",
+ "b[an]+a",
+ "coconut"
+ ])
+ result.should(eql("the monkey breaks baNAna trees"))
end
it "should handle case-insensitive regexps" do
- result = @scope.function_regsubst(
- [ "the monkey breaks baNAna trees",
- "b[an]+a",
- "coconut",
- "I"
- ])
- result.should(eql("the monkey breaks coconut trees"))
+ result = @scope.function_regsubst(
+ [ "the monkey breaks baNAna trees",
+ "b[an]+a",
+ "coconut",
+ "I"
+ ])
+ result.should(eql("the monkey breaks coconut trees"))
end
it "should handle global substitutions" do
- result = @scope.function_regsubst(
- [ "the monkey breaks\tbanana trees",
- "[ \t]",
- "--",
- "G"
- ])
- result.should(eql("the--monkey--breaks--banana--trees"))
+ result = @scope.function_regsubst(
+ [ "the monkey breaks\tbanana trees",
+ "[ \t]",
+ "--",
+ "G"
+ ])
+ result.should(eql("the--monkey--breaks--banana--trees"))
end
it "should handle global substitutions with groups" do
- result = @scope.function_regsubst(
- [ '130.236.254.10',
- '([0-9]+)',
- '<\1>',
- 'G'
- ])
- result.should(eql('<130>.<236>.<254>.<10>'))
+ result = @scope.function_regsubst(
+ [ '130.236.254.10',
+ '([0-9]+)',
+ '<\1>',
+ 'G'
+ ])
+ result.should(eql('<130>.<236>.<254>.<10>'))
end
end
diff --git a/spec/unit/parser/functions/sprintf.rb b/spec/unit/parser/functions/sprintf.rb
index 8654b18fc..949dc3fcc 100644
--- a/spec/unit/parser/functions/sprintf.rb
+++ b/spec/unit/parser/functions/sprintf.rb
@@ -14,29 +14,29 @@ describe "the sprintf function" do
it "should raise a ParseError if there is less than 1 argument" do
lambda { @scope.function_sprintf([]) }.should(
- raise_error(Puppet::ParseError))
+ raise_error(Puppet::ParseError))
end
it "should format integers" do
- result = @scope.function_sprintf(["%+05d", "23"])
- result.should(eql("+0023"))
+ result = @scope.function_sprintf(["%+05d", "23"])
+ result.should(eql("+0023"))
end
it "should format floats" do
- result = @scope.function_sprintf(["%+.2f", "2.7182818284590451"])
- result.should(eql("+2.72"))
+ result = @scope.function_sprintf(["%+.2f", "2.7182818284590451"])
+ result.should(eql("+2.72"))
end
it "should format large floats" do
- result = @scope.function_sprintf(["%+.2e", "27182818284590451"])
- result.should(eql("+2.72e+16"))
+ result = @scope.function_sprintf(["%+.2e", "27182818284590451"])
+ result.should(eql("+2.72e+16"))
end
it "should perform more complex formatting" do
- result = @scope.function_sprintf(
- [ "<%.8s:%#5o %#8X (%-8s)>",
- "overlongstring", "23", "48879", "foo" ])
- result.should(eql("<overlong: 027 0XBEEF (foo )>"))
+ result = @scope.function_sprintf(
+ [ "<%.8s:%#5o %#8X (%-8s)>",
+ "overlongstring", "23", "48879", "foo" ])
+ result.should(eql("<overlong: 027 0XBEEF (foo )>"))
end
end
diff --git a/spec/unit/parser/parser.rb b/spec/unit/parser/parser.rb
index b764dee97..ef05bc876 100755
--- a/spec/unit/parser/parser.rb
+++ b/spec/unit/parser/parser.rb
@@ -162,11 +162,11 @@ describe Puppet::Parser do
it "should not raise errors with multiple arguments and a trailing comma" do
lambda { @parser.parse("notice(1,2,)") }.should_not raise_error
- end
+ end
- end
+ end
- describe Puppet::Parser, "when parsing arrays with trailing comma" do
+ describe Puppet::Parser, "when parsing arrays with trailing comma" do
it "should not raise errors with a trailing comma" do
lambda { @parser.parse("$a = [1,2,]") }.should_not raise_error
diff --git a/test/data/providers/mailalias/aliases/test1 b/test/data/providers/mailalias/aliases/test1
index 20f90989f..ecf532213 100644
--- a/test/data/providers/mailalias/aliases/test1
+++ b/test/data/providers/mailalias/aliases/test1
@@ -1,27 +1,27 @@
# Basic system aliases -- these MUST be present
-MAILER-DAEMON: postmaster
-postmaster: root
+MAILER-DAEMON: postmaster
+postmaster: root
# General redirections for pseudo accounts
-bin: root
-daemon: root
-named: root
-nobody: root
-uucp: root
-www: root
-ftp-bugs: root
-postfix: root
+bin: root
+daemon: root
+named: root
+nobody: root
+uucp: root
+www: root
+ftp-bugs: root
+postfix: root
# Put your local aliases here.
# Well-known aliases
-manager: root
-dumper: root
-operator: root
-abuse: postmaster
+manager: root
+dumper: root
+operator: root
+abuse: postmaster
# trap decode to catch security attacks
-decode: root
+decode: root
# Other tests
anothertest: "|/path/to/rt-mailgate --queue 'another test' --action correspond --url http://my.com/"
diff --git a/test/data/snippets/append.pp b/test/data/snippets/append.pp
index 28edeb177..20cbda662 100644
--- a/test/data/snippets/append.pp
+++ b/test/data/snippets/append.pp
@@ -1,11 +1,11 @@
$var=['/tmp/file1','/tmp/file2']
class arraytest {
- $var += ['/tmp/file3', '/tmp/file4']
- file {
- $var:
- content => "test"
- }
+ $var += ['/tmp/file3', '/tmp/file4']
+ file {
+ $var:
+ content => "test"
+ }
}
include arraytest
diff --git a/test/data/snippets/multilinecomments.pp b/test/data/snippets/multilinecomments.pp
index 816baebd7..b20ce1d9d 100644
--- a/test/data/snippets/multilinecomments.pp
+++ b/test/data/snippets/multilinecomments.pp
@@ -1,6 +1,6 @@
/*
file {
- "/tmp/multilinecomments": content => "pouet"
+ "/tmp/multilinecomments": content => "pouet"
}
*/
diff --git a/test/data/types/hosts/2 b/test/data/types/hosts/2
index a25c39cd5..79b311b93 100644
--- a/test/data/types/hosts/2
+++ b/test/data/types/hosts/2
@@ -1,6 +1,6 @@
-127.0.0.1 localhost
-192.168.0.3 culain.madstop.com culain
-192.168.0.100 yaytest
+127.0.0.1 localhost
+192.168.0.3 culain.madstop.com culain
+192.168.0.100 yaytest
# The following lines are desirable for IPv6 capable hosts
# (added automatically by netbase upgrade)
diff --git a/test/data/types/hosts/solaris b/test/data/types/hosts/solaris
index be3b97f2a..d62906d3c 100644
--- a/test/data/types/hosts/solaris
+++ b/test/data/types/hosts/solaris
@@ -1,5 +1,5 @@
#
# Internet host table
#
-127.0.0.1 localhost
-192.168.0.50 sol10b
+127.0.0.1 localhost
+192.168.0.50 sol10b
diff --git a/test/data/types/mount/freebsd.fstab b/test/data/types/mount/freebsd.fstab
index c39416bc8..a41104236 100644
--- a/test/data/types/mount/freebsd.fstab
+++ b/test/data/types/mount/freebsd.fstab
@@ -1,7 +1,7 @@
-# Device Mountpoint FStype Options Dump Pass#
-/dev/ad0s1b none swap sw 0 0
-/dev/ad0s1a / ufs rw 1 1
-/dev/ad0s1e /tmp ufs rw 2 2
-/dev/ad0s1f /usr ufs rw 2 2
-/dev/ad0s1d /var ufs rw 2 2
-/dev/acd0 /cdrom cd9660 ro,noauto 0 0
+# Device Mountpoint FStype Options Dump Pass#
+/dev/ad0s1b none swap sw 0 0
+/dev/ad0s1a / ufs rw 1 1
+/dev/ad0s1e /tmp ufs rw 2 2
+/dev/ad0s1f /usr ufs rw 2 2
+/dev/ad0s1d /var ufs rw 2 2
+/dev/acd0 /cdrom cd9660 ro,noauto 0 0
diff --git a/test/data/types/mount/solaris.fstab b/test/data/types/mount/solaris.fstab
index c7de9671b..54afc898c 100644
--- a/test/data/types/mount/solaris.fstab
+++ b/test/data/types/mount/solaris.fstab
@@ -1,11 +1,11 @@
-#device device mount FS fsck mount mount
-#to mount to fsck point type pass at boot options
+#device device mount FS fsck mount mount
+#to mount to fsck point type pass at boot options
#
-fd - /dev/fd fd - no -
-/proc - /proc proc - no -
-/dev/dsk/c0d0s0 /dev/rdsk/c0d0s0 / ufs 1 no -
-/dev/dsk/c0d0p0:boot - /boot pcfs - no -
-/devices - /devices devfs - no -
-ctfs - /system/contract ctfs - no -
-objfs - /system/object objfs - no -
-#swap - /tmp tmpfs - yes -
+fd - /dev/fd fd - no -
+/proc - /proc proc - no -
+/dev/dsk/c0d0s0 /dev/rdsk/c0d0s0 / ufs 1 no -
+/dev/dsk/c0d0p0:boot - /boot pcfs - no -
+/devices - /devices devfs - no -
+ctfs - /system/contract ctfs - no -
+objfs - /system/object objfs - no -
+#swap - /tmp tmpfs - yes -
diff --git a/test/data/types/port/1 b/test/data/types/port/1
index 8fcc801a7..47da837f0 100644
--- a/test/data/types/port/1
+++ b/test/data/types/port/1
@@ -10,219 +10,219 @@
# by IANA and used in the real-world or are needed by a debian package.
# If you need a huge list of used numbers please install the nmap package.
-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
-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
-telnet 23/tcp
-smtp 25/tcp mail
-time 37/tcp timserver
-time 37/udp timserver
-rlp 39/udp resource # resource location
-nameserver 42/tcp name # IEN 116
-whois 43/tcp nicname
-tacacs 49/tcp # Login Host Protocol (TACACS)
-tacacs 49/udp
-re-mail-ck 50/tcp # Remote Mail Checking Protocol
-re-mail-ck 50/udp
-domain 53/tcp nameserver # name-domain server
-domain 53/udp nameserver
-mtp 57/tcp # deprecated
-tacacs-ds 65/tcp # TACACS-Database Service
-tacacs-ds 65/udp
-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-sec # Kerberos v5
-kerberos 88/udp kerberos5 krb5 kerberos-sec # Kerberos v5
-supdup 95/tcp
-hostnames 101/tcp hostname # usually from sri-nic
-iso-tsap 102/tcp tsap # part of ISODE
-acr-nema 104/tcp dicom # Digital Imag. & Comm. 300
-acr-nema 104/udp dicom # Digital Imag. & Comm. 300
-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 postoffice pop-2 # POP version 2
-pop2 109/udp pop-2
-pop3 110/tcp pop-3 # POP version 3
-pop3 110/udp pop-3
-sunrpc 111/tcp portmapper # RPC 4.0 portmapper
-sunrpc 111/udp portmapper
-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
-pwdgen 129/tcp # PWDGEN service
-pwdgen 129/udp # PWDGEN service
-loc-srv 135/tcp epmap # Location Service
-loc-srv 135/udp epmap
-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 P 2 and 4
-imap2 143/udp imap
-snmp 161/tcp # Simple Net Mgmt Protocol
-snmp 161/udp # Simple Net Mgmt Protocol
-snmp-trap 162/tcp snmptrap # Traps for SNMP
-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
-mailq 174/tcp # Mailer transport queue for Zmailer
-mailq 174/udp # Mailer transport queue for Zmailer
-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 Protocol
-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 # Quick Mail Transfer Protocol
-qmtp 209/udp # 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
-pawserv 345/tcp # Perf Analysis Workbench
-pawserv 345/udp
-zserv 346/tcp # Zebra server
-zserv 346/udp
-fatserv 347/tcp # Fatmen Server
-fatserv 347/udp
-rpc2portmap 369/tcp
-rpc2portmap 369/udp # Coda portmapper
-codaauth2 370/tcp
-codaauth2 370/udp # Coda authentication server
-clearcase 371/tcp Clearcase
-clearcase 371/udp Clearcase
-ulistserv 372/tcp # UNIX Listserv
-ulistserv 372/udp
-ldap 389/tcp # Lightweight Directory Access Protocol
-ldap 389/udp
-imsp 406/tcp # Interactive Mail Support Protocol
-imsp 406/udp
-https 443/tcp # http protocol over TLS/SSL
-https 443/udp
-snpp 444/tcp # Simple Network Paging Protocol
-snpp 444/udp
-microsoft-ds 445/tcp # Microsoft Naked CIFS
-microsoft-ds 445/udp
-saft 487/tcp # Simple Asynchronous File Transfer
-saft 487/udp
-isakmp 500/tcp # IPsec - Internet Security Association
-isakmp 500/udp # and Key Management Protocol
-rtsp 554/tcp # Real Time Stream Control Protocol
-rtsp 554/udp # Real Time Stream Control Protocol
-nqs 607/tcp # Network Queuing system
-nqs 607/udp
-npmp-local 610/tcp dqs313_qmaster # npmp-local / DQS
-npmp-local 610/udp dqs313_qmaster
-npmp-gui 611/tcp dqs313_execd # npmp-gui / DQS
-npmp-gui 611/udp dqs313_execd
-hmmp-ind 612/tcp dqs313_intercell # HMMP Indication / DQS
-hmmp-ind 612/udp dqs313_intercell
-ipp 631/tcp # Internet Printing Protocol
-ipp 631/udp
+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
+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
+telnet 23/tcp
+smtp 25/tcp mail
+time 37/tcp timserver
+time 37/udp timserver
+rlp 39/udp resource # resource location
+nameserver 42/tcp name # IEN 116
+whois 43/tcp nicname
+tacacs 49/tcp # Login Host Protocol (TACACS)
+tacacs 49/udp
+re-mail-ck 50/tcp # Remote Mail Checking Protocol
+re-mail-ck 50/udp
+domain 53/tcp nameserver # name-domain server
+domain 53/udp nameserver
+mtp 57/tcp # deprecated
+tacacs-ds 65/tcp # TACACS-Database Service
+tacacs-ds 65/udp
+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-sec # Kerberos v5
+kerberos 88/udp kerberos5 krb5 kerberos-sec # Kerberos v5
+supdup 95/tcp
+hostnames 101/tcp hostname # usually from sri-nic
+iso-tsap 102/tcp tsap # part of ISODE
+acr-nema 104/tcp dicom # Digital Imag. & Comm. 300
+acr-nema 104/udp dicom # Digital Imag. & Comm. 300
+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 postoffice pop-2 # POP version 2
+pop2 109/udp pop-2
+pop3 110/tcp pop-3 # POP version 3
+pop3 110/udp pop-3
+sunrpc 111/tcp portmapper # RPC 4.0 portmapper
+sunrpc 111/udp portmapper
+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
+pwdgen 129/tcp # PWDGEN service
+pwdgen 129/udp # PWDGEN service
+loc-srv 135/tcp epmap # Location Service
+loc-srv 135/udp epmap
+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 P 2 and 4
+imap2 143/udp imap
+snmp 161/tcp # Simple Net Mgmt Protocol
+snmp 161/udp # Simple Net Mgmt Protocol
+snmp-trap 162/tcp snmptrap # Traps for SNMP
+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
+mailq 174/tcp # Mailer transport queue for Zmailer
+mailq 174/udp # Mailer transport queue for Zmailer
+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 Protocol
+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 # Quick Mail Transfer Protocol
+qmtp 209/udp # 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
+pawserv 345/tcp # Perf Analysis Workbench
+pawserv 345/udp
+zserv 346/tcp # Zebra server
+zserv 346/udp
+fatserv 347/tcp # Fatmen Server
+fatserv 347/udp
+rpc2portmap 369/tcp
+rpc2portmap 369/udp # Coda portmapper
+codaauth2 370/tcp
+codaauth2 370/udp # Coda authentication server
+clearcase 371/tcp Clearcase
+clearcase 371/udp Clearcase
+ulistserv 372/tcp # UNIX Listserv
+ulistserv 372/udp
+ldap 389/tcp # Lightweight Directory Access Protocol
+ldap 389/udp
+imsp 406/tcp # Interactive Mail Support Protocol
+imsp 406/udp
+https 443/tcp # http protocol over TLS/SSL
+https 443/udp
+snpp 444/tcp # Simple Network Paging Protocol
+snpp 444/udp
+microsoft-ds 445/tcp # Microsoft Naked CIFS
+microsoft-ds 445/udp
+saft 487/tcp # Simple Asynchronous File Transfer
+saft 487/udp
+isakmp 500/tcp # IPsec - Internet Security Association
+isakmp 500/udp # and Key Management Protocol
+rtsp 554/tcp # Real Time Stream Control Protocol
+rtsp 554/udp # Real Time Stream Control Protocol
+nqs 607/tcp # Network Queuing system
+nqs 607/udp
+npmp-local 610/tcp dqs313_qmaster # npmp-local / DQS
+npmp-local 610/udp dqs313_qmaster
+npmp-gui 611/tcp dqs313_execd # npmp-gui / DQS
+npmp-gui 611/udp dqs313_execd
+hmmp-ind 612/tcp dqs313_intercell # HMMP Indication / DQS
+hmmp-ind 612/udp dqs313_intercell
+ipp 631/tcp # Internet Printing Protocol
+ipp 631/udp
#
# 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
-gdomap 538/tcp # GNUstep distributed objects
-gdomap 538/udp
-uucp 540/tcp uucpd # uucp daemon
-klogin 543/tcp # Kerberized `rlogin' (v5)
-kshell 544/tcp krcmd # Kerberized `rsh' (v5)
-afpovertcp 548/tcp # AFP over TCP
-afpovertcp 548/udp
-remotefs 556/tcp rfs_server rfs # Brunhoff remote filesystem
-nntps 563/tcp snntp # NNTP over SSL
-nntps 563/udp snntp
-submission 587/tcp # Submission [RFC2476]
-submission 587/udp
-ldaps 636/tcp # LDAP over SSL
-ldaps 636/udp
-tinc 655/tcp # tinc control port
-tinc 655/udp
-silc 706/tcp
-silc 706/udp
-kerberos-adm 749/tcp # Kerberos `kadmin' (v5)
+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
+gdomap 538/tcp # GNUstep distributed objects
+gdomap 538/udp
+uucp 540/tcp uucpd # uucp daemon
+klogin 543/tcp # Kerberized `rlogin' (v5)
+kshell 544/tcp krcmd # Kerberized `rsh' (v5)
+afpovertcp 548/tcp # AFP over TCP
+afpovertcp 548/udp
+remotefs 556/tcp rfs_server rfs # Brunhoff remote filesystem
+nntps 563/tcp snntp # NNTP over SSL
+nntps 563/udp snntp
+submission 587/tcp # Submission [RFC2476]
+submission 587/udp
+ldaps 636/tcp # LDAP over SSL
+ldaps 636/udp
+tinc 655/tcp # tinc control port
+tinc 655/udp
+silc 706/tcp
+silc 706/udp
+kerberos-adm 749/tcp # Kerberos `kadmin' (v5)
#
-webster 765/tcp # Network dictionary
-webster 765/udp
-rsync 873/tcp
-rsync 873/udp
-ftps-data 989/tcp # FTP over SSL (data)
-ftps 990/tcp
-telnets 992/tcp # Telnet over SSL
-telnets 992/udp
-imaps 993/tcp # IMAP over SSL
-imaps 993/udp
-ircs 994/tcp # IRC over SSL
-ircs 994/udp
-pop3s 995/tcp # POP-3 over SSL
-pop3s 995/udp
+webster 765/tcp # Network dictionary
+webster 765/udp
+rsync 873/tcp
+rsync 873/udp
+ftps-data 989/tcp # FTP over SSL (data)
+ftps 990/tcp
+telnets 992/tcp # Telnet over SSL
+telnets 992/udp
+imaps 993/tcp # IMAP over SSL
+imaps 993/udp
+ircs 994/tcp # IRC over SSL
+ircs 994/udp
+pop3s 995/tcp # POP-3 over SSL
+pop3s 995/udp
#
# From ``Assigned Numbers'':
#
@@ -238,169 +238,169 @@ pop3s 995/udp
#> does register or list uses of these ports as a convienence to the
#> community.
#
-socks 1080/tcp # socks proxy server
-socks 1080/udp
-proofd 1093/tcp
-proofd 1093/udp
-rootd 1094/tcp
-rootd 1094/udp
-openvpn 1194/tcp
-openvpn 1194/udp
-rmiregistry 1099/tcp # Java RMI Registry
-rmiregistry 1099/udp
-kazaa 1214/tcp
-kazaa 1214/udp
-nessus 1241/tcp # Nessus vulnerability
-nessus 1241/udp # assessment scanner
-lotusnote 1352/tcp lotusnotes # Lotus Note
-lotusnote 1352/udp lotusnotes
-ms-sql-s 1433/tcp # Microsoft SQL Server
-ms-sql-s 1433/udp
-ms-sql-m 1434/tcp # Microsoft SQL Monitor
-ms-sql-m 1434/udp
-ingreslock 1524/tcp
-ingreslock 1524/udp
-prospero-np 1525/tcp # Prospero non-privileged
-prospero-np 1525/udp
-datametrics 1645/tcp old-radius
-datametrics 1645/udp old-radius
-sa-msg-port 1646/tcp old-radacct
-sa-msg-port 1646/udp old-radacct
-kermit 1649/tcp
-kermit 1649/udp
-l2f 1701/tcp l2tp
-l2f 1701/udp l2tp
-radius 1812/tcp
-radius 1812/udp
-radius-acct 1813/tcp radacct # Radius Accounting
-radius-acct 1813/udp radacct
-unix-status 1957/tcp # remstats unix-status server
-log-server 1958/tcp # remstats log server
-remoteping 1959/tcp # remstats remoteping server
-rtcm-sc104 2101/tcp # RTCM SC-104 IANA 1/29/99
-rtcm-sc104 2101/udp
-cvspserver 2401/tcp # CVS client/server operations
-cvspserver 2401/udp
-venus 2430/tcp # codacon port
-venus 2430/udp # Venus callback/wbc interface
-venus-se 2431/tcp # tcp side effects
-venus-se 2431/udp # udp sftp side effect
-codasrv 2432/tcp # not used
-codasrv 2432/udp # server port
-codasrv-se 2433/tcp # tcp side effects
-codasrv-se 2433/udp # udp sftp side effect
-mon 2583/tcp # MON
-mon 2583/udp
-dict 2628/tcp # Dictionary server
-dict 2628/udp
-gpsd 2947/tcp
-gpsd 2947/udp
-gds_db 3050/tcp # InterBase server
-gds_db 3050/udp
-icpv2 3130/tcp icp # Internet Cache Protocol
-icpv2 3130/udp icp
-mysql 3306/tcp
-mysql 3306/udp
-nut 3493/tcp # Network UPS Tools
-nut 3493/udp
-distcc 3632/tcp # distributed compiler
-distcc 3632/udp
-daap 3689/tcp # Digital Audio Access Protocol
-daap 3689/udp
-svn 3690/tcp subversion # Subversion protocol
-svn 3690/udp subversion
-iax 4569/tcp # Inter-Asterisk eXchange
-iax 4569/udp
-radmin-port 4899/tcp # RAdmin Port
-radmin-port 4899/udp
-rfe 5002/udp # Radio Free Ethernet
-rfe 5002/tcp
-sip 5060/tcp # Session Initiation Protocol
-sip 5060/udp
-sip-tls 5061/tcp
-sip-tls 5061/udp
-xmpp-client 5222/tcp jabber-client # Jabber Client Connection
-xmpp-client 5222/udp jabber-client
-xmpp-server 5269/tcp jabber-server # Jabber Server Connection
-xmpp-server 5269/udp jabber-server
-cfengine 5308/tcp
-cfengine 5308/udp
-postgresql 5432/tcp postgres # PostgreSQL Database
-postgresql 5432/udp postgres
-x11 6000/tcp x11-0 # X Window System
-x11 6000/udp x11-0
-x11-1 6001/tcp
-x11-1 6001/udp
-x11-2 6002/tcp
-x11-2 6002/udp
-x11-3 6003/tcp
-x11-3 6003/udp
-x11-4 6004/tcp
-x11-4 6004/udp
-x11-5 6005/tcp
-x11-5 6005/udp
-x11-6 6006/tcp
-x11-6 6006/udp
-x11-7 6007/tcp
-x11-7 6007/udp
-gnutella-svc 6346/tcp # gnutella
-gnutella-svc 6346/udp
-gnutella-rtr 6347/tcp # gnutella
-gnutella-rtr 6347/udp
-afs3-fileserver 7000/tcp bbs # file server itself
-afs3-fileserver 7000/udp bbs
-afs3-callback 7001/tcp # callbacks to cache managers
-afs3-callback 7001/udp
-afs3-prserver 7002/tcp # users & groups database
-afs3-prserver 7002/udp
-afs3-vlserver 7003/tcp # volume location database
-afs3-vlserver 7003/udp
-afs3-kaserver 7004/tcp # AFS/Kerberos authentication
-afs3-kaserver 7004/udp
-afs3-volser 7005/tcp # volume managment server
-afs3-volser 7005/udp
-afs3-errors 7006/tcp # error interpretation service
-afs3-errors 7006/udp
-afs3-bos 7007/tcp # basic overseer process
-afs3-bos 7007/udp
-afs3-update 7008/tcp # server-to-server updater
-afs3-update 7008/udp
-afs3-rmtsys 7009/tcp # remote cache manager service
-afs3-rmtsys 7009/udp
-font-service 7100/tcp xfs # X Font Service
-font-service 7100/udp xfs
-bacula-dir 9101/tcp # Bacula Director
-bacula-dir 9101/udp
-bacula-fd 9102/tcp # Bacula File Daemon
-bacula-fd 9102/udp
-bacula-sd 9103/tcp # Bacula Storage Daemon
-bacula-sd 9103/udp
-amanda 10080/tcp # amanda backup services
-amanda 10080/udp
-hkp 11371/tcp # OpenPGP HTTP Keyserver
-hkp 11371/udp # OpenPGP HTTP Keyserver
-bprd 13720/tcp # VERITAS NetBackup
+socks 1080/tcp # socks proxy server
+socks 1080/udp
+proofd 1093/tcp
+proofd 1093/udp
+rootd 1094/tcp
+rootd 1094/udp
+openvpn 1194/tcp
+openvpn 1194/udp
+rmiregistry 1099/tcp # Java RMI Registry
+rmiregistry 1099/udp
+kazaa 1214/tcp
+kazaa 1214/udp
+nessus 1241/tcp # Nessus vulnerability
+nessus 1241/udp # assessment scanner
+lotusnote 1352/tcp lotusnotes # Lotus Note
+lotusnote 1352/udp lotusnotes
+ms-sql-s 1433/tcp # Microsoft SQL Server
+ms-sql-s 1433/udp
+ms-sql-m 1434/tcp # Microsoft SQL Monitor
+ms-sql-m 1434/udp
+ingreslock 1524/tcp
+ingreslock 1524/udp
+prospero-np 1525/tcp # Prospero non-privileged
+prospero-np 1525/udp
+datametrics 1645/tcp old-radius
+datametrics 1645/udp old-radius
+sa-msg-port 1646/tcp old-radacct
+sa-msg-port 1646/udp old-radacct
+kermit 1649/tcp
+kermit 1649/udp
+l2f 1701/tcp l2tp
+l2f 1701/udp l2tp
+radius 1812/tcp
+radius 1812/udp
+radius-acct 1813/tcp radacct # Radius Accounting
+radius-acct 1813/udp radacct
+unix-status 1957/tcp # remstats unix-status server
+log-server 1958/tcp # remstats log server
+remoteping 1959/tcp # remstats remoteping server
+rtcm-sc104 2101/tcp # RTCM SC-104 IANA 1/29/99
+rtcm-sc104 2101/udp
+cvspserver 2401/tcp # CVS client/server operations
+cvspserver 2401/udp
+venus 2430/tcp # codacon port
+venus 2430/udp # Venus callback/wbc interface
+venus-se 2431/tcp # tcp side effects
+venus-se 2431/udp # udp sftp side effect
+codasrv 2432/tcp # not used
+codasrv 2432/udp # server port
+codasrv-se 2433/tcp # tcp side effects
+codasrv-se 2433/udp # udp sftp side effect
+mon 2583/tcp # MON
+mon 2583/udp
+dict 2628/tcp # Dictionary server
+dict 2628/udp
+gpsd 2947/tcp
+gpsd 2947/udp
+gds_db 3050/tcp # InterBase server
+gds_db 3050/udp
+icpv2 3130/tcp icp # Internet Cache Protocol
+icpv2 3130/udp icp
+mysql 3306/tcp
+mysql 3306/udp
+nut 3493/tcp # Network UPS Tools
+nut 3493/udp
+distcc 3632/tcp # distributed compiler
+distcc 3632/udp
+daap 3689/tcp # Digital Audio Access Protocol
+daap 3689/udp
+svn 3690/tcp subversion # Subversion protocol
+svn 3690/udp subversion
+iax 4569/tcp # Inter-Asterisk eXchange
+iax 4569/udp
+radmin-port 4899/tcp # RAdmin Port
+radmin-port 4899/udp
+rfe 5002/udp # Radio Free Ethernet
+rfe 5002/tcp
+sip 5060/tcp # Session Initiation Protocol
+sip 5060/udp
+sip-tls 5061/tcp
+sip-tls 5061/udp
+xmpp-client 5222/tcp jabber-client # Jabber Client Connection
+xmpp-client 5222/udp jabber-client
+xmpp-server 5269/tcp jabber-server # Jabber Server Connection
+xmpp-server 5269/udp jabber-server
+cfengine 5308/tcp
+cfengine 5308/udp
+postgresql 5432/tcp postgres # PostgreSQL Database
+postgresql 5432/udp postgres
+x11 6000/tcp x11-0 # X Window System
+x11 6000/udp x11-0
+x11-1 6001/tcp
+x11-1 6001/udp
+x11-2 6002/tcp
+x11-2 6002/udp
+x11-3 6003/tcp
+x11-3 6003/udp
+x11-4 6004/tcp
+x11-4 6004/udp
+x11-5 6005/tcp
+x11-5 6005/udp
+x11-6 6006/tcp
+x11-6 6006/udp
+x11-7 6007/tcp
+x11-7 6007/udp
+gnutella-svc 6346/tcp # gnutella
+gnutella-svc 6346/udp
+gnutella-rtr 6347/tcp # gnutella
+gnutella-rtr 6347/udp
+afs3-fileserver 7000/tcp bbs # file server itself
+afs3-fileserver 7000/udp bbs
+afs3-callback 7001/tcp # callbacks to cache managers
+afs3-callback 7001/udp
+afs3-prserver 7002/tcp # users & groups database
+afs3-prserver 7002/udp
+afs3-vlserver 7003/tcp # volume location database
+afs3-vlserver 7003/udp
+afs3-kaserver 7004/tcp # AFS/Kerberos authentication
+afs3-kaserver 7004/udp
+afs3-volser 7005/tcp # volume managment server
+afs3-volser 7005/udp
+afs3-errors 7006/tcp # error interpretation service
+afs3-errors 7006/udp
+afs3-bos 7007/tcp # basic overseer process
+afs3-bos 7007/udp
+afs3-update 7008/tcp # server-to-server updater
+afs3-update 7008/udp
+afs3-rmtsys 7009/tcp # remote cache manager service
+afs3-rmtsys 7009/udp
+font-service 7100/tcp xfs # X Font Service
+font-service 7100/udp xfs
+bacula-dir 9101/tcp # Bacula Director
+bacula-dir 9101/udp
+bacula-fd 9102/tcp # Bacula File Daemon
+bacula-fd 9102/udp
+bacula-sd 9103/tcp # Bacula Storage Daemon
+bacula-sd 9103/udp
+amanda 10080/tcp # amanda backup services
+amanda 10080/udp
+hkp 11371/tcp # OpenPGP HTTP Keyserver
+hkp 11371/udp # OpenPGP HTTP Keyserver
+bprd 13720/tcp # VERITAS NetBackup
bprd 13720/udp
-bpdbm 13721/tcp # VERITAS NetBackup
+bpdbm 13721/tcp # VERITAS NetBackup
bpdbm 13721/udp
-bpjava-msvc 13722/tcp # BP Java MSVC Protocol
+bpjava-msvc 13722/tcp # BP Java MSVC Protocol
bpjava-msvc 13722/udp
-vnetd 13724/tcp # Veritas Network Utility
+vnetd 13724/tcp # Veritas Network Utility
vnetd 13724/udp
-bpcd 13782/tcp # VERITAS NetBackup
+bpcd 13782/tcp # VERITAS NetBackup
bpcd 13782/udp
-vopied 13783/tcp # VERITAS NetBackup
+vopied 13783/tcp # VERITAS NetBackup
vopied 13783/udp
-wnn6 22273/tcp # wnn6
-wnn6 22273/udp
+wnn6 22273/tcp # wnn6
+wnn6 22273/udp
#
# Datagram Delivery Protocol services
#
-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
#=========================================================================
# The remaining port numbers are not as allocated by IANA.
@@ -410,124 +410,124 @@ zip 6/ddp # Zone Information Protocol
# 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)
-kerberos4 750/tcp kerberos-iv kdc
-kerberos_master 751/udp # Kerberos authentication
-kerberos_master 751/tcp
-passwd_server 752/udp # Kerberos passwd server
-krb_prop 754/tcp krb5_prop hprop # Kerberos slave propagation
-krbupdate 760/tcp kreg # Kerberos registration
-kpasswd 761/tcp kpwd # Kerberos "passwd"
-swat 901/tcp # swat
-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
+kerberos4 750/udp kerberos-iv kdc # Kerberos (server)
+kerberos4 750/tcp kerberos-iv kdc
+kerberos_master 751/udp # Kerberos authentication
+kerberos_master 751/tcp
+passwd_server 752/udp # Kerberos passwd server
+krb_prop 754/tcp krb5_prop hprop # Kerberos slave propagation
+krbupdate 760/tcp kreg # Kerberos registration
+kpasswd 761/tcp kpwd # Kerberos "passwd"
+swat 901/tcp # swat
+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
# Hmmm. Are we using Kv4 or Kv5 now? Worrying.
# The following is probably Kerberos v5 --- ajt@debian.org (11/02/2000)
-kx 2111/tcp # X over Kerberos
-iprop 2121/tcp # incremental propagation
+kx 2111/tcp # X over Kerberos
+iprop 2121/tcp # incremental propagation
#
# 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
#
# Services added for the Debian GNU/Linux distribution
#
-linuxconf 98/tcp # LinuxConf
-poppassd 106/tcp # Eudora
-poppassd 106/udp
-ssmtp 465/tcp smtps # SMTP over SSL
-moira_db 775/tcp # Moira database
-moira_update 777/tcp # Moira update protocol
-moira_ureg 779/udp # Moira user registration
-spamd 783/tcp # spamassassin daemon
-omirr 808/tcp omirrd # online mirror
-omirr 808/udp omirrd
-customs 1001/tcp # pmake customs server
-customs 1001/udp
-skkserv 1178/tcp # skk jisho server port
-predict 1210/udp # predict -- satellite tracking
-rmtcfg 1236/tcp # Gracilis Packeten remote config server
-wipld 1300/tcp # Wipl network monitor
-xtel 1313/tcp # french minitel
-xtelw 1314/tcp # french minitel
-support 1529/tcp # GNATS
-sieve 2000/tcp # Sieve mail filter daemon
-cfinger 2003/tcp # GNU Finger
-ndtp 2010/tcp # Network dictionary transfer protocol
-frox 2121/tcp # frox: caching ftp proxy
-ninstall 2150/tcp # ninstall service
-ninstall 2150/udp
-zebrasrv 2600/tcp # zebra service
-zebra 2601/tcp # zebra vty
-ripd 2602/tcp # ripd vty (zebra)
-ripngd 2603/tcp # ripngd vty (zebra)
-ospfd 2604/tcp # ospfd vty (zebra)
-bgpd 2605/tcp # bgpd vty (zebra)
-ospf6d 2606/tcp # ospf6d vty (zebra)
-ospfapi 2607/tcp # OSPF-API
-isisd 2608/tcp # ISISd vty (zebra)
-afbackup 2988/tcp # Afbackup system
-afbackup 2988/udp
-afmbackup 2989/tcp # Afmbackup system
-afmbackup 2989/udp
-xtell 4224/tcp # xtell server
-fax 4557/tcp # FAX transmission service (old)
-hylafax 4559/tcp # HylaFAX client-server protocol (new)
-distmp3 4600/tcp # distmp3host daemon
-munin 4949/tcp lrrd # Munin
-enbd-cstatd 5051/tcp # ENBD client statd
-enbd-sstatd 5052/tcp # ENBD server statd
-pcrd 5151/tcp # PCR-1000 Daemon
-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 UDP (nocol)
-rplay 5555/udp # RPlay audio service
-rplay 5555/tcp
-rptp 5556/udp # Remote Play Transfer Protocol
-rptp 5556/tcp
-nsca 5667/tcp # Nagios Agent - NSCA
-mrtd 5674/tcp # MRT Routing Daemon
-bgpsim 5675/tcp # MRT Routing Simulator
-canna 5680/tcp # cannaserver
-sane-port 6566/tcp sane saned # SANE network scanner daemon
-ircd 6667/tcp # Internet Relay Chat
-zope-ftp 8021/tcp # zope management by ftp
-webcache 8080/tcp # WWW caching service
-tproxy 8081/tcp # Transparent Proxy
-omniorb 8088/tcp # OmniORB
-omniorb 8088/udp
-clc-build-daemon 8990/tcp # Common lisp build daemon
-xinetd 9098/tcp
-mandelspawn 9359/udp mandelbrot # network mandelbrot
-zope 9673/tcp # zope server
-kamanda 10081/tcp # amanda backup services (Kerberos)
-kamanda 10081/udp
-amandaidx 10082/tcp # amanda backup services
-amidxtape 10083/tcp # amanda backup services
-smsqp 11201/tcp # Alamin SMS gateway
-smsqp 11201/udp
-xpilot 15345/tcp # XPilot Contact Port
-xpilot 15345/udp
-sgi-cmsd 17001/udp # Cluster membership services daemon
-sgi-crsd 17002/udp
-sgi-gcd 17003/udp # SGI Group membership daemon
-sgi-cad 17004/tcp # Cluster Admin daemon
-isdnlog 20011/tcp # isdn logging system
-isdnlog 20011/udp
-vboxd 20012/tcp # voice box system
-vboxd 20012/udp
-binkp 24554/tcp # binkp fidonet protocol
-asp 27374/tcp # Address Search Protocol
-asp 27374/udp
-dircproxy 57000/tcp # Detachable IRC Proxy
-tfido 60177/tcp # fidonet EMSI over telnet
-fido 60179/tcp # fidonet EMSI over TCP
+linuxconf 98/tcp # LinuxConf
+poppassd 106/tcp # Eudora
+poppassd 106/udp
+ssmtp 465/tcp smtps # SMTP over SSL
+moira_db 775/tcp # Moira database
+moira_update 777/tcp # Moira update protocol
+moira_ureg 779/udp # Moira user registration
+spamd 783/tcp # spamassassin daemon
+omirr 808/tcp omirrd # online mirror
+omirr 808/udp omirrd
+customs 1001/tcp # pmake customs server
+customs 1001/udp
+skkserv 1178/tcp # skk jisho server port
+predict 1210/udp # predict -- satellite tracking
+rmtcfg 1236/tcp # Gracilis Packeten remote config server
+wipld 1300/tcp # Wipl network monitor
+xtel 1313/tcp # french minitel
+xtelw 1314/tcp # french minitel
+support 1529/tcp # GNATS
+sieve 2000/tcp # Sieve mail filter daemon
+cfinger 2003/tcp # GNU Finger
+ndtp 2010/tcp # Network dictionary transfer protocol
+frox 2121/tcp # frox: caching ftp proxy
+ninstall 2150/tcp # ninstall service
+ninstall 2150/udp
+zebrasrv 2600/tcp # zebra service
+zebra 2601/tcp # zebra vty
+ripd 2602/tcp # ripd vty (zebra)
+ripngd 2603/tcp # ripngd vty (zebra)
+ospfd 2604/tcp # ospfd vty (zebra)
+bgpd 2605/tcp # bgpd vty (zebra)
+ospf6d 2606/tcp # ospf6d vty (zebra)
+ospfapi 2607/tcp # OSPF-API
+isisd 2608/tcp # ISISd vty (zebra)
+afbackup 2988/tcp # Afbackup system
+afbackup 2988/udp
+afmbackup 2989/tcp # Afmbackup system
+afmbackup 2989/udp
+xtell 4224/tcp # xtell server
+fax 4557/tcp # FAX transmission service (old)
+hylafax 4559/tcp # HylaFAX client-server protocol (new)
+distmp3 4600/tcp # distmp3host daemon
+munin 4949/tcp lrrd # Munin
+enbd-cstatd 5051/tcp # ENBD client statd
+enbd-sstatd 5052/tcp # ENBD server statd
+pcrd 5151/tcp # PCR-1000 Daemon
+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 UDP (nocol)
+rplay 5555/udp # RPlay audio service
+rplay 5555/tcp
+rptp 5556/udp # Remote Play Transfer Protocol
+rptp 5556/tcp
+nsca 5667/tcp # Nagios Agent - NSCA
+mrtd 5674/tcp # MRT Routing Daemon
+bgpsim 5675/tcp # MRT Routing Simulator
+canna 5680/tcp # cannaserver
+sane-port 6566/tcp sane saned # SANE network scanner daemon
+ircd 6667/tcp # Internet Relay Chat
+zope-ftp 8021/tcp # zope management by ftp
+webcache 8080/tcp # WWW caching service
+tproxy 8081/tcp # Transparent Proxy
+omniorb 8088/tcp # OmniORB
+omniorb 8088/udp
+clc-build-daemon 8990/tcp # Common lisp build daemon
+xinetd 9098/tcp
+mandelspawn 9359/udp mandelbrot # network mandelbrot
+zope 9673/tcp # zope server
+kamanda 10081/tcp # amanda backup services (Kerberos)
+kamanda 10081/udp
+amandaidx 10082/tcp # amanda backup services
+amidxtape 10083/tcp # amanda backup services
+smsqp 11201/tcp # Alamin SMS gateway
+smsqp 11201/udp
+xpilot 15345/tcp # XPilot Contact Port
+xpilot 15345/udp
+sgi-cmsd 17001/udp # Cluster membership services daemon
+sgi-crsd 17002/udp
+sgi-gcd 17003/udp # SGI Group membership daemon
+sgi-cad 17004/tcp # Cluster Admin daemon
+isdnlog 20011/tcp # isdn logging system
+isdnlog 20011/udp
+vboxd 20012/tcp # voice box system
+vboxd 20012/udp
+binkp 24554/tcp # binkp fidonet protocol
+asp 27374/tcp # Address Search Protocol
+asp 27374/udp
+dircproxy 57000/tcp # Detachable IRC Proxy
+tfido 60177/tcp # fidonet EMSI over telnet
+fido 60179/tcp # fidonet EMSI over TCP
# Local services
diff --git a/test/data/types/port/darwin b/test/data/types/port/darwin
index 8c6b35522..c5e5376a2 100644
--- a/test/data/types/port/darwin
+++ b/test/data/types/port/darwin
@@ -7,14 +7,14 @@
#
# The latest IANA port assignments can be gotten from
#
-# http://www.iana.org/assignments/port-numbers
+# http://www.iana.org/assignments/port-numbers
#
# The Well Known Ports are those from 0 through 1023.
# The Registered Ports are those from 1024 through 49151
# The Dynamic and/or Private Ports are those from 49152 through 65535
#
# $FreeBSD: src/etc/services,v 1.89 2002/12/17 23:59:10 eric Exp $
-# From: @(#)services 5.8 (Berkeley) 5/9/91
+# From: @(#)services 5.8 (Berkeley) 5/9/91
#
# WELL KNOWN PORT NUMBERS
#
@@ -370,9 +370,9 @@ ansatrader 124/tcp # ANSA REX Trader
locus-map 125/udp # Locus PC-Interface Net Map Ser
locus-map 125/tcp # Locus PC-Interface Net Map Ser
# Eric Peterson <lcc.eric@SEAS.UCLA.EDU>
-nxedit 126/udp # NXEdit
-nxedit 126/tcp # NXEdit
-# Don Payette <Don.Payette@unisys.com>
+nxedit 126/udp # NXEdit
+nxedit 126/tcp # NXEdit
+# Don Payette <Don.Payette@unisys.com>
###########Port 126 Previously assigned to application below#######
#unitary 126/tcp Unisys Unitary Login
#unitary 126/udp Unisys Unitary Login
@@ -423,9 +423,9 @@ bl-idm 142/tcp # Britton-Lee IDM
imap 143/udp # Internet Message Access Protocol
imap 143/tcp # Internet Message Access Protocol
# Mark Crispin <MRC@CAC.Washington.EDU>
-uma 144/udp # Universal Management Architecture
-uma 144/tcp # Universal Management Architecture
-# Jay Whitney <jw@powercenter.com>
+uma 144/udp # Universal Management Architecture
+uma 144/tcp # Universal Management Architecture
+# Jay Whitney <jw@powercenter.com>
uaac 145/udp # UAAC Protocol
uaac 145/tcp # UAAC Protocol
# David A. Gomberg <gomberg@GATEWAY.MITRE.ORG>
@@ -436,7 +436,7 @@ iso-ip 147/tcp # ISO-IP
# Marshall Rose <mrose@dbc.mtview.ca.us>
jargon 148/udp # Jargon
jargon 148/tcp # Jargon
-# Bill Weinman <wew@bearnet.com>
+# Bill Weinman <wew@bearnet.com>
aed-512 149/udp # AED 512 Emulation Service
aed-512 149/tcp # AED 512 Emulation Service
# Albert G. Broscius <broscius@DSL.CIS.UPENN.EDU>
@@ -614,7 +614,7 @@ anet 212/udp # ATEXSSTR
anet 212/tcp # ATEXSSTR
# Jim Taylor <taylor@heart.epps.kodak.com>
ipx 213/udp # IPX
-ipx 213/tcp # IPX
+ipx 213/tcp # IPX
# Don Provan <donp@xlnvax.novell.com>
vmpwscs 214/udp # VM PWSCS
vmpwscs 214/tcp # VM PWSCS
@@ -647,9 +647,9 @@ cdc 223/tcp # Certificate Distribution Center
# Kannan Alagappan <kannan@sejour.enet.dec.com>
########### Possible Conflict of Port 222 with "Masqdialer"##############
### Contact for Masqdialer is Charles Wright <cpwright@villagenet.com>###
-masqdialer 224/udp # masqdialer
-masqdialer 224/tcp # masqdialer
-# Charles Wright <cpwright@villagenet.com>
+masqdialer 224/udp # masqdialer
+masqdialer 224/tcp # masqdialer
+# Charles Wright <cpwright@villagenet.com>
# 225-241 Reserved
# Jon Postel <postel@isi.edu>
direct 242/udp # Direct
@@ -660,7 +660,7 @@ sur-meas 243/tcp # Survey Measurement
# Dave Clark <ddc@LCS.MIT.EDU>
inbusiness 244/udp # inbusiness
inbusiness 244/tcp # inbusiness
-# Derrick Hisatake <derrick.i.hisatake@intel.com>
+# Derrick Hisatake <derrick.i.hisatake@intel.com>
link 245/udp # LINK
link 245/tcp # LINK
dsp3270 246/udp # Display Systems Protocol
@@ -668,10 +668,10 @@ dsp3270 246/tcp # Display Systems Protocol
# Weldon J. Showalter <Gamma@MINTAKA.DCA.MIL>
subntbcst_tftp 247/udp # SUBNTBCST_TFTP
subntbcst_tftp 247/tcp # SUBNTBCST_TFTP
-# John Fake <fake@us.ibm.com>
-bhfhs 248/udp # bhfhs
-bhfhs 248/tcp # bhfhs
-# John Kelly <johnk@bellhow.com>
+# John Fake <fake@us.ibm.com>
+bhfhs 248/udp # bhfhs
+bhfhs 248/tcp # bhfhs
+# John Kelly <johnk@bellhow.com>
# 249-255 Reserved
# Jon Postel <postel@isi.edu>
rap 256/udp # RAP
@@ -689,21 +689,21 @@ esro-gen 259/tcp # Efficient Short Remote Operations
openport 260/udp # Openport
openport 260/tcp # Openport
# John Marland <jmarland@dean.openport.com>
-nsiiops 261/udp # IIOP Name Service over TLS/SSL
-nsiiops 261/tcp # IIOP Name Service over TLS/SSL
+nsiiops 261/udp # IIOP Name Service over TLS/SSL
+nsiiops 261/tcp # IIOP Name Service over TLS/SSL
# Jeff Stewart <jstewart@netscape.com>
-arcisdms 262/udp # Arcisdms
-arcisdms 262/tcp # Arcisdms
-# Russell Crook (rmc@sni.ca>
-hdap 263/udp # HDAP
-hdap 263/tcp # HDAP
-# Troy Gau <troy@zyxel.com>
-bgmp 264/udp # BGMP
-bgmp 264/tcp # BGMP
-# Dave Thaler <thalerd@eecs.umich.edu>
-x-bone-ctl 265/udp # X-Bone CTL
-x-bone-ctl 265/tcp # X-Bone CTL
-# Joe Touch <touch@isi.edu>
+arcisdms 262/udp # Arcisdms
+arcisdms 262/tcp # Arcisdms
+# Russell Crook (rmc@sni.ca>
+hdap 263/udp # HDAP
+hdap 263/tcp # HDAP
+# Troy Gau <troy@zyxel.com>
+bgmp 264/udp # BGMP
+bgmp 264/tcp # BGMP
+# Dave Thaler <thalerd@eecs.umich.edu>
+x-bone-ctl 265/udp # X-Bone CTL
+x-bone-ctl 265/tcp # X-Bone CTL
+# Joe Touch <touch@isi.edu>
sst 266/udp # SCSI on ST
sst 266/tcp # SCSI on ST
# Donald D. Woelz <don@genroco.com>
@@ -717,18 +717,18 @@ http-mgmt 280/udp # http-mgmt
http-mgmt 280/tcp # http-mgmt
# Adrian Pell
# <PELL_ADRIAN/HP-UnitedKingdom_om6@hplb.hpl.hp.com>
-personal-link 281/udp # Personal Link
-personal-link 281/tcp # Personal Link
-# Dan Cummings <doc@cnr.com>
-cableport-ax 282/udp # Cable Port A/X
-cableport-ax 282/tcp # Cable Port A/X
-# Craig Langfahl <Craig_J_Langfahl@ccm.ch.intel.com>
-rescap 283/udp # rescap
-rescap 283/tcp # rescap
-# Paul Hoffman <phoffman@imc.org>
-corerjd 284/udp # corerjd
-corerjd 284/tcp # corerjd
-# Chris Thornhill <cjt@corenetworks.com>
+personal-link 281/udp # Personal Link
+personal-link 281/tcp # Personal Link
+# Dan Cummings <doc@cnr.com>
+cableport-ax 282/udp # Cable Port A/X
+cableport-ax 282/tcp # Cable Port A/X
+# Craig Langfahl <Craig_J_Langfahl@ccm.ch.intel.com>
+rescap 283/udp # rescap
+rescap 283/tcp # rescap
+# Paul Hoffman <phoffman@imc.org>
+corerjd 284/udp # corerjd
+corerjd 284/tcp # corerjd
+# Chris Thornhill <cjt@corenetworks.com>
# 285 Unassigned
fxp-1 286/udp # FXP-1
fxp-1 286/tcp # FXP-1
@@ -737,55 +737,55 @@ k-block 287/udp # K-BLOCK
k-block 287/tcp # K-BLOCK
# Simon P Jackson <jacko@kring.co.uk>
# 288-307 Unassigned
-novastorbakcup 308/udp # Novastor Backup
-novastorbakcup 308/tcp # Novastor Backup
-# Brian Dickman <brian@novastor.com>
+novastorbakcup 308/udp # Novastor Backup
+novastorbakcup 308/tcp # Novastor Backup
+# Brian Dickman <brian@novastor.com>
entrusttime 309/udp # EntrustTime
entrusttime 309/tcp # EntrustTime
# Peter Whittaker <pww@entrust.com>
-bhmds 310/udp # bhmds
-bhmds 310/tcp # bhmds
-# John Kelly <johnk@bellhow.com>
-asip-webadmin 311/udp # AppleShare IP WebAdmin
-asip-webadmin 311/tcp # AppleShare IP WebAdmin
-# Ann Huang <annhuang@apple.com>
-vslmp 312/udp # VSLMP
-vslmp 312/tcp # VSLMP
-# Gerben Wierda <Gerben_Wierda@RnA.nl>
-magenta-logic 313/udp # Magenta Logic
-magenta-logic 313/tcp # Magenta Logic
-# Karl Rousseau <kr@netfusion.co.uk>
-opalis-robot 314/udp # Opalis Robot
-opalis-robot 314/tcp # Opalis Robot
-# Laurent Domenech, Opalis <ldomenech@opalis.com>
-dpsi 315/udp # DPSI
-dpsi 315/tcp # DPSI
-# Tony Scamurra <Tony@DesktopPaging.com>
-decauth 316/udp # decAuth
-decauth 316/tcp # decAuth
-# Michael Agishtein <misha@unx.dec.com>
-zannet 317/udp # Zannet
-zannet 317/tcp # Zannet
-# Zan Oliphant <zan@accessone.com>
-pkix-timestamp 318/udp # PKIX TimeStamp
-pkix-timestamp 318/tcp # PKIX TimeStamp
-# Robert Zuccherato <robert.zuccherato@entrust.com>
-ptp-event 319/udp # PTP Event
-ptp-event 319/tcp # PTP Event
-ptp-general 320/udp # PTP General
-ptp-general 320/tcp # PTP General
-# John Eidson <eidson@hpl.hp.com>
-pip 321/udp # PIP
-pip 321/tcp # PIP
-# Gordon Mohr <gojomo@usa.net>
-rtsps 322/udp # RTSPS
-rtsps 322/tcp # RTSPS
-# Anders Klemets <anderskl@microsoft.com>
+bhmds 310/udp # bhmds
+bhmds 310/tcp # bhmds
+# John Kelly <johnk@bellhow.com>
+asip-webadmin 311/udp # AppleShare IP WebAdmin
+asip-webadmin 311/tcp # AppleShare IP WebAdmin
+# Ann Huang <annhuang@apple.com>
+vslmp 312/udp # VSLMP
+vslmp 312/tcp # VSLMP
+# Gerben Wierda <Gerben_Wierda@RnA.nl>
+magenta-logic 313/udp # Magenta Logic
+magenta-logic 313/tcp # Magenta Logic
+# Karl Rousseau <kr@netfusion.co.uk>
+opalis-robot 314/udp # Opalis Robot
+opalis-robot 314/tcp # Opalis Robot
+# Laurent Domenech, Opalis <ldomenech@opalis.com>
+dpsi 315/udp # DPSI
+dpsi 315/tcp # DPSI
+# Tony Scamurra <Tony@DesktopPaging.com>
+decauth 316/udp # decAuth
+decauth 316/tcp # decAuth
+# Michael Agishtein <misha@unx.dec.com>
+zannet 317/udp # Zannet
+zannet 317/tcp # Zannet
+# Zan Oliphant <zan@accessone.com>
+pkix-timestamp 318/udp # PKIX TimeStamp
+pkix-timestamp 318/tcp # PKIX TimeStamp
+# Robert Zuccherato <robert.zuccherato@entrust.com>
+ptp-event 319/udp # PTP Event
+ptp-event 319/tcp # PTP Event
+ptp-general 320/udp # PTP General
+ptp-general 320/tcp # PTP General
+# John Eidson <eidson@hpl.hp.com>
+pip 321/udp # PIP
+pip 321/tcp # PIP
+# Gordon Mohr <gojomo@usa.net>
+rtsps 322/udp # RTSPS
+rtsps 322/tcp # RTSPS
+# Anders Klemets <anderskl@microsoft.com>
# 323-332 Unassigned
-texar 333/udp # Texar Security Port
-texar 333/tcp # Texar Security Port
-# Eugen Bacic <ebacic@texar.com>
-# 334-343 Unassigned
+texar 333/udp # Texar Security Port
+texar 333/tcp # Texar Security Port
+# Eugen Bacic <ebacic@texar.com>
+# 334-343 Unassigned
pdap 344/udp # Prospero Data Access Protocol
pdap 344/tcp # Prospero Data Access Protocol
# B. Clifford Neuman <bcn@isi.edu>
@@ -800,75 +800,75 @@ csi-sgwp 348/tcp # Cabletron Management Protocol
mftp 349/udp # mftp
mftp 349/tcp # mftp
# Dave Feinleib <davefe@microsoft.com>
-matip-type-a 350/udp # MATIP Type A
+matip-type-a 350/udp # MATIP Type A
matip-type-a 350/tcp # MATIP Type A
matip-type-b 351/udp # MATIP Type B
matip-type-b 351/tcp # MATIP Type B
-# Alain Robert <arobert@par.sita.int>
+# Alain Robert <arobert@par.sita.int>
# The following entry records an unassigned but widespread use
-bhoetty 351/udp # bhoetty
-bhoetty 351/tcp # bhoetty (added 5/21/97)
-# John Kelly <johnk@bellhow.com>
-dtag-ste-sb 352/udp # DTAG
-dtag-ste-sb 352/tcp # DTAG (assigned long ago)
-# Ruediger Wald <wald@ez-darmstadt.telekom.de>
+bhoetty 351/udp # bhoetty
+bhoetty 351/tcp # bhoetty (added 5/21/97)
+# John Kelly <johnk@bellhow.com>
+dtag-ste-sb 352/udp # DTAG
+dtag-ste-sb 352/tcp # DTAG (assigned long ago)
+# Ruediger Wald <wald@ez-darmstadt.telekom.de>
# The following entry records an unassigned but widespread use
-bhoedap4 352/udp # bhoedap4
-bhoedap4 352/tcp # bhoedap4 (added 5/21/97)
-# John Kelly <johnk@bellhow.com>
-ndsauth 353/udp # NDSAUTH
-ndsauth 353/tcp # NDSAUTH
-# Jayakumar Ramalingam <jayakumar@novell.com>
-bh611 354/udp # bh611
-bh611 354/tcp # bh611
-# John Kelly <johnk@bellhow.com>
-datex-asn 355/udp # DATEX-ASN
-datex-asn 355/tcp # DATEX-ASN
-# Kenneth Vaughn <kvaughn@mail.viggen.com>
-cloanto-net-1 356/udp # Cloanto Net 1
-cloanto-net-1 356/tcp # Cloanto Net 1
-# Michael Battilana <mcb-iana@cloanto.com>
-bhevent 357/udp # bhevent
-bhevent 357/tcp # bhevent
-# John Kelly <johnk@bellhow.com>
-shrinkwrap 358/udp # Shrinkwrap
-shrinkwrap 358/tcp # Shrinkwrap
-# Bill Simpson <wsimpson@greendragon.com>
-nsrmp 359/udp # Network Security Risk Management Protocol
-nsrmp 359/tcp # Network Security Risk Management Protocol
-# Eric Jacksch <jacksch@tenebris.ca>
-scoi2odialog 360/udp # scoi2odialog
-scoi2odialog 360/tcp # scoi2odialog
-# Keith Petley <keithp@sco.COM>
-semantix 361/udp # Semantix
-semantix 361/tcp # Semantix
-# Semantix <xsSupport@semantix.com>
-srssend 362/udp # SRS Send
-srssend 362/tcp # SRS Send
-# Curt Mayer <curt@emergent.com>
-rsvp_tunnel 363/udp # RSVP Tunnel
-rsvp_tunnel 363/tcp # RSVP Tunnel
-# Andreas Terzis <terzis@cs.ucla.edu>
-aurora-cmgr 364/udp # Aurora CMGR
-aurora-cmgr 364/tcp # Aurora CMGR
-# Philip Budne <budne@auroratech.com>
-dtk 365/udp # DTK
-dtk 365/tcp # DTK
-# Fred Cohen <fc@all.net>
-odmr 366/udp # ODMR
-odmr 366/tcp # ODMR
-# Randall Gellens <randy@qualcomm.com>
-mortgageware 367/udp # MortgageWare
-mortgageware 367/tcp # MortgageWare
-# Ole Hellevik <oleh@interlinq.com>
-qbikgdp 368/udp # QbikGDP
-qbikgdp 368/tcp # QbikGDP
-# Adrien de Croy <adrien@qbik.com>
-rpc2portmap 369/udp # rpc2portmap
-rpc2portmap 369/tcp # rpc2portmap
-codaauth2 370/udp # codaauth2
-codaauth2 370/tcp # codaauth2
-# Robert Watson <robert@cyrus.watson.org>
+bhoedap4 352/udp # bhoedap4
+bhoedap4 352/tcp # bhoedap4 (added 5/21/97)
+# John Kelly <johnk@bellhow.com>
+ndsauth 353/udp # NDSAUTH
+ndsauth 353/tcp # NDSAUTH
+# Jayakumar Ramalingam <jayakumar@novell.com>
+bh611 354/udp # bh611
+bh611 354/tcp # bh611
+# John Kelly <johnk@bellhow.com>
+datex-asn 355/udp # DATEX-ASN
+datex-asn 355/tcp # DATEX-ASN
+# Kenneth Vaughn <kvaughn@mail.viggen.com>
+cloanto-net-1 356/udp # Cloanto Net 1
+cloanto-net-1 356/tcp # Cloanto Net 1
+# Michael Battilana <mcb-iana@cloanto.com>
+bhevent 357/udp # bhevent
+bhevent 357/tcp # bhevent
+# John Kelly <johnk@bellhow.com>
+shrinkwrap 358/udp # Shrinkwrap
+shrinkwrap 358/tcp # Shrinkwrap
+# Bill Simpson <wsimpson@greendragon.com>
+nsrmp 359/udp # Network Security Risk Management Protocol
+nsrmp 359/tcp # Network Security Risk Management Protocol
+# Eric Jacksch <jacksch@tenebris.ca>
+scoi2odialog 360/udp # scoi2odialog
+scoi2odialog 360/tcp # scoi2odialog
+# Keith Petley <keithp@sco.COM>
+semantix 361/udp # Semantix
+semantix 361/tcp # Semantix
+# Semantix <xsSupport@semantix.com>
+srssend 362/udp # SRS Send
+srssend 362/tcp # SRS Send
+# Curt Mayer <curt@emergent.com>
+rsvp_tunnel 363/udp # RSVP Tunnel
+rsvp_tunnel 363/tcp # RSVP Tunnel
+# Andreas Terzis <terzis@cs.ucla.edu>
+aurora-cmgr 364/udp # Aurora CMGR
+aurora-cmgr 364/tcp # Aurora CMGR
+# Philip Budne <budne@auroratech.com>
+dtk 365/udp # DTK
+dtk 365/tcp # DTK
+# Fred Cohen <fc@all.net>
+odmr 366/udp # ODMR
+odmr 366/tcp # ODMR
+# Randall Gellens <randy@qualcomm.com>
+mortgageware 367/udp # MortgageWare
+mortgageware 367/tcp # MortgageWare
+# Ole Hellevik <oleh@interlinq.com>
+qbikgdp 368/udp # QbikGDP
+qbikgdp 368/tcp # QbikGDP
+# Adrien de Croy <adrien@qbik.com>
+rpc2portmap 369/udp # rpc2portmap
+rpc2portmap 369/tcp # rpc2portmap
+codaauth2 370/udp # codaauth2
+codaauth2 370/tcp # codaauth2
+# Robert Watson <robert@cyrus.watson.org>
clearcase 371/udp # Clearcase
clearcase 371/tcp # Clearcase
# Dave LeBlang <leglang@atria.com>
@@ -1021,7 +1021,7 @@ opc-job-track 424/tcp # IBM Operations Planning and Control Track
# Conny Larsson <cocke@VNET.IBM.COM>
icad-el 425/udp # ICAD
icad-el 425/tcp # ICAD
-# Larry Stone <lcs@icad.com>
+# Larry Stone <lcs@icad.com>
smartsdp 426/udp # smartsdp
smartsdp 426/tcp # smartsdp
# Alexander Dupuy <dupuy@smarts.com>
@@ -1085,7 +1085,7 @@ ddm-dfm 447/tcp # DDM-RFM
# Jan David Fisher <jdfisher@VNET.IBM.COM>
ddm-ssl 448/udp # DDM-SSL
ddm-ssl 448/tcp # DDM-SSL
-# Steve Ritland <srr@vnet.ibm.com>
+# Steve Ritland <srr@vnet.ibm.com>
as-servermap 449/udp # AS Server Mapper
as-servermap 449/tcp # AS Server Mapper
# Barbara Foss <BGFOSS@rchvmv.vnet.ibm.com>
@@ -1094,8 +1094,8 @@ tserver 450/tcp # Computer Supported Telecomunication Applications
# Harvey S. Schultz <harvey@acm.org>
sfs-smp-net 451/udp # Cray Network Semaphore server
sfs-smp-net 451/tcp # Cray Network Semaphore server
-sfs-config 452/udp # Cray SFS config server
-sfs-config 452/tcp # Cray SFS config server
+sfs-config 452/udp # Cray SFS config server
+sfs-config 452/tcp # Cray SFS config server
# Walter Poxon <wdp@ironwood.cray.com>
creativeserver 453/udp # CreativeServer
creativeserver 453/tcp # CreativeServer
@@ -1330,9 +1330,9 @@ ncp 524/udp # NCP
ncp 524/tcp # NCP
# Don Provan <donp@sjf.novell.com>
timed 525/udp # timeserver
-timed 525/tcp # timeserver
-tempo 526/udp # newdate
-tempo 526/tcp # newdate
+timed 525/tcp # timeserver
+tempo 526/udp # newdate
+tempo 526/tcp # newdate
# Unknown
stx 527/udp # Stock IXChange
stx 527/tcp # Stock IXChange
@@ -1348,8 +1348,8 @@ conference 531/udp # chat
conference 531/tcp # chat
netnews 532/udp # readnews
netnews 532/tcp # readnews
-netwall 533/udp # for emergency broadcasts
-netwall 533/tcp # for emergency broadcasts
+netwall 533/udp # for emergency broadcasts
+netwall 533/tcp # for emergency broadcasts
mm-admin 534/udp # MegaMedia Admin
mm-admin 534/tcp # MegaMedia Admin
# Andreas Heidemann <a.heidemann@ais-gmbh.de>
@@ -1367,8 +1367,8 @@ gdomap 538/tcp # gdomap
# Richard Frith-Macdonald <richard@brainstorm.co.uk>
apertus-ldp 539/udp # Apertus Technologies Load Determination
apertus-ldp 539/tcp # Apertus Technologies Load Determination
-uucp 540/udp # uucpd
-uucp 540/tcp # uucpd
+uucp 540/udp # uucpd
+uucp 540/tcp # uucpd
uucp-rlogin 541/udp # uucp-rlogin
uucp-rlogin 541/tcp # uucp-rlogin
# Stuart Lynne <sl@wimsey.com>
@@ -1377,8 +1377,8 @@ commerce 542/tcp # commerce
# Randy Epstein <repstein@host.net>
klogin 543/udp #
klogin 543/tcp #
-kshell 544/udp # krcmd
-kshell 544/tcp # krcmd
+kshell 544/udp # krcmd
+kshell 544/tcp # krcmd
appleqtcsrvr 545/udp # appleqtcsrvr
appleqtcsrvr 545/tcp # appleqtcsrvr
# Murali Ranganathan
@@ -1446,8 +1446,8 @@ ms-rome 569/tcp # microsoft rome
# Rudolph Balaz <rudolphb@microsoft.com>
meter 570/udp # demon
meter 570/tcp # demon
-meter 571/udp # udemon
-meter 571/tcp # udemon
+meter 571/udp # udemon
+meter 571/tcp # udemon
sonar 572/udp # sonar
sonar 572/tcp # sonar
# Keith Moore <moore@cs.utk.edu>
@@ -1467,65 +1467,65 @@ vnas 577/tcp # vnas
ipdd 578/udp # ipdd
ipdd 578/tcp # ipdd
# Jay Farhat <jfarhat@ipass.com>
-decbsrv 579/udp # decbsrv
-decbsrv 579/tcp # decbsrv
-# Rudi Martin <movies::martin"@movies.enet.dec.com>
-sntp-heartbeat 580/udp # SNTP HEARTBEAT
+decbsrv 579/udp # decbsrv
+decbsrv 579/tcp # decbsrv
+# Rudi Martin <movies::martin"@movies.enet.dec.com>
+sntp-heartbeat 580/udp # SNTP HEARTBEAT
sntp-heartbeat 580/tcp # SNTP HEARTBEAT
-# Louis Mamakos <louie@uu.net>
-bdp 581/udp # Bundle Discovery Protocol
-bdp 581/tcp # Bundle Discovery Protocol
-# Gary Malkin <gmalkin@xylogics.com>
-scc-security 582/udp # SCC Security
+# Louis Mamakos <louie@uu.net>
+bdp 581/udp # Bundle Discovery Protocol
+bdp 581/tcp # Bundle Discovery Protocol
+# Gary Malkin <gmalkin@xylogics.com>
+scc-security 582/udp # SCC Security
scc-security 582/tcp # SCC Security
-# Prashant Dholakia <prashant@semaphorecom.com>
-philips-vc 583/udp # Philips Video-Conferencing
-philips-vc 583/tcp # Philips Video-Conferencing
-# Janna Chang <janna@pmc.philips.com>
-keyserver 584/udp # Key Server
-keyserver 584/tcp # Key Server
-# Gary Howland <gary@systemics.com>
-imap4-ssl 585/udp # IMAP4+SSL (use 993 instead)
-imap4-ssl 585/tcp # IMAP4+SSL (use 993 instead)
-# Terry Gray <gray@cac.washington.edu>
+# Prashant Dholakia <prashant@semaphorecom.com>
+philips-vc 583/udp # Philips Video-Conferencing
+philips-vc 583/tcp # Philips Video-Conferencing
+# Janna Chang <janna@pmc.philips.com>
+keyserver 584/udp # Key Server
+keyserver 584/tcp # Key Server
+# Gary Howland <gary@systemics.com>
+imap4-ssl 585/udp # IMAP4+SSL (use 993 instead)
+imap4-ssl 585/tcp # IMAP4+SSL (use 993 instead)
+# Terry Gray <gray@cac.washington.edu>
# Use of 585 is not recommended, use 993 instead
-password-chg 586/udp # Password Change
-password-chg 586/tcp # Password Change
-submission 587/udp # Submission
-submission 587/tcp # Submission
-# Randy Gellens <randy@qualcomm.com>
-cal 588/udp # CAL
-cal 588/tcp # CAL
-# Myron Hattig <Myron_Hattig@ccm.jf.intel.com>
-eyelink 589/udp # EyeLink
-eyelink 589/tcp # EyeLink
-# Dave Stampe <dstampe@psych.toronto.edu>
-tns-cml 590/udp # TNS CML
-tns-cml 590/tcp # TNS CML
-# Jerome Albin <albin@taec.enet.dec.com>
-http-alt 591/udp # FileMaker, Inc. - HTTP Alternate (see Port 80)
-http-alt 591/tcp # FileMaker, Inc. - HTTP Alternate (see Port 80)
-# Clay Maeckel <clay_maeckel@filemaker.com>
-eudora-set 592/udp # Eudora Set
-eudora-set 592/tcp # Eudora Set
-# Randall Gellens <randy@qualcomm.com>
+password-chg 586/udp # Password Change
+password-chg 586/tcp # Password Change
+submission 587/udp # Submission
+submission 587/tcp # Submission
+# Randy Gellens <randy@qualcomm.com>
+cal 588/udp # CAL
+cal 588/tcp # CAL
+# Myron Hattig <Myron_Hattig@ccm.jf.intel.com>
+eyelink 589/udp # EyeLink
+eyelink 589/tcp # EyeLink
+# Dave Stampe <dstampe@psych.toronto.edu>
+tns-cml 590/udp # TNS CML
+tns-cml 590/tcp # TNS CML
+# Jerome Albin <albin@taec.enet.dec.com>
+http-alt 591/udp # FileMaker, Inc. - HTTP Alternate (see Port 80)
+http-alt 591/tcp # FileMaker, Inc. - HTTP Alternate (see Port 80)
+# Clay Maeckel <clay_maeckel@filemaker.com>
+eudora-set 592/udp # Eudora Set
+eudora-set 592/tcp # Eudora Set
+# Randall Gellens <randy@qualcomm.com>
http-rpc-epmap 593/udp # HTTP RPC Ep Map
http-rpc-epmap 593/tcp # HTTP RPC Ep Map
-# Edward Reus <edwardr@microsoft.com>
-tpip 594/udp # TPIP
-tpip 594/tcp # TPIP
-# Brad Spear <spear@platinum.com>
-cab-protocol 595/udp # CAB Protocol
-cab-protocol 595/tcp # CAB Protocol
-# Winston Hetherington
+# Edward Reus <edwardr@microsoft.com>
+tpip 594/udp # TPIP
+tpip 594/tcp # TPIP
+# Brad Spear <spear@platinum.com>
+cab-protocol 595/udp # CAB Protocol
+cab-protocol 595/tcp # CAB Protocol
+# Winston Hetherington
smsd 596/udp # SMSD
smsd 596/tcp # SMSD
# Wayne Barlow <web@unx.dec.com>
-ptcnameservice 597/udp # PTC Name Service
-ptcnameservice 597/tcp # PTC Name Service
+ptcnameservice 597/udp # PTC Name Service
+ptcnameservice 597/tcp # PTC Name Service
# Yuri Machkasov <yuri@ptc.com>
-sco-websrvrmg3 598/udp # SCO Web Server Manager 3
-sco-websrvrmg3 598/tcp # SCO Web Server Manager 3
+sco-websrvrmg3 598/udp # SCO Web Server Manager 3
+sco-websrvrmg3 598/tcp # SCO Web Server Manager 3
# Simon Baldwin <simonb@sco.com>
acp 599/udp # Aeolon Core Protocol
acp 599/tcp # Aeolon Core Protocol
@@ -1563,68 +1563,68 @@ npmp-local 610/tcp # npmp-local
npmp-gui 611/udp # npmp-gui
npmp-gui 611/tcp # npmp-gui
# John Barnes <jbarnes@crl.com>
-hmmp-ind 612/udp # HMMP Indication
-hmmp-ind 612/tcp # HMMP Indication
-hmmp-op 613/udp # HMMP Operation
-hmmp-op 613/tcp # HMMP Operation
-# Andrew Sinclair <andrsin@microsoft.com>
-sshell 614/udp # SSLshell
-sshell 614/tcp # SSLshell
-# Simon J. Gerraty <sjg@quick.com.au>
-sco-inetmgr 615/udp # Internet Configuration Manager
-sco-inetmgr 615/tcp # Internet Configuration Manager
-sco-sysmgr 616/udp # SCO System Administration Server
-sco-sysmgr 616/tcp # SCO System Administration Server
-sco-dtmgr 617/udp # SCO Desktop Administration Server
-sco-dtmgr 617/tcp # SCO Desktop Administration Server
-# Christopher Durham <chrisdu@sco.com>
-dei-icda 618/udp # DEI-ICDA
-dei-icda 618/tcp # DEI-ICDA
-# David Turner <digital@Quetico.tbaytel.net>
-compaq-evm 619/udp # Compaq EVM
-compaq-evm 619/tcp # Compaq EVM
-# Jem Treadwell <Jem.Treadwell@compaq.com>
+hmmp-ind 612/udp # HMMP Indication
+hmmp-ind 612/tcp # HMMP Indication
+hmmp-op 613/udp # HMMP Operation
+hmmp-op 613/tcp # HMMP Operation
+# Andrew Sinclair <andrsin@microsoft.com>
+sshell 614/udp # SSLshell
+sshell 614/tcp # SSLshell
+# Simon J. Gerraty <sjg@quick.com.au>
+sco-inetmgr 615/udp # Internet Configuration Manager
+sco-inetmgr 615/tcp # Internet Configuration Manager
+sco-sysmgr 616/udp # SCO System Administration Server
+sco-sysmgr 616/tcp # SCO System Administration Server
+sco-dtmgr 617/udp # SCO Desktop Administration Server
+sco-dtmgr 617/tcp # SCO Desktop Administration Server
+# Christopher Durham <chrisdu@sco.com>
+dei-icda 618/udp # DEI-ICDA
+dei-icda 618/tcp # DEI-ICDA
+# David Turner <digital@Quetico.tbaytel.net>
+compaq-evm 619/udp # Compaq EVM
+compaq-evm 619/tcp # Compaq EVM
+# Jem Treadwell <Jem.Treadwell@compaq.com>
sco-websrvrmgr 620/udp # SCO WebServer Manager
sco-websrvrmgr 620/tcp # SCO WebServer Manager
-# Christopher Durham <chrisdu@sco.com>
-escp-ip 621/udp # ESCP
-escp-ip 621/tcp # ESCP
-# Lai Zit Seng <lzs@pobox.com>
-collaborator 622/udp # Collaborator
-collaborator 622/tcp # Collaborator
-# Johnson Davis <johnsond@opteamasoft.com>
+# Christopher Durham <chrisdu@sco.com>
+escp-ip 621/udp # ESCP
+escp-ip 621/tcp # ESCP
+# Lai Zit Seng <lzs@pobox.com>
+collaborator 622/udp # Collaborator
+collaborator 622/tcp # Collaborator
+# Johnson Davis <johnsond@opteamasoft.com>
asf-rmcp 623/udp # ASF Remote Management and Control Protocol
asf-rmcp 623/tcp # ASF Remote Management and Control Protocol
# Carl First <Carl.L.First@intel.com>
-cryptoadmin 624/udp # Crypto Admin
-cryptoadmin 624/tcp # Crypto Admin
-# Tony Walker <tony@cryptocard.com>
-dec_dlm 625/udp # DEC DLM
-dec_dlm 625/tcp # DEC DLM
-# Rudi Martin <Rudi.Martin@edo.mts.dec.com>
-asia 626/udp # ASIA
-asia 626/tcp # ASIA
-# Michael Dasenbrock <dasenbro@apple.com>
-passgo-tivoli 627/udp # PassGo Tivoli
-passgo-tivoli 627/tcp # PassGo Tivoli
-# Chris Hall <chall@passgo.com>
-qmqp 628/udp # QMQP
-qmqp 628/tcp # QMQP
-# Dan Bernstein <djb@cr.yp.to>
-3com-amp3 629/udp # 3Com AMP3
-3com-amp3 629/tcp # 3Com AMP3
-# Prakash Banthia <prakash_banthia@3com.com>
-rda 630/udp # RDA
-rda 630/tcp # RDA
-# John Hadjioannou <john@minster.co.uk>
-ipp 631/udp # IPP (Internet Printing Protocol)
-ipp 631/tcp # IPP (Internet Printing Protocol)
-# Carl-Uno Manros <manros@cp10.es.xerox.com>
-bmpp 632/udp # bmpp
-bmpp 632/tcp # bmpp
-# Troy Rollo <troy@kroll.corvu.com.au>
-servstat 633/udp # Service Status update (Sterling Software)
-servstat 633/tcp # Service Status update (Sterling Software)
+cryptoadmin 624/udp # Crypto Admin
+cryptoadmin 624/tcp # Crypto Admin
+# Tony Walker <tony@cryptocard.com>
+dec_dlm 625/udp # DEC DLM
+dec_dlm 625/tcp # DEC DLM
+# Rudi Martin <Rudi.Martin@edo.mts.dec.com>
+asia 626/udp # ASIA
+asia 626/tcp # ASIA
+# Michael Dasenbrock <dasenbro@apple.com>
+passgo-tivoli 627/udp # PassGo Tivoli
+passgo-tivoli 627/tcp # PassGo Tivoli
+# Chris Hall <chall@passgo.com>
+qmqp 628/udp # QMQP
+qmqp 628/tcp # QMQP
+# Dan Bernstein <djb@cr.yp.to>
+3com-amp3 629/udp # 3Com AMP3
+3com-amp3 629/tcp # 3Com AMP3
+# Prakash Banthia <prakash_banthia@3com.com>
+rda 630/udp # RDA
+rda 630/tcp # RDA
+# John Hadjioannou <john@minster.co.uk>
+ipp 631/udp # IPP (Internet Printing Protocol)
+ipp 631/tcp # IPP (Internet Printing Protocol)
+# Carl-Uno Manros <manros@cp10.es.xerox.com>
+bmpp 632/udp # bmpp
+bmpp 632/tcp # bmpp
+# Troy Rollo <troy@kroll.corvu.com.au>
+servstat 633/udp # Service Status update (Sterling Software)
+servstat 633/tcp # Service Status update (Sterling Software)
# Greg Rose <Greg_Rose@sydney.sterling.com>
ginad 634/udp # ginad
ginad 634/tcp # ginad
@@ -1638,69 +1638,69 @@ ldaps 636/tcp # ldap protocol over TLS/SSL (was sldap)
lanserver 637/udp # lanserver
lanserver 637/tcp # lanserver
# Chris Larsson <clarsson@VNET.IBM.COM>
-mcns-sec 638/udp # mcns-sec
-mcns-sec 638/tcp # mcns-sec
-# Kaz Ozawa <k.ozawa@cablelabs.com>
-msdp 639/udp # MSDP
-msdp 639/tcp # MSDP
-# Dino Farinacci <dino@cisco.com>
-entrust-sps 640/udp # entrust-sps
-entrust-sps 640/tcp # entrust-sps
-# Marek Buchler <Marek.Buchler@entrust.com>
-repcmd 641/udp # repcmd
-repcmd 641/tcp # repcmd
-# Scott Dale <scott@Replicase.com>
-esro-emsdp 642/udp # ESRO-EMSDP V1.3
-esro-emsdp 642/tcp # ESRO-EMSDP V1.3
-# Mohsen Banan <mohsen@neda.com>
-sanity 643/udp # SANity
-sanity 643/tcp # SANity
-# Peter Viscarola <PeterGV@osr.com>
-dwr 644/udp # dwr
-dwr 644/tcp # dwr
-# Bill Fenner <fenner@parc.xerox.com>
-pssc 645/udp # PSSC
-pssc 645/tcp # PSSC
-# Egon Meier-Engelen <egon.meier-engelen@dlr.de>
-ldp 646/udp # LDP
-ldp 646/tcp # LDP
-# Bob Thomas <rhthomas@cisco.com>
+mcns-sec 638/udp # mcns-sec
+mcns-sec 638/tcp # mcns-sec
+# Kaz Ozawa <k.ozawa@cablelabs.com>
+msdp 639/udp # MSDP
+msdp 639/tcp # MSDP
+# Dino Farinacci <dino@cisco.com>
+entrust-sps 640/udp # entrust-sps
+entrust-sps 640/tcp # entrust-sps
+# Marek Buchler <Marek.Buchler@entrust.com>
+repcmd 641/udp # repcmd
+repcmd 641/tcp # repcmd
+# Scott Dale <scott@Replicase.com>
+esro-emsdp 642/udp # ESRO-EMSDP V1.3
+esro-emsdp 642/tcp # ESRO-EMSDP V1.3
+# Mohsen Banan <mohsen@neda.com>
+sanity 643/udp # SANity
+sanity 643/tcp # SANity
+# Peter Viscarola <PeterGV@osr.com>
+dwr 644/udp # dwr
+dwr 644/tcp # dwr
+# Bill Fenner <fenner@parc.xerox.com>
+pssc 645/udp # PSSC
+pssc 645/tcp # PSSC
+# Egon Meier-Engelen <egon.meier-engelen@dlr.de>
+ldp 646/udp # LDP
+ldp 646/tcp # LDP
+# Bob Thomas <rhthomas@cisco.com>
dhcp-failover 647/udp # DHCP Failover
dhcp-failover 647/tcp # DHCP Failover
# Bernard Volz <volz@ipworks.com>
rrp 648/udp # Registry Registrar Protocol (RRP)
rrp 648/tcp # Registry Registrar Protocol (RRP)
-# Scott Hollenbeck <shollenb@netsol.com>
+# Scott Hollenbeck <shollenb@netsol.com>
cadview-3d 649/udp # Cadview-3d - streaming 3d models over the internet
cadview-3d 649/tcp # Cadview-3d - streaming 3d models over the internet
# David Cooper <david.cooper@oracle.com>
-obex 650/udp # OBEX
-obex 650/tcp # OBEX
-# Jeff Garbers <FJG030@email.mot.com>
-ieee-mms 651/udp # IEEE MMS
-ieee-mms 651/tcp # IEEE MMS
-# Curtis Anderson <canderson@turbolinux.com>
-hello-port 652/udp # HELLO_PORT
-hello-port 652/tcp # HELLO_PORT
-# Patrick Cipiere <Patrick.Cipiere@UDcast.com>
-repscmd 653/udp # RepCmd
-repscmd 653/tcp # RepCmd
-# Scott Dale <scott@tioga.com>
-aodv 654/udp # AODV
-aodv 654/tcp # AODV
-# Charles Perkins <cperkins@eng.sun.com>
-tinc 655/udp # TINC
-tinc 655/tcp # TINC
-# Ivo Timmermans <itimmermans@bigfoot.com>
-spmp 656/udp # SPMP
-spmp 656/tcp # SPMP
-# Jakob Kaivo <jkaivo@nodomainname.net>
-rmc 657/udp # RMC
-rmc 657/tcp # RMC
-# Michael Schmidt <mmaass@us.ibm.com>
-tenfold 658/udp # TenFold
-tenfold 658/tcp # TenFold
-# Louis Olszyk <lolszyk@10fold.com>
+obex 650/udp # OBEX
+obex 650/tcp # OBEX
+# Jeff Garbers <FJG030@email.mot.com>
+ieee-mms 651/udp # IEEE MMS
+ieee-mms 651/tcp # IEEE MMS
+# Curtis Anderson <canderson@turbolinux.com>
+hello-port 652/udp # HELLO_PORT
+hello-port 652/tcp # HELLO_PORT
+# Patrick Cipiere <Patrick.Cipiere@UDcast.com>
+repscmd 653/udp # RepCmd
+repscmd 653/tcp # RepCmd
+# Scott Dale <scott@tioga.com>
+aodv 654/udp # AODV
+aodv 654/tcp # AODV
+# Charles Perkins <cperkins@eng.sun.com>
+tinc 655/udp # TINC
+tinc 655/tcp # TINC
+# Ivo Timmermans <itimmermans@bigfoot.com>
+spmp 656/udp # SPMP
+spmp 656/tcp # SPMP
+# Jakob Kaivo <jkaivo@nodomainname.net>
+rmc 657/udp # RMC
+rmc 657/tcp # RMC
+# Michael Schmidt <mmaass@us.ibm.com>
+tenfold 658/udp # TenFold
+tenfold 658/tcp # TenFold
+# Louis Olszyk <lolszyk@10fold.com>
# 659 Removed (2001-06-06)
mac-srvr-admin 660/udp # MacOS Server Admin
mac-srvr-admin 660/tcp # MacOS Server Admin
@@ -1720,8 +1720,8 @@ asf-secure-rmcp 664/tcp # ASF Secure Remote Management and Control Protocol
sun-dr 665/udp # Sun DR
sun-dr 665/tcp # Sun DR
# Harinder Bhasin <Harinder.Bhasin@Sun.COM>
-mdqs 666/udp doom #
-mdqs 666/tcp doom #
+mdqs 666/udp doom #
+mdqs 666/tcp doom #
# <ddt@idcube.idsoftware.com>
disclose 667/udp # campaign contribution disclosures - SDR Technologies
disclose 667/tcp # campaign contribution disclosures - SDR Technologies
@@ -1740,67 +1740,67 @@ vpps-qua 672/tcp # VPPS-QUA
cimplex 673/udp # CIMPLEX
cimplex 673/tcp # CIMPLEX
# Ulysses G. Smith Jr. <ugsmith@cesi.com>
-acap 674/udp # ACAP
+acap 674/udp # ACAP
acap 674/tcp # ACAP
# Chris Newman <chris.newman@sun.com>
-dctp 675/udp # DCTP
-dctp 675/tcp # DCTP
-# Andre Kramer <Andre.Kramer@ansa.co.uk>
-vpps-via 676/udp # VPPS Via
-vpps-via 676/tcp # VPPS Via
-# Ulysses G. Smith Jr. <ugsmith@cesi.com>
-vpp 677/udp # Virtual Presence Protocol
-vpp 677/tcp # Virtual Presence Protocol
-# Klaus Wolf <wolf@cobrow.com>
-ggf-ncp 678/udp # GNU Generation Foundation NCP
-ggf-ncp 678/tcp # GNU Generation Foundation NCP
-# Noah Paul <noahp@altavista.net>
-mrm 679/udp # MRM
-mrm 679/tcp # MRM
-# Liming Wei <lwei@cisco.com>
-entrust-aaas 680/udp # entrust-aaas
-entrust-aaas 680/tcp # entrust-aaas
-entrust-aams 681/udp # entrust-aams
-entrust-aams 681/tcp # entrust-aams
-# Adrian Mancini <adrian.mancini@entrust.com>
-xfr 682/udp # XFR
-xfr 682/tcp # XFR
-# Noah Paul <noahp@ultranet.com>
-corba-iiop 683/udp # CORBA IIOP
-corba-iiop 683/tcp # CORBA IIOP
-corba-iiop-ssl 684/udp # CORBA IIOP SSL
-corba-iiop-ssl 684/tcp # CORBA IIOP SSL
-# Henry Lowe <lowe@omg.org>
-mdc-portmapper 685/udp # MDC Port Mapper
-mdc-portmapper 685/tcp # MDC Port Mapper
-# Noah Paul <noahp@altavista.net>
-hcp-wismar 686/udp # Hardware Control Protocol Wismar
-hcp-wismar 686/tcp # Hardware Control Protocol Wismar
-# David Merchant <d.f.merchant@livjm.ac.uk>
-asipregistry 687/udp # asipregistry
-asipregistry 687/tcp # asipregistry
-# Erik Sea <sea@apple.com>
-realm-rusd 688/udp # REALM-RUSD
-realm-rusd 688/tcp # REALM-RUSD
-# Jerry Knight <jknight@realminfo.com>
-nmap 689/udp # NMAP
-nmap 689/tcp # NMAP
-# Peter Dennis Bartok <peter@novonyx.com>
-vatp 690/udp # VATP
-vatp 690/tcp # VATP
-# Atica Software <comercial@aticasoft.es>
-msexch-routing 691/udp # MS Exchange Routing
-msexch-routing 691/tcp # MS Exchange Routing
-# David Lemson <dlemson@microsoft.com>
-hyperwave-isp 692/udp # Hyperwave-ISP
-hyperwave-isp 692/tcp # Hyperwave-ISP
-# Gerald Mesaric <gmesaric@hyperwave.com>
-connendp 693/udp # connendp
-connendp 693/tcp # connendp
-# Ronny Bremer <rbremer@future-gate.com>
-ha-cluster 694/udp # ha-cluster
-ha-cluster 694/tcp # ha-cluster
-# Alan Robertson <alanr@unix.sh>
+dctp 675/udp # DCTP
+dctp 675/tcp # DCTP
+# Andre Kramer <Andre.Kramer@ansa.co.uk>
+vpps-via 676/udp # VPPS Via
+vpps-via 676/tcp # VPPS Via
+# Ulysses G. Smith Jr. <ugsmith@cesi.com>
+vpp 677/udp # Virtual Presence Protocol
+vpp 677/tcp # Virtual Presence Protocol
+# Klaus Wolf <wolf@cobrow.com>
+ggf-ncp 678/udp # GNU Generation Foundation NCP
+ggf-ncp 678/tcp # GNU Generation Foundation NCP
+# Noah Paul <noahp@altavista.net>
+mrm 679/udp # MRM
+mrm 679/tcp # MRM
+# Liming Wei <lwei@cisco.com>
+entrust-aaas 680/udp # entrust-aaas
+entrust-aaas 680/tcp # entrust-aaas
+entrust-aams 681/udp # entrust-aams
+entrust-aams 681/tcp # entrust-aams
+# Adrian Mancini <adrian.mancini@entrust.com>
+xfr 682/udp # XFR
+xfr 682/tcp # XFR
+# Noah Paul <noahp@ultranet.com>
+corba-iiop 683/udp # CORBA IIOP
+corba-iiop 683/tcp # CORBA IIOP
+corba-iiop-ssl 684/udp # CORBA IIOP SSL
+corba-iiop-ssl 684/tcp # CORBA IIOP SSL
+# Henry Lowe <lowe@omg.org>
+mdc-portmapper 685/udp # MDC Port Mapper
+mdc-portmapper 685/tcp # MDC Port Mapper
+# Noah Paul <noahp@altavista.net>
+hcp-wismar 686/udp # Hardware Control Protocol Wismar
+hcp-wismar 686/tcp # Hardware Control Protocol Wismar
+# David Merchant <d.f.merchant@livjm.ac.uk>
+asipregistry 687/udp # asipregistry
+asipregistry 687/tcp # asipregistry
+# Erik Sea <sea@apple.com>
+realm-rusd 688/udp # REALM-RUSD
+realm-rusd 688/tcp # REALM-RUSD
+# Jerry Knight <jknight@realminfo.com>
+nmap 689/udp # NMAP
+nmap 689/tcp # NMAP
+# Peter Dennis Bartok <peter@novonyx.com>
+vatp 690/udp # VATP
+vatp 690/tcp # VATP
+# Atica Software <comercial@aticasoft.es>
+msexch-routing 691/udp # MS Exchange Routing
+msexch-routing 691/tcp # MS Exchange Routing
+# David Lemson <dlemson@microsoft.com>
+hyperwave-isp 692/udp # Hyperwave-ISP
+hyperwave-isp 692/tcp # Hyperwave-ISP
+# Gerald Mesaric <gmesaric@hyperwave.com>
+connendp 693/udp # connendp
+connendp 693/tcp # connendp
+# Ronny Bremer <rbremer@future-gate.com>
+ha-cluster 694/udp # ha-cluster
+ha-cluster 694/tcp # ha-cluster
+# Alan Robertson <alanr@unix.sh>
ieee-mms-ssl 695/udp # IEEE-MMS-SSL
ieee-mms-ssl 695/tcp # IEEE-MMS-SSL
# Curtis Anderson <ecanderson@turbolinux.com>
@@ -1817,26 +1817,26 @@ accessnetwork 699/udp # Access Network
accessnetwork 699/tcp # Access Network
# Yingchun Xu <Yingchun_Xu@3com.com>
# 700-703 Unassigned
-elcsd 704/udp # errlog copy/server daemon
-elcsd 704/tcp # errlog copy/server daemon
-agentx 705/udp # AgentX
-agentx 705/tcp # AgentX
-# Bob Natale <natale@acec.com>
+elcsd 704/udp # errlog copy/server daemon
+elcsd 704/tcp # errlog copy/server daemon
+agentx 705/udp # AgentX
+agentx 705/tcp # AgentX
+# Bob Natale <natale@acec.com>
silc 706/udp # SILC
-silc 706/tcp # SILC
-# Pekka Riikonen <priikone@poseidon.pspt.fi>
-borland-dsj 707/udp # Borland DSJ
-borland-dsj 707/tcp # Borland DSJ
-# Gerg Cole <gcole@corp.borland.com>
-# 708 Unassigned
+silc 706/tcp # SILC
+# Pekka Riikonen <priikone@poseidon.pspt.fi>
+borland-dsj 707/udp # Borland DSJ
+borland-dsj 707/tcp # Borland DSJ
+# Gerg Cole <gcole@corp.borland.com>
+# 708 Unassigned
entrust-kmsh 709/udp # Entrust Key Management Service Handler
entrust-kmsh 709/tcp # Entrust Key Management Service Handler
entrust-ash 710/udp # Entrust Administration Service Handler
entrust-ash 710/tcp # Entrust Administration Service Handler
# Peter Whittaker <pww@entrust.com>
-cisco-tdp 711/udp # Cisco TDP
-cisco-tdp 711/tcp # Cisco TDP
-# Bruce Davie <bsd@cisco.com>
+cisco-tdp 711/udp # Cisco TDP
+cisco-tdp 711/tcp # Cisco TDP
+# Bruce Davie <bsd@cisco.com>
# 712-728 Unassigned
netviewdm1 729/udp # IBM NetView DM/6000 Server/Client
netviewdm1 729/tcp # IBM NetView DM/6000 Server/Client
@@ -1865,83 +1865,83 @@ ris-cm 748/tcp # Russell Info Sci Calendar Manager
kerberos-adm 749/udp # kerberos administration
kerberos-adm 749/tcp # kerberos administration
loadav 750/udp kerberos-iv #
-rfile 750/tcp #
+rfile 750/tcp #
# Martin Hamilton <martin@mrrl.lut.as.uk>
-pump 751/udp #
-pump 751/tcp #
-qrh 752/udp #
-qrh 752/tcp #
-rrh 753/udp #
-rrh 753/tcp #
-tell 754/udp # send
-tell 754/tcp # send
+pump 751/udp #
+pump 751/tcp #
+qrh 752/udp #
+qrh 752/tcp #
+rrh 753/udp #
+rrh 753/tcp #
+tell 754/udp # send
+tell 754/tcp # send
# Josyula R. Rao <jrrao@watson.ibm.com>
# 755-756 Unassigned
-nlogin 758/udp #
-nlogin 758/tcp #
-con 759/udp #
-con 759/tcp #
-ns 760/udp #
-ns 760/tcp #
-rxe 761/udp #
-rxe 761/tcp #
-quotad 762/udp #
-quotad 762/tcp #
+nlogin 758/udp #
+nlogin 758/tcp #
+con 759/udp #
+con 759/tcp #
+ns 760/udp #
+ns 760/tcp #
+rxe 761/udp #
+rxe 761/tcp #
+quotad 762/udp #
+quotad 762/tcp #
cycleserv 763/udp #
cycleserv 763/tcp #
-omserv 764/udp #
-omserv 764/tcp #
-webster 765/udp #
-webster 765/tcp #
+omserv 764/udp #
+omserv 764/tcp #
+webster 765/udp #
+webster 765/tcp #
# Josyula R. Rao <jrrao@watson.ibm.com>
# 766 Unassigned
-phonebook 767/udp # phone
-phonebook 767/tcp # phone
+phonebook 767/udp # phone
+phonebook 767/tcp # phone
# Josyula R. Rao <jrrao@watson.ibm.com>
# 768 Unassigned
-vid 769/udp #
-vid 769/tcp #
+vid 769/udp #
+vid 769/tcp #
cadlock 770/udp #
cadlock 770/tcp #
-rtip 771/udp #
-rtip 771/tcp #
+rtip 771/udp #
+rtip 771/tcp #
cycleserv2 772/udp #
cycleserv2 772/tcp #
-notify 773/udp #
-submit 773/tcp #
+notify 773/udp #
+submit 773/tcp #
acmaint_dbd 774/udp #
-rpasswd 774/tcp #
-acmaint_transd 775/udp #
-entomb 775/tcp #
+rpasswd 774/tcp #
+acmaint_transd 775/udp #
+entomb 775/tcp #
wpages 776/udp #
-wpages 776/tcp #
+wpages 776/tcp #
# Josyula R. Rao <jrrao@watson.ibm.com>
-multiling-http 777/udp # Multiling HTTP
-multiling-http 777/tcp # Multiling HTTP
-# Alejandro Bonet <babel@ctv.es>
-# 778-779 Unassigned
-wpgs 780/udp #
-wpgs 780/tcp #
+multiling-http 777/udp # Multiling HTTP
+multiling-http 777/tcp # Multiling HTTP
+# Alejandro Bonet <babel@ctv.es>
+# 778-779 Unassigned
+wpgs 780/udp #
+wpgs 780/tcp #
# Josyula R. Rao <jrrao@watson.ibm.com>
# 781-785 Unassigned
# 786 Unassigned (Removed 2002-05-08)
# 787 Unassigned (Removed 2002-10-08)
# 788-799 Unassigned
-mdbs_daemon 800/udp #
-mdbs_daemon 800/tcp #
-device 801/udp #
-device 801/tcp #
-# 802-809 Unassigned
-fcp-udp 810/udp # FCP Datagram
-fcp-udp 810/tcp # FCP
-# Paul Whittemore <paul@softarc.com>
-# 811-827 Unassigned
-itm-mcell-s 828/udp # itm-mcell-s
-itm-mcell-s 828/tcp # itm-mcell-s
-# Miles O'Neal <meo@us.itmasters.com>
+mdbs_daemon 800/udp #
+mdbs_daemon 800/tcp #
+device 801/udp #
+device 801/tcp #
+# 802-809 Unassigned
+fcp-udp 810/udp # FCP Datagram
+fcp-udp 810/tcp # FCP
+# Paul Whittemore <paul@softarc.com>
+# 811-827 Unassigned
+itm-mcell-s 828/udp # itm-mcell-s
+itm-mcell-s 828/tcp # itm-mcell-s
+# Miles O'Neal <meo@us.itmasters.com>
pkix-3-ca-ra 829/udp # PKIX-3 CA/RA
-pkix-3-ca-ra 829/tcp # PKIX-3 CA/RA
-# Carlisle Adams <Cadams@entrust.com>
+pkix-3-ca-ra 829/tcp # PKIX-3 CA/RA
+# Carlisle Adams <Cadams@entrust.com>
# 830-846 Unassigned
dhcp-failover2 847/udp # dhcp-failover 2
dhcp-failover2 847/tcp # dhcp-failover 2
@@ -1971,10 +1971,10 @@ accessbuilder 888/tcp # AccessBuilder
cddbp 888/tcp # CD Database Protocol
# Steve Scherf <steve@moonsoft.com>
#
-# 889-899 Unassigned
+# 889-899 Unassigned
omginitialrefs 900/udp # OMG Initial Refs
omginitialrefs 900/tcp # OMG Initial Refs
-# Christian Callsen <Christian.Callsen@eng.sun.com>
+# Christian Callsen <Christian.Callsen@eng.sun.com>
smpnameres 901/udp # SMPNAMERES
smpnameres 901/tcp # SMPNAMERES
# Leif Ekblad <leif@rdos.net>
@@ -1993,47 +1993,47 @@ apex-edge 913/udp # APEX endpoint-relay service
apex-edge 913/tcp # APEX endpoint-relay service
# [RFC3340]
# 914-988 Unassigned
-ftps-data 989/udp # ftp protocol, data, over TLS/SSL
-ftps-data 989/tcp # ftp protocol, data, over TLS/SSL
-ftps 990/udp # ftp protocol, control, over TLS/SSL
-ftps 990/tcp # ftp protocol, control, over TLS/SSL
-# Christopher Allen <ChristopherA@consensus.com>
-nas 991/udp # Netnews Administration System
-nas 991/tcp # Netnews Administration System
-# Vera Heinau <heinau@fu-berlin.de>
-# Heiko Schlichting <heiko@fu-berlin.de>
-telnets 992/udp # telnet protocol over TLS/SSL
-telnets 992/tcp # telnet protocol over TLS/SSL
-imaps 993/udp # imap4 protocol over TLS/SSL
-imaps 993/tcp # imap4 protocol over TLS/SSL
-ircs 994/udp # irc protocol over TLS/SSL
-ircs 994/tcp # irc protocol over TLS/SSL
-# Christopher Allen <ChristopherA@consensus.com>
+ftps-data 989/udp # ftp protocol, data, over TLS/SSL
+ftps-data 989/tcp # ftp protocol, data, over TLS/SSL
+ftps 990/udp # ftp protocol, control, over TLS/SSL
+ftps 990/tcp # ftp protocol, control, over TLS/SSL
+# Christopher Allen <ChristopherA@consensus.com>
+nas 991/udp # Netnews Administration System
+nas 991/tcp # Netnews Administration System
+# Vera Heinau <heinau@fu-berlin.de>
+# Heiko Schlichting <heiko@fu-berlin.de>
+telnets 992/udp # telnet protocol over TLS/SSL
+telnets 992/tcp # telnet protocol over TLS/SSL
+imaps 993/udp # imap4 protocol over TLS/SSL
+imaps 993/tcp # imap4 protocol over TLS/SSL
+ircs 994/udp # irc protocol over TLS/SSL
+ircs 994/tcp # irc protocol over TLS/SSL
+# Christopher Allen <ChristopherA@consensus.com>
pop3s 995/udp # pop3 protocol over TLS/SSL (was spop3)
pop3s 995/tcp # pop3 protocol over TLS/SSL (was spop3)
# Gordon Mangione <gordm@microsoft.com>
vsinet 996/udp # vsinet
vsinet 996/tcp # vsinet
# Rob Juergens <robj@vsi.com>
-maitrd 997/udp #
-maitrd 997/tcp #
-puparp 998/udp #
-busboy 998/tcp #
-applix 999/udp puprouter # Applix ac
-garcon 999/tcp puprouter #
-cadlock2 1000/udp #
-cadlock2 1000/tcp #
+maitrd 997/udp #
+maitrd 997/tcp #
+puparp 998/udp #
+busboy 998/tcp #
+applix 999/udp puprouter # Applix ac
+garcon 999/tcp puprouter #
+cadlock2 1000/udp #
+cadlock2 1000/tcp #
# 1001-1009 Unassigned
-# 1008/udp Possibly used by Sun Solaris????
-surf 1010/udp # surf
-surf 1010/tcp # surf
-# Joseph Geer <jgeer@peapod.com>
-# 1011-1022 Reserved
- 1023/udp # Reserved
+# 1008/udp Possibly used by Sun Solaris????
+surf 1010/udp # surf
+surf 1010/tcp # surf
+# Joseph Geer <jgeer@peapod.com>
+# 1011-1022 Reserved
+ 1023/udp # Reserved
1023/tcp # Reserved
# IANA <iana@iana.org>
1024/udp # Reserved
- 1024/tcp # Reserved
+ 1024/tcp # Reserved
# IANA <iana@iana.org>
#
# REGISTERED PORT NUMBERS
@@ -2187,9 +2187,9 @@ ansoft-lm-1 1083/udp # Anasoft License Manager
ansoft-lm-1 1083/tcp # Anasoft License Manager
ansoft-lm-2 1084/udp # Anasoft License Manager
ansoft-lm-2 1084/tcp # Anasoft License Manager
-webobjects 1085/udp # Web Objects
-webobjects 1085/tcp # Web Objects
-# Andy Belk <abelk@apple.com>
+webobjects 1085/udp # Web Objects
+webobjects 1085/tcp # Web Objects
+# Andy Belk <abelk@apple.com>
cplscrambler-lg 1086/udp # CPL Scrambler Logging
cplscrambler-lg 1086/tcp # CPL Scrambler Logging
cplscrambler-in 1087/udp # CPL Scrambler Internal
@@ -2219,11 +2219,11 @@ nicelink 1095/tcp # NICELink
cnrprotocol 1096/udp # Common Name Resolution Protocol
cnrprotocol 1096/tcp # Common Name Resolution Protocol
# Michael Mealling <michaelm@netsol.com>
-sunclustermgr 1097/udp # Sun Cluster Manager
-sunclustermgr 1097/tcp # Sun Cluster Manager
+sunclustermgr 1097/udp # Sun Cluster Manager
+sunclustermgr 1097/tcp # Sun Cluster Manager
# Ashit Patel <Ashit.Patel@eng.Sun.COM>
-rmiactivation 1098/udp # RMI Activation
-rmiactivation 1098/tcp # RMI Activation
+rmiactivation 1098/udp # RMI Activation
+rmiactivation 1098/tcp # RMI Activation
rmiregistry 1099/udp # RMI Registry
rmiregistry 1099/tcp # RMI Registry
# Mark Hodapp <mark.hodapp@sun.com>
@@ -2422,15 +2422,15 @@ search-agent 1234/tcp # Infoseek Search Agent
# Jackie Wu <jackiew@infoseek.com>
mosaicsyssvc1 1235/udp # mosaicsyssvc1
mosaicsyssvc1 1235/tcp # mosaicsyssvc1
-# Brian Matthews <bmatthews@mosaicsystems.com>
+# Brian Matthews <bmatthews@mosaicsystems.com>
bvcontrol 1236/udp # bvcontrol
bvcontrol 1236/tcp # bvcontrol
# Daniel J Walsh <dwalsh@bindview.com>
tsdos390 1237/udp # tsdos390
tsdos390 1237/tcp # tsdos390
# Ben Pracht <ben.pracht@tivoli.com>
-hacl-qs 1238/udp # hacl-qs
-hacl-qs 1238/tcp # hacl-qs
+hacl-qs 1238/udp # hacl-qs
+hacl-qs 1238/tcp # hacl-qs
# Farid Faez <farid_faez@hp.com>
nmsd 1239/udp # NMSD
nmsd 1239/tcp # NMSD
@@ -2438,12 +2438,12 @@ nmsd 1239/tcp # NMSD
instantia 1240/udp # Instantia
instantia 1240/tcp # Instantia
# Ruth Slater <ruth.slater@ideagen.co.uk>
-nessus 1241/udp # nessus
-nessus 1241/tcp # nessus
+nessus 1241/udp # nessus
+nessus 1241/tcp # nessus
# Jordan Hrycaj <jordan@mjh.teddy-net.com>
nmasoverip 1242/udp # NMAS over IP
nmasoverip 1242/tcp # NMAS over IP
-# Hal Henderson <hhenders@novell.com>
+# Hal Henderson <hhenders@novell.com>
serialgateway 1243/udp # SerialGateway
serialgateway 1243/tcp # SerialGateway
# Stephen LaValley <lavalley@lucent.com>
@@ -2458,52 +2458,52 @@ payrouter 1246/tcp # payrouter
visionpyramid 1247/udp # VisionPyramid
visionpyramid 1247/tcp # VisionPyramid
# Gavin Hutchinson <gavinh@visionlogistics.com>
-hermes 1248/udp # hermes
-hermes 1248/tcp # hermes
+hermes 1248/udp # hermes
+hermes 1248/tcp # hermes
# Not known
-mesavistaco 1249/udp # Mesa Vista Co
-mesavistaco 1249/tcp # Mesa Vista Co
+mesavistaco 1249/udp # Mesa Vista Co
+mesavistaco 1249/tcp # Mesa Vista Co
# Rick LaBanca <rel@mesasys.com>
-swldy-sias 1250/udp # swldy-sias
-swldy-sias 1250/tcp # swldy-sias
+swldy-sias 1250/udp # swldy-sias
+swldy-sias 1250/tcp # swldy-sias
# Peter E Williams <peter.williams@smallworld-us.com>
-servergraph 1251/udp # servergraph
+servergraph 1251/udp # servergraph
servergraph 1251/tcp # servergraph
# Lindsay Morris <lmorris@servergraph.com>
bspne-pcc 1252/udp # bspne-pcc
-bspne-pcc 1252/tcp # bspne-pcc
-q55-pcc 1253/udp # q55-pcc
+bspne-pcc 1252/tcp # bspne-pcc
+q55-pcc 1253/udp # q55-pcc
q55-pcc 1253/tcp # q55-pcc
-# Prem Tirilok <Prem.Tirilok@tellabs.com>
-de-noc 1254/udp # de-noc
-de-noc 1254/tcp # de-noc
+# Prem Tirilok <Prem.Tirilok@tellabs.com>
+de-noc 1254/udp # de-noc
+de-noc 1254/tcp # de-noc
de-cache-query 1255/udp # de-cache-query
de-cache-query 1255/tcp # de-cache-query
-de-server 1256/udp # de-server
-de-server 1256/tcp # de-server
-# Jeff Burdette <support@digitalenvoy.net>
-shockwave2 1257/udp # Shockwave 2
+de-server 1256/udp # de-server
+de-server 1256/tcp # de-server
+# Jeff Burdette <support@digitalenvoy.net>
+shockwave2 1257/udp # Shockwave 2
shockwave2 1257/tcp # Shockwave 2
-# Dave Simmons <dsimmons@macromedia.com>
-opennl 1258/udp # Open Network Library
-opennl 1258/tcp # Open Network Library
-opennl-voice 1259/udp # Open Network Library Voice
+# Dave Simmons <dsimmons@macromedia.com>
+opennl 1258/udp # Open Network Library
+opennl 1258/tcp # Open Network Library
+opennl-voice 1259/udp # Open Network Library Voice
opennl-voice 1259/tcp # Open Network Library Voice
# Phil Frisbie <phil@hawksoft.com>
-ibm-ssd 1260/udp # ibm-ssd
-ibm-ssd 1260/tcp # ibm-ssd
-# Barry Whyte <barry_whyte@uk.ibm.com>
-mpshrsv 1261/udp # mpshrsv
+ibm-ssd 1260/udp # ibm-ssd
+ibm-ssd 1260/tcp # ibm-ssd
+# Barry Whyte <barry_whyte@uk.ibm.com>
+mpshrsv 1261/udp # mpshrsv
mpshrsv 1261/tcp # mpshrsv
# Makoto Ikeyama <ikeyama@ael.fujitsu.co.jp>
qnts-orb 1262/udp # QNTS-ORB
-qnts-orb 1262/tcp # QNTS-ORB
+qnts-orb 1262/tcp # QNTS-ORB
# Raghurama Bhat <raghu@quintus.com>
-dka 1263/udp # dka
-dka 1263/tcp # dka
+dka 1263/udp # dka
+dka 1263/tcp # dka
# Chris Griffin <cgriffin@dka.com>
prat 1264/udp # PRAT
-prat 1264/tcp # PRAT
+prat 1264/tcp # PRAT
# Keith Wood <keith.wood@epid.eurotherm.co.uk>
dssiapi 1265/udp # DSSIAPI
dssiapi 1265/tcp # DSSIAPI
@@ -2602,9 +2602,9 @@ lpcp 1298/tcp # lpcp
hp-sci 1299/udp # hp-sci
hp-sci 1299/tcp # hp-sci
# Kim Scott <kims@cup.hp.com>
-h323hostcallsc 1300/udp # H323 Host Call Secure
-h323hostcallsc 1300/tcp # H323 Host Call Secure
-# Jim Toga <jtoga@ideal.jf.intel.com>
+h323hostcallsc 1300/udp # H323 Host Call Secure
+h323hostcallsc 1300/tcp # H323 Host Call Secure
+# Jim Toga <jtoga@ideal.jf.intel.com>
ci3-software-1 1301/udp # CI3-Software-1
ci3-software-1 1301/tcp # CI3-Software-1
ci3-software-2 1302/udp # CI3-Software-2
@@ -2617,7 +2617,7 @@ boomerang 1304/udp # Boomerang
boomerang 1304/tcp # Boomerang
# Bruce Lueckenhoff <brucelu@cisco.com>
pe-mike 1305/udp # pe-mike
-pe-mike 1305/tcp # pe-mike
+pe-mike 1305/tcp # pe-mike
# Stephen Hemminger <shemminger@passedge.com>
re-conn-proto 1306/udp # RE-Conn-Proto
re-conn-proto 1306/tcp # RE-Conn-Proto
@@ -2631,24 +2631,24 @@ odsi 1308/tcp # Optical Domain Service Interconnect (ODSI)
jtag-server 1309/udp # JTAG server
jtag-server 1309/tcp # JTAG server
# Andrew Draper <adraper@altera.com>
-husky 1310/udp # Husky
-husky 1310/tcp # Husky
-# Mark Zang <mark@zang.com>
-rxmon 1311/udp # RxMon
-rxmon 1311/tcp # RxMon
-# Javier Jiminez <javier_l_jimenez@dell.com>
-sti-envision 1312/udp # STI Envision
-sti-envision 1312/tcp # STI Envision
-# Don Stedman <dones@stisystems.com>
+husky 1310/udp # Husky
+husky 1310/tcp # Husky
+# Mark Zang <mark@zang.com>
+rxmon 1311/udp # RxMon
+rxmon 1311/tcp # RxMon
+# Javier Jiminez <javier_l_jimenez@dell.com>
+sti-envision 1312/udp # STI Envision
+sti-envision 1312/tcp # STI Envision
+# Don Stedman <dones@stisystems.com>
bmc_patroldb 1313/udp # BMC_PATROLDB
bmc_patroldb 1313/tcp # BMC_PATROLDB
# Devon Shows <Devon_Shows@crow.bmc.com>
pdps 1314/udp # Photoscript Distributed Printing System
-pdps 1314/tcp # Photoscript Distributed Printing System
-# Les Klein <sgy@cix.compulink.co.uk>
-els 1315/udp # E.L.S., Event Listener Service
-els 1315/tcp # E.L.S., Event Listener Service
-# Jim Cleppe <clep13@cfer.com>
+pdps 1314/tcp # Photoscript Distributed Printing System
+# Les Klein <sgy@cix.compulink.co.uk>
+els 1315/udp # E.L.S., Event Listener Service
+els 1315/tcp # E.L.S., Event Listener Service
+# Jim Cleppe <clep13@cfer.com>
exbit-escp 1316/udp # Exbit-ESCP
exbit-escp 1316/tcp # Exbit-ESCP
# Morten Christensen <mjc@exbit.dk>
@@ -2661,12 +2661,12 @@ krb5gatekeeper 1318/tcp # krb5gatekeeper
panja-icsp 1319/udp # Panja-ICSP
panja-icsp 1319/tcp # Panja-ICSP
# Ron Barber <ron.barber@panja.com>
-panja-axbnet 1320/udp # Panja-AXBNET
-panja-axbnet 1320/tcp # Panja-AXBNET
-# Andrew van Wensen <avanwensen@panja.com>
-pip 1321/udp # PIP
-pip 1321/tcp # PIP
-# Gordon Mohr <gojomo@usa.net>
+panja-axbnet 1320/udp # Panja-AXBNET
+panja-axbnet 1320/tcp # Panja-AXBNET
+# Andrew van Wensen <avanwensen@panja.com>
+pip 1321/udp # PIP
+pip 1321/tcp # PIP
+# Gordon Mohr <gojomo@usa.net>
novation 1322/udp # Novation
novation 1322/tcp # Novation
# Alan Dano <wiseobject@yahoo.com>
@@ -2706,11 +2706,11 @@ passwrd-policy 1333/tcp # Password Policy
writesrv 1334/udp # writesrv
writesrv 1334/tcp # writesrv
# Marvin Toungate <toungate@austin.ibm.com>
-digital-notary 1335/udp # Digital Notary Protocol
-digital-notary 1335/tcp # Digital Notary Protocol
-# Wes Doonan
+digital-notary 1335/udp # Digital Notary Protocol
+digital-notary 1335/tcp # Digital Notary Protocol
+# Wes Doonan
ischat 1336/udp # Instant Service Chat
-ischat 1336/tcp # Instant Service Chat
+ischat 1336/tcp # Instant Service Chat
# Mike Clise <mikec@instantservice.com>
menandmice-dns 1337/udp # menandmice DNS
menandmice-dns 1337/tcp # menandmice DNS
@@ -2722,29 +2722,29 @@ kjtsiteserver 1339/udp # kjtsiteserver
kjtsiteserver 1339/tcp # kjtsiteserver
# Jason Aubain <jaubain@kjt.com>
naap 1340/udp # NAAP
-naap 1340/tcp # NAAP
-# Henry Haverinen <henry.haverinen@nokia.com>
-qubes 1341/udp # QuBES
+naap 1340/tcp # NAAP
+# Henry Haverinen <henry.haverinen@nokia.com>
+qubes 1341/udp # QuBES
qubes 1341/tcp # QuBES
# Eric Grange <egrange@creative-it.net>
-esbroker 1342/udp # ESBroker
-esbroker 1342/tcp # ESBroker
+esbroker 1342/udp # ESBroker
+esbroker 1342/tcp # ESBroker
# Alexander Medvinsky <smedvinsky@gi.com>
re101 1343/udp # re101
-re101 1343/tcp # re101
+re101 1343/tcp # re101
# Doriano Blengino <tecnico@xonelectronics.it>
icap 1344/udp # ICAP
-icap 1344/tcp # ICAP
+icap 1344/tcp # ICAP
# Jeremy Elson <jelson@isi.edu>
vpjp 1345/udp # VPJP
vpjp 1345/tcp # VPJP
# Michael Collins <UBMCollins@aol.com>
alta-ana-lm 1346/udp # Alta Analytics License Manager
alta-ana-lm 1346/tcp # Alta Analytics License Manager
-bbn-mmc 1347/udp # multi media conferencing
-bbn-mmc 1347/tcp # multi media conferencing
-bbn-mmx 1348/udp # multi media conferencing
-bbn-mmx 1348/tcp # multi media conferencing
+bbn-mmc 1347/udp # multi media conferencing
+bbn-mmc 1347/tcp # multi media conferencing
+bbn-mmx 1348/udp # multi media conferencing
+bbn-mmx 1348/tcp # multi media conferencing
sbook 1349/udp # Registration Network Protocol
sbook 1349/tcp # Registration Network Protocol
editbench 1350/udp # Registration Network Protocol
@@ -3235,8 +3235,8 @@ ricardo-lm 1522/tcp # Ricardo North America License Manager
cichild-lm 1523/udp # cichild
cichild-lm 1523/tcp # cichild
# Andy Burgess <aab@cichlid.com>
-ingreslock 1524/udp # ingres
-ingreslock 1524/tcp # ingres
+ingreslock 1524/udp # ingres
+ingreslock 1524/tcp # ingres
orasrv 1525/udp prospero-np # oracle
orasrv 1525/tcp prospero-np # oracle
pdap-np 1526/udp # Prospero Data Access Prot non-priv
@@ -3456,8 +3456,8 @@ picknfs 1598/tcp # picknfs
simbaservices 1599/udp # simbaservices
simbaservices 1599/tcp # simbaservices
# Betsy Alexander +1 604-681-4549
-issd 1600/udp #
-issd 1600/tcp #
+issd 1600/udp #
+issd 1600/tcp #
aas 1601/udp # aas
aas 1601/tcp # aas
# Bob Beard <bobb@lachman.com>
@@ -3528,31 +3528,31 @@ udp-sr-port 1624/tcp # udp-sr-port
svs-omagent 1625/udp # svs-omagent
svs-omagent 1625/tcp # svs-omagent
# Alberto Berlen <aberlen@VNET.IBM.COM>
-shockwave 1626/udp # Shockwave
-shockwave 1626/tcp # Shockwave
-# Sarah Allen <sallen@macromedia.com>
-t128-gateway 1627/udp # T.128 Gateway
-t128-gateway 1627/tcp # T.128 Gateway
-# Phil May <pm@datcon.co.uk>
-lontalk-norm 1628/udp # LonTalk normal
-lontalk-norm 1628/tcp # LonTalk normal
-lontalk-urgnt 1629/udp # LonTalk urgent
-lontalk-urgnt 1629/tcp # LonTalk urgent
-# Dan Wing <dwing@cisco.com>
-oraclenet8cman 1630/udp # Oracle Net8 Cman
-oraclenet8cman 1630/tcp # Oracle Net8 Cman
-# Tong-Ming Lee <tmlee@us.oracle.com>
-visitview 1631/udp # Visit view
-visitview 1631/tcp # Visit view
-# Tom Whittaker <tomw@ssec.wisc.edu>
-pammratc 1632/udp # PAMMRATC
-pammratc 1632/tcp # PAMMRATC
-pammrpc 1633/udp # PAMMRPC
-pammrpc 1633/tcp # PAMMRPC
-# John Britton <johnb@peakaudio.com>
-loaprobe 1634/udp # Log On America Probe
-loaprobe 1634/tcp # Log On America Probe
-# James Tavares, Log On America <krontor@loa.com>
+shockwave 1626/udp # Shockwave
+shockwave 1626/tcp # Shockwave
+# Sarah Allen <sallen@macromedia.com>
+t128-gateway 1627/udp # T.128 Gateway
+t128-gateway 1627/tcp # T.128 Gateway
+# Phil May <pm@datcon.co.uk>
+lontalk-norm 1628/udp # LonTalk normal
+lontalk-norm 1628/tcp # LonTalk normal
+lontalk-urgnt 1629/udp # LonTalk urgent
+lontalk-urgnt 1629/tcp # LonTalk urgent
+# Dan Wing <dwing@cisco.com>
+oraclenet8cman 1630/udp # Oracle Net8 Cman
+oraclenet8cman 1630/tcp # Oracle Net8 Cman
+# Tong-Ming Lee <tmlee@us.oracle.com>
+visitview 1631/udp # Visit view
+visitview 1631/tcp # Visit view
+# Tom Whittaker <tomw@ssec.wisc.edu>
+pammratc 1632/udp # PAMMRATC
+pammratc 1632/tcp # PAMMRATC
+pammrpc 1633/udp # PAMMRPC
+pammrpc 1633/tcp # PAMMRPC
+# John Britton <johnb@peakaudio.com>
+loaprobe 1634/udp # Log On America Probe
+loaprobe 1634/tcp # Log On America Probe
+# James Tavares, Log On America <krontor@loa.com>
edb-server1 1635/udp # EDB Server 1
edb-server1 1635/tcp # EDB Server 1
# Carlos Portela <cportela@simple-sw.com>
@@ -3594,8 +3594,8 @@ concurrent-lm 1648/tcp # concurrent-lm
kermit 1649/udp # kermit
kermit 1649/tcp # kermit
# Frank da Cruz <fdc@watsun.cc.columbia.edu>
-nkd 1650/udp # nkd
-nkd 1650/tcp # nkdn
+nkd 1650/udp # nkd
+nkd 1650/tcp # nkdn
shiva_confsrvr 1651/udp # shiva_confsrvr
shiva_confsrvr 1651/tcp # shiva_confsrvr
# Mike Horowitz <mah@Shiva.COM>
@@ -3672,8 +3672,8 @@ prolink 1678/tcp # prolink
darcorp-lm 1679/udp # darcorp-lm
darcorp-lm 1679/tcp # darcorp-lm
# <DARcorp@aol.com>
-microcom-sbp 1680/udp # microcom-sbp
-microcom-sbp 1680/tcp # microcom-sbp
+microcom-sbp 1680/udp # microcom-sbp
+microcom-sbp 1680/tcp # microcom-sbp
# Boris B. Maiden <Boris_Maiden@smtp.microcom.com>
sd-elmd 1681/udp # sd-elmd
sd-elmd 1681/tcp # sd-elmd
@@ -3948,8 +3948,8 @@ femis 1776/tcp # Federal Emergency Management Information System
powerguardian 1777/udp # powerguardian
powerguardian 1777/tcp # powerguardian
# Charles Bennett <chuck@benatong.com>
-prodigy-intrnet 1778/udp # prodigy-internet
-prodigy-intrnet 1778/tcp # prodigy-internet
+prodigy-intrnet 1778/udp # prodigy-internet
+prodigy-intrnet 1778/tcp # prodigy-internet
# Bob Dedrick <bob@staff.prodigy.com>
pharmasoft 1779/udp # pharmasoft
pharmasoft 1779/tcp # pharmasoft
@@ -4010,43 +4010,43 @@ uma 1797/tcp # UMA
etp 1798/udp # Event Transfer Protocol
etp 1798/tcp # Event Transfer Protocol
# Mike Wray <mjw@hplb.hpl.hp.com>
-netrisk 1799/udp # NETRISK
-netrisk 1799/tcp # NETRISK
-# Kevin Green <Kevin_Green@tds.com>
-ansys-lm 1800/udp # ANSYS-License manager
-ansys-lm 1800/tcp # ANSYS-License manager
-# Suzanne Lorrin <sml@ansyspo.ansys.com>
-msmq 1801/udp # Microsoft Message Que
-msmq 1801/tcp # Microsoft Message Que
-# Amnon Horowitz <amnonh@MICROSOFT.com>
-concomp1 1802/udp # ConComp1
-concomp1 1802/tcp # ConComp1
-# Ed Vincent <@edv@concomp.com>
-hp-hcip-gwy 1803/udp # HP-HCIP-GWY
-hp-hcip-gwy 1803/tcp # HP-HCIP-GWY
-# Allen Baker <abaker@boi.hp.com>
-enl 1804/udp # ENL
-enl 1804/tcp # ENL
-# Brian Olson <BOlson@veritas.com>
-enl-name 1805/udp # ENL-Name
-enl-name 1805/tcp # ENL-Name
-# Brian Olson <BOlson@veritas.com>
-musiconline 1806/udp # Musiconline
-musiconline 1806/tcp # Musiconline
-# Craig Weeks <cweeks@syspace.co.uk>
-fhsp 1807/udp # Fujitsu Hot Standby Protocol
-fhsp 1807/tcp # Fujitsu Hot Standby Protocol
-# Eiki Iwata (eiki@nd.net.fujitsu.co.jp>
-oracle-vp2 1808/udp # Oracle-VP2
-oracle-vp2 1808/tcp # Oracle-VP2
+netrisk 1799/udp # NETRISK
+netrisk 1799/tcp # NETRISK
+# Kevin Green <Kevin_Green@tds.com>
+ansys-lm 1800/udp # ANSYS-License manager
+ansys-lm 1800/tcp # ANSYS-License manager
+# Suzanne Lorrin <sml@ansyspo.ansys.com>
+msmq 1801/udp # Microsoft Message Que
+msmq 1801/tcp # Microsoft Message Que
+# Amnon Horowitz <amnonh@MICROSOFT.com>
+concomp1 1802/udp # ConComp1
+concomp1 1802/tcp # ConComp1
+# Ed Vincent <@edv@concomp.com>
+hp-hcip-gwy 1803/udp # HP-HCIP-GWY
+hp-hcip-gwy 1803/tcp # HP-HCIP-GWY
+# Allen Baker <abaker@boi.hp.com>
+enl 1804/udp # ENL
+enl 1804/tcp # ENL
+# Brian Olson <BOlson@veritas.com>
+enl-name 1805/udp # ENL-Name
+enl-name 1805/tcp # ENL-Name
+# Brian Olson <BOlson@veritas.com>
+musiconline 1806/udp # Musiconline
+musiconline 1806/tcp # Musiconline
+# Craig Weeks <cweeks@syspace.co.uk>
+fhsp 1807/udp # Fujitsu Hot Standby Protocol
+fhsp 1807/tcp # Fujitsu Hot Standby Protocol
+# Eiki Iwata (eiki@nd.net.fujitsu.co.jp>
+oracle-vp2 1808/udp # Oracle-VP2
+oracle-vp2 1808/tcp # Oracle-VP2
# Craig Fowler <cfowler@us.oracle.com>
-oracle-vp1 1809/udp # Oracle-VP1
+oracle-vp1 1809/udp # Oracle-VP1
oracle-vp1 1809/tcp # Oracle-VP1
# Craig Fowler <cfowler@us.oracle.com>
-jerand-lm 1810/udp # Jerand License Manager
+jerand-lm 1810/udp # Jerand License Manager
jerand-lm 1810/tcp # Jerand License Manager
# Robert Monat <jerand@jerand.com>
-scientia-sdb 1811/udp # Scientia-SDB
+scientia-sdb 1811/udp # Scientia-SDB
scientia-sdb 1811/tcp # Scientia-SDB
# Ian Miller <Ian_Miller@scientia.com>
radius 1812/udp # RADIUS
@@ -4058,16 +4058,16 @@ radius-acct 1813/tcp # RADIUS Accounting
tdp-suite 1814/udp # TDP Suite
tdp-suite 1814/tcp # TDP Suite
# Rob Lockhart <rob.lockhart@mot.com>
-mmpft 1815/udp # MMPFT
-mmpft 1815/tcp # MMPFT
-# Ralf Muckenhirn <FAX: 49-7622-398200>
+mmpft 1815/udp # MMPFT
+mmpft 1815/tcp # MMPFT
+# Ralf Muckenhirn <FAX: 49-7622-398200>
# <Phone: 49-7622-3980>
-harp 1816/udp # HARP
-harp 1816/tcp # HARP
-# Bjorn Chambless <bjorn@cs.pdx.edu>
-rkb-oscs 1817/udp # RKB-OSCS
-rkb-oscs 1817/tcp # RKB-OSCS
-# Robert Kevin Breton <BOBBRETON@HOTMAIL.COM>
+harp 1816/udp # HARP
+harp 1816/tcp # HARP
+# Bjorn Chambless <bjorn@cs.pdx.edu>
+rkb-oscs 1817/udp # RKB-OSCS
+rkb-oscs 1817/tcp # RKB-OSCS
+# Robert Kevin Breton <BOBBRETON@HOTMAIL.COM>
etftp 1818/udp # Enhanced Trivial File Transfer Protocol
etftp 1818/tcp # Enhanced Trivial File Transfer Protocol
# William Polites <wpolites@mitre.org>
@@ -4089,61 +4089,61 @@ unisys-lm 1823/tcp # Unisys Natural Language License Manager
metrics-pas 1824/udp # metrics-pas
metrics-pas 1824/tcp # metrics-pas
# Tom Haapanen <tomh@metrics.com>
-direcpc-video 1825/udp # DirecPC Video
-direcpc-video 1825/tcp # DirecPC Video
-# Chris Kerrigan <ckerrigan@hns.com>
-ardt 1826/udp # ARDT
-ardt 1826/tcp # ARDT
-# Mike Goddard <mike.goddard@ardent.com.au>
-asi 1827/udp # ASI
-asi 1827/tcp # ASI
-# Bob Tournoux <bob.tournoux@usiny.mail.abb.com>
-itm-mcell-u 1828/udp # itm-mcell-u
-itm-mcell-u 1828/tcp # itm-mcell-u
-# Miles O'Neal <meo@us.itmasters.com>
-optika-emedia 1829/udp # Optika eMedia
-optika-emedia 1829/tcp # Optika eMedia
-# Daryle DeBalski <ddebalski@optika.com>
-net8-cman 1830/udp # Oracle Net8 CMan Admin
-net8-cman 1830/tcp # Oracle Net8 CMan Admin
-# Shuvayu Kanjilal
-myrtle 1831/udp # Myrtle
-myrtle 1831/tcp # Myrtle
-# Ron Achin <RAchin@genscan.com>
-tht-treasure 1832/udp # ThoughtTreasure
-tht-treasure 1832/tcp # ThoughtTreasure
-# Erik Mueller <erik@signiform.com>
-udpradio 1833/udp # udpradio
-udpradio 1833/tcp # udpradio
-# Guus Sliepen <guus@warande3094.warande.uu.nl>
-ardusuni 1834/udp # ARDUS Unicast
-ardusuni 1834/tcp # ARDUS Unicast
-ardusmul 1835/udp # ARDUS Multicast
-ardusmul 1835/tcp # ARDUS Multicast
-# Toshikatsu Ito <ito-t@pfu.co.jp>
-ste-smsc 1836/udp # ste-smsc
-ste-smsc 1836/tcp # ste-smsc
-# Tom Snauwaert <tom.snauwaert@st-electronics.be>
-csoft1 1837/udp # csoft1
-csoft1 1837/tcp # csoft1
-# John Coll <john@csoft.co.uk>
-talnet 1838/udp # TALNET
-talnet 1838/tcp # TALNET
-# Aaron Lav <aaron@taltrade.com>
-netopia-vo1 1839/udp # netopia-vo1
-netopia-vo1 1839/tcp # netopia-vo1
-netopia-vo2 1840/udp # netopia-vo2
-netopia-vo2 1840/tcp # netopia-vo2
-netopia-vo3 1841/udp # netopia-vo3
-netopia-vo3 1841/tcp # netopia-vo3
-netopia-vo4 1842/udp # netopia-vo4
-netopia-vo4 1842/tcp # netopia-vo4
-netopia-vo5 1843/udp # netopia-vo5
-netopia-vo5 1843/tcp # netopia-vo5
-# Marc Epard <marc@netopia.com>
-direcpc-dll 1844/udp # DirecPC-DLL
-direcpc-dll 1844/tcp # DirecPC-DLL
-# Chris Kerrigan <ckerrigan@hns.com>
+direcpc-video 1825/udp # DirecPC Video
+direcpc-video 1825/tcp # DirecPC Video
+# Chris Kerrigan <ckerrigan@hns.com>
+ardt 1826/udp # ARDT
+ardt 1826/tcp # ARDT
+# Mike Goddard <mike.goddard@ardent.com.au>
+asi 1827/udp # ASI
+asi 1827/tcp # ASI
+# Bob Tournoux <bob.tournoux@usiny.mail.abb.com>
+itm-mcell-u 1828/udp # itm-mcell-u
+itm-mcell-u 1828/tcp # itm-mcell-u
+# Miles O'Neal <meo@us.itmasters.com>
+optika-emedia 1829/udp # Optika eMedia
+optika-emedia 1829/tcp # Optika eMedia
+# Daryle DeBalski <ddebalski@optika.com>
+net8-cman 1830/udp # Oracle Net8 CMan Admin
+net8-cman 1830/tcp # Oracle Net8 CMan Admin
+# Shuvayu Kanjilal
+myrtle 1831/udp # Myrtle
+myrtle 1831/tcp # Myrtle
+# Ron Achin <RAchin@genscan.com>
+tht-treasure 1832/udp # ThoughtTreasure
+tht-treasure 1832/tcp # ThoughtTreasure
+# Erik Mueller <erik@signiform.com>
+udpradio 1833/udp # udpradio
+udpradio 1833/tcp # udpradio
+# Guus Sliepen <guus@warande3094.warande.uu.nl>
+ardusuni 1834/udp # ARDUS Unicast
+ardusuni 1834/tcp # ARDUS Unicast
+ardusmul 1835/udp # ARDUS Multicast
+ardusmul 1835/tcp # ARDUS Multicast
+# Toshikatsu Ito <ito-t@pfu.co.jp>
+ste-smsc 1836/udp # ste-smsc
+ste-smsc 1836/tcp # ste-smsc
+# Tom Snauwaert <tom.snauwaert@st-electronics.be>
+csoft1 1837/udp # csoft1
+csoft1 1837/tcp # csoft1
+# John Coll <john@csoft.co.uk>
+talnet 1838/udp # TALNET
+talnet 1838/tcp # TALNET
+# Aaron Lav <aaron@taltrade.com>
+netopia-vo1 1839/udp # netopia-vo1
+netopia-vo1 1839/tcp # netopia-vo1
+netopia-vo2 1840/udp # netopia-vo2
+netopia-vo2 1840/tcp # netopia-vo2
+netopia-vo3 1841/udp # netopia-vo3
+netopia-vo3 1841/tcp # netopia-vo3
+netopia-vo4 1842/udp # netopia-vo4
+netopia-vo4 1842/tcp # netopia-vo4
+netopia-vo5 1843/udp # netopia-vo5
+netopia-vo5 1843/tcp # netopia-vo5
+# Marc Epard <marc@netopia.com>
+direcpc-dll 1844/udp # DirecPC-DLL
+direcpc-dll 1844/tcp # DirecPC-DLL
+# Chris Kerrigan <ckerrigan@hns.com>
altalink 1845/udp # altalink
altalink 1845/tcp # altalink
# Alberto Raydan <alberto@altasol.com>
@@ -4159,12 +4159,12 @@ fjdocdist 1848/tcp # fjdocdist
alpha-sms 1849/udp # ALPHA-SMS
alpha-sms 1849/tcp # ALPHA-SMS
# Benjamin Grimm <bg@webnetix.de>
-gsi 1850/udp # GSI
-gsi 1850/tcp # GSI
-# William Mullaney <mullanwi@usa.net>
-ctcd 1851/udp # ctcd
-ctcd 1851/tcp # ctcd
-# John Ryan <john@cybertrace.com>
+gsi 1850/udp # GSI
+gsi 1850/tcp # GSI
+# William Mullaney <mullanwi@usa.net>
+ctcd 1851/udp # ctcd
+ctcd 1851/tcp # ctcd
+# John Ryan <john@cybertrace.com>
virtual-time 1852/udp # Virtual Time
virtual-time 1852/tcp # Virtual Time
# Angie S. Morner <webmaster@dsbcpas.com>
@@ -4188,24 +4188,24 @@ privateark 1858/tcp # PrivateArk
gammafetchsvr 1859/udp # Gamma Fetcher Server
gammafetchsvr 1859/tcp # Gamma Fetcher Server
# Cnaan Aviv <cnaan@gammasite.com>
-sunscalar-svc 1860/udp # SunSCALAR Services
-sunscalar-svc 1860/tcp # SunSCALAR Services
-# Sanjay Radia <srradia@kasumbi.Eng.Sun.COM>
-lecroy-vicp 1861/udp # LeCroy VICP
-lecroy-vicp 1861/tcp # LeCroy VICP
-# Anthony Cake <anthonyrc@lecroy.com>
-techra-server 1862/udp # techra-server
-techra-server 1862/tcp # techra-server
-# Roy Lyseng <roy.lyseng@maxware.no>
-msnp 1863/udp # MSNP
-msnp 1863/tcp # MSNP
-# William Lai <wlai@microsoft.com>
-paradym-31port 1864/udp # Paradym 31 Port
-paradym-31port 1864/tcp # Paradym 31 Port
-# David Wooden <dwooden@wizdom.com>
-entp 1865/udp # ENTP
-entp 1865/tcp # ENTP
-# Seiko Epson <Ishida.Hitoshi@exc.epson.co.jp>
+sunscalar-svc 1860/udp # SunSCALAR Services
+sunscalar-svc 1860/tcp # SunSCALAR Services
+# Sanjay Radia <srradia@kasumbi.Eng.Sun.COM>
+lecroy-vicp 1861/udp # LeCroy VICP
+lecroy-vicp 1861/tcp # LeCroy VICP
+# Anthony Cake <anthonyrc@lecroy.com>
+techra-server 1862/udp # techra-server
+techra-server 1862/tcp # techra-server
+# Roy Lyseng <roy.lyseng@maxware.no>
+msnp 1863/udp # MSNP
+msnp 1863/tcp # MSNP
+# William Lai <wlai@microsoft.com>
+paradym-31port 1864/udp # Paradym 31 Port
+paradym-31port 1864/tcp # Paradym 31 Port
+# David Wooden <dwooden@wizdom.com>
+entp 1865/udp # ENTP
+entp 1865/tcp # ENTP
+# Seiko Epson <Ishida.Hitoshi@exc.epson.co.jp>
swrmi 1866/udp # swrmi
swrmi 1866/tcp # swrmi
# Jun Yoshii <yoshii@ael.fujitsu.co.jp>
@@ -4218,19 +4218,19 @@ viziblebrowser 1868/tcp # VizibleBrowser
yestrader 1869/udp # YesTrader
yestrader 1869/tcp # YesTrader
# Robert Bryan <bbryan@yestrader.com>
-sunscalar-dns 1870/udp # SunSCALAR DNS Service
+sunscalar-dns 1870/udp # SunSCALAR DNS Service
sunscalar-dns 1870/tcp # SunSCALAR DNS Service
# Sanjay Radia <srradia@kasumbi.Eng.Sun.COM>
-canocentral0 1871/udp # Cano Central 0
-canocentral0 1871/tcp # Cano Central 0
-canocentral1 1872/udp # Cano Central 1
-canocentral1 1872/tcp # Cano Central 1
-# Mark McNamara <markm@research.canon.com.au>
-fjmpjps 1873/udp # Fjmpjps
-fjmpjps 1873/tcp # Fjmpjps
-fjswapsnp 1874/udp # Fjswapsnp
-fjswapsnp 1874/tcp # Fjswapsnp
-# Y. Ohiwa <y-ohiwa@ael.fujitsu.co.jp>
+canocentral0 1871/udp # Cano Central 0
+canocentral0 1871/tcp # Cano Central 0
+canocentral1 1872/udp # Cano Central 1
+canocentral1 1872/tcp # Cano Central 1
+# Mark McNamara <markm@research.canon.com.au>
+fjmpjps 1873/udp # Fjmpjps
+fjmpjps 1873/tcp # Fjmpjps
+fjswapsnp 1874/udp # Fjswapsnp
+fjswapsnp 1874/tcp # Fjswapsnp
+# Y. Ohiwa <y-ohiwa@ael.fujitsu.co.jp>
westell-stats 1875/udp # westell stats
westell-stats 1875/tcp # westell stats
# Thomas McCabe <tmcca@westell.com>
@@ -4249,8 +4249,8 @@ nettgain-nms 1879/tcp # NettGain NMS
vsat-control 1880/udp # Gilat VSAT Control
vsat-control 1880/tcp # Gilat VSAT Control
# Yariv Kaplan <yarivk@gilat.com>
-ibm-mqseries2 1881/udp # IBM WebSphere MQ
-ibm-mqseries2 1881/tcp # IBM WebSphere MQ
+ibm-mqseries2 1881/udp # IBM WebSphere MQ
+ibm-mqseries2 1881/tcp # IBM WebSphere MQ
# Richard Maxwell <richard_maxwell@uk.ibm.com>
ecsqdmn 1882/udp # ecsqdmn
ecsqdmn 1882/tcp # ecsqdmn
@@ -4280,16 +4280,16 @@ wilkenlistener 1890/udp # wilkenListener
wilkenlistener 1890/tcp # wilkenListener
# Wilken GmbH <fy@wilken.de>
childkey-notif 1891/udp # ChildKey Notification
-childkey-notif 1891/tcp # ChildKey Notification
-childkey-ctrl 1892/udp # ChildKey Control
+childkey-notif 1891/tcp # ChildKey Notification
+childkey-ctrl 1892/udp # ChildKey Control
childkey-ctrl 1892/tcp # ChildKey Control
# Ivan Berardinelli <ivan@gestweb.com>
elad 1893/udp # ELAD Protocol
elad 1893/tcp # ELAD Protocol
# Franco Milan <franco@eladit.com>
o2server-port 1894/udp # O2Server Port
-o2server-port 1894/tcp # O2Server Port
-# Tim Howard <timothygh@hotmail.com>
+o2server-port 1894/tcp # O2Server Port
+# Tim Howard <timothygh@hotmail.com>
##### Microsoft (unoffically) using 1895 #####
b-novative-ls 1896/udp # b-novative license server
b-novative-ls 1896/tcp # b-novative license server
@@ -4298,14 +4298,14 @@ metaagent 1897/udp # MetaAgent
metaagent 1897/tcp # MetaAgent
# Stephane Vinsot <vinsot@enatel.com>
cymtec-port 1898/udp # Cymtec secure management
-cymtec-port 1898/tcp # Cymtec secure management
+cymtec-port 1898/tcp # Cymtec secure management
# Michael Mester <mmester@cymtec.com>
-mc2studios 1899/udp # MC2Studios
-mc2studios 1899/tcp # MC2Studios
-# Michael Coon <michael@thecube.com>
-ssdp 1900/udp # SSDP
-ssdp 1900/tcp # SSDP
-# Yaron Goland <yarong@microsoft.com>
+mc2studios 1899/udp # MC2Studios
+mc2studios 1899/tcp # MC2Studios
+# Michael Coon <michael@thecube.com>
+ssdp 1900/udp # SSDP
+ssdp 1900/tcp # SSDP
+# Yaron Goland <yarong@microsoft.com>
fjicl-tep-a 1901/udp # Fujitsu ICL Terminal Emulator Program A
fjicl-tep-a 1901/tcp # Fujitsu ICL Terminal Emulator Program A
# Bob Lyon <bl@oasis.icl.co.uk>
@@ -4319,29 +4319,29 @@ fjicl-tep-c 1904/udp # Fujitsu ICL Terminal Emulator Program C
fjicl-tep-c 1904/tcp # Fujitsu ICL Terminal Emulator Program C
# Bob Lyon <bl@oasis.icl.co.uk>
sugp 1905/udp # Secure UP.Link Gateway Protocol
-sugp 1905/tcp # Secure UP.Link Gateway Protocol
-# Peter King <king@uplanet.com>
-tpmd 1906/udp # TPortMapperReq
-tpmd 1906/tcp # TPortMapperReq
-# Sheila Devins <sheila_devins@VNET.IBM.COM>
-intrastar 1907/udp # IntraSTAR
-intrastar 1907/tcp # IntraSTAR
-# Peter Schoenberger <ps@teles.de>
-dawn 1908/udp # Dawn
-dawn 1908/tcp # Dawn
-# Michael Crawford <michaelc@travsoft.com>
-global-wlink 1909/udp # Global World Link
-global-wlink 1909/tcp # Global World Link
-# Nicholas Davies <N.Davies@globalcomm.co.uk>
+sugp 1905/tcp # Secure UP.Link Gateway Protocol
+# Peter King <king@uplanet.com>
+tpmd 1906/udp # TPortMapperReq
+tpmd 1906/tcp # TPortMapperReq
+# Sheila Devins <sheila_devins@VNET.IBM.COM>
+intrastar 1907/udp # IntraSTAR
+intrastar 1907/tcp # IntraSTAR
+# Peter Schoenberger <ps@teles.de>
+dawn 1908/udp # Dawn
+dawn 1908/tcp # Dawn
+# Michael Crawford <michaelc@travsoft.com>
+global-wlink 1909/udp # Global World Link
+global-wlink 1909/tcp # Global World Link
+# Nicholas Davies <N.Davies@globalcomm.co.uk>
ultrabac 1910/udp # UltraBac Software communications port
ultrabac 1910/tcp # UltraBac Software communications port
-# Paul Bunn <iana@ultrabac.com>
+# Paul Bunn <iana@ultrabac.com>
mtp 1911/udp # Starlight Networks Multimedia Transport Protocol
mtp 1911/tcp # Starlight Networks Multimedia Transport Protocol
# Bruce Lieberman <brucel@iserver.starlight.com>
-rhp-iibp 1912/udp # rhp-iibp
-rhp-iibp 1912/tcp # rhp-iibp
-# George Nachman
+rhp-iibp 1912/udp # rhp-iibp
+rhp-iibp 1912/tcp # rhp-iibp
+# George Nachman
# Tom Lake <tlake@m-ware.com>
armadp 1913/udp # armadp
armadp 1913/tcp # armadp
@@ -4355,28 +4355,28 @@ facelink 1915/tcp # FACELINK
persona 1916/udp # Persoft Persona
persona 1916/tcp # Persoft Persona
# Tom Spidell <spidell@persoft.com>
-noagent 1917/udp # nOAgent
-noagent 1917/tcp # nOAgent
-# Martin Bestmann <martin@datawatch.de>
-can-nds 1918/udp # Candle Directory Service - NDS
-can-nds 1918/tcp # Candle Directory Service - NDS
-can-dch 1919/udp # Candle Directory Service - DCH
-can-dch 1919/tcp # Candle Directory Service - DCH
-can-ferret 1920/udp # Candle Directory Service - FERRET
-can-ferret 1920/tcp # Candle Directory Service - FERRET
-# Dannis Yang <Dannis_Yang@candle.com>
-noadmin 1921/udp # NoAdmin
-noadmin 1921/tcp # NoAdmin
-# Martin Bestmann <martin@datawatch.de>
-tapestry 1922/udp # Tapestry
-tapestry 1922/tcp # Tapestry
-# Ken Oliver <koliver@anritsu.com>
-spice 1923/udp # SPICE
-spice 1923/tcp # SPICE
-# Nicholas Chua <nick@sendit.se>
-xiip 1924/udp # XIIP
-xiip 1924/tcp # XIIP
-# Alain Robert <Alain.Robert@HMRinc.com>
+noagent 1917/udp # nOAgent
+noagent 1917/tcp # nOAgent
+# Martin Bestmann <martin@datawatch.de>
+can-nds 1918/udp # Candle Directory Service - NDS
+can-nds 1918/tcp # Candle Directory Service - NDS
+can-dch 1919/udp # Candle Directory Service - DCH
+can-dch 1919/tcp # Candle Directory Service - DCH
+can-ferret 1920/udp # Candle Directory Service - FERRET
+can-ferret 1920/tcp # Candle Directory Service - FERRET
+# Dannis Yang <Dannis_Yang@candle.com>
+noadmin 1921/udp # NoAdmin
+noadmin 1921/tcp # NoAdmin
+# Martin Bestmann <martin@datawatch.de>
+tapestry 1922/udp # Tapestry
+tapestry 1922/tcp # Tapestry
+# Ken Oliver <koliver@anritsu.com>
+spice 1923/udp # SPICE
+spice 1923/tcp # SPICE
+# Nicholas Chua <nick@sendit.se>
+xiip 1924/udp # XIIP
+xiip 1924/tcp # XIIP
+# Alain Robert <Alain.Robert@HMRinc.com>
discovery-port 1925/udp # Surrogate Discovery Port
discovery-port 1925/tcp # Surrogate Discovery Port
# Keith Thompson <keith.thompson@sun.com>
@@ -4392,18 +4392,18 @@ emsd-port 1928/tcp # Expnd Maui Srvr Dscovr
bandwiz-system 1929/udp # Bandwiz System - Server
bandwiz-system 1929/tcp # Bandwiz System - Server
# Joseph Weihs <yossi@bandwiz.com>
-driveappserver 1930/udp # Drive AppServer
-driveappserver 1930/tcp # Drive AppServer
-# Andrew Johnson
-# <andrew.johnson@bliss-support.demon.co.uk>
-amdsched 1931/udp # AMD SCHED
-amdsched 1931/tcp # AMD SCHED
-# Michael Walsh <mww@warwick.net>
+driveappserver 1930/udp # Drive AppServer
+driveappserver 1930/tcp # Drive AppServer
+# Andrew Johnson
+# <andrew.johnson@bliss-support.demon.co.uk>
+amdsched 1931/udp # AMD SCHED
+amdsched 1931/tcp # AMD SCHED
+# Michael Walsh <mww@warwick.net>
ctt-broker 1932/udp # CTT Broker
ctt-broker 1932/tcp # CTT Broker
# Jens Edlund <edlund@speech.kth.se>
xmapi 1933/udp # IBM LM MT Agent
-xmapi 1933/tcp # IBM LM MT Agent
+xmapi 1933/tcp # IBM LM MT Agent
xaapi 1934/udp # IBM LM Appl Agent
xaapi 1934/tcp # IBM LM Appl Agent
# Helga Wolin <hwolin@us.ibm.com>
@@ -4453,12 +4453,12 @@ ismaeasdaqtest 1950/tcp # ISMA Easdaq Test
bcs-lmserver 1951/udp # bcs-lmserver
bcs-lmserver 1951/tcp # bcs-lmserver
# Andy Warner <andyw@knoware.nl>
-mpnjsc 1952/udp # mpnjsc
-mpnjsc 1952/tcp # mpnjsc
-# Takenori Miyahara <miyahara@pfu.co.jp>
-rapidbase 1953/udp # Rapid Base
-rapidbase 1953/tcp # Rapid Base
-# Antoni Wolski <antoni.wolski@vtt.fi>
+mpnjsc 1952/udp # mpnjsc
+mpnjsc 1952/tcp # mpnjsc
+# Takenori Miyahara <miyahara@pfu.co.jp>
+rapidbase 1953/udp # Rapid Base
+rapidbase 1953/tcp # Rapid Base
+# Antoni Wolski <antoni.wolski@vtt.fi>
abr-basic 1954/udp # ABR-Basic Data
abr-basic 1954/tcp # ABR-Basic Data
abr-secure 1955/udp # ABR-Secure Data
@@ -4479,27 +4479,27 @@ simp-all 1959/tcp # SIMP Channel
nasmanager 1960/udp # Merit DAC NASmanager
nasmanager 1960/tcp # Merit DAC NASmanager
# Richard S. Conto <rsc@merit.edu>
-bts-appserver 1961/udp # BTS APPSERVER
-bts-appserver 1961/tcp # BTS APPSERVER
-# Carl Obsorn <carl_osborn@sabre.com>
+bts-appserver 1961/udp # BTS APPSERVER
+bts-appserver 1961/tcp # BTS APPSERVER
+# Carl Obsorn <carl_osborn@sabre.com>
biap-mp 1962/udp # BIAP-MP
biap-mp 1962/tcp # BIAP-MP
# Chuck Shotton <cshotton@biap.com>
webmachine 1963/udp # WebMachine
webmachine 1963/tcp # WebMachine
# Tim Jowers <Tim.Jowers@ColumbiaSC.NCR.com>
-solid-e-engine 1964/udp # SOLID E ENGINE
-solid-e-engine 1964/tcp # SOLID E ENGINE
-# Ari Valtanen <ari.valtanen@solidtech.com>
-tivoli-npm 1965/udp # Tivoli NPM
-tivoli-npm 1965/tcp # Tivoli NPM
-# Ivana Cuozzo <Ivana.Cuozzo@tivoli.com>
-slush 1966/udp # Slush
-slush 1966/tcp # Slush
-# Damien Miller <damien@ibs.com.au>
-sns-quote 1967/udp # SNS Quote
-sns-quote 1967/tcp # SNS Quote
-# Robert Ellman <rellman@calicotech.com>
+solid-e-engine 1964/udp # SOLID E ENGINE
+solid-e-engine 1964/tcp # SOLID E ENGINE
+# Ari Valtanen <ari.valtanen@solidtech.com>
+tivoli-npm 1965/udp # Tivoli NPM
+tivoli-npm 1965/tcp # Tivoli NPM
+# Ivana Cuozzo <Ivana.Cuozzo@tivoli.com>
+slush 1966/udp # Slush
+slush 1966/tcp # Slush
+# Damien Miller <damien@ibs.com.au>
+sns-quote 1967/udp # SNS Quote
+sns-quote 1967/tcp # SNS Quote
+# Robert Ellman <rellman@calicotech.com>
lipsinc 1968/udp # LIPSinc
lipsinc 1968/tcp # LIPSinc
lipsinc1 1969/udp # LIPSinc 1
@@ -4510,27 +4510,27 @@ netop-rc 1970/tcp # NetOp Remote Control
netop-school 1971/udp # NetOp School
netop-school 1971/tcp # NetOp School
# NetOp Technical Support <support@danware.dk>
-intersys-cache 1972/udp # Cache
-intersys-cache 1972/tcp # Cache
-# Mark Hanson <markh@intersys.com>
+intersys-cache 1972/udp # Cache
+intersys-cache 1972/tcp # Cache
+# Mark Hanson <markh@intersys.com>
dlsrap 1973/udp # Data Link Switching Remote Access Protocol
dlsrap 1973/tcp # Data Link Switching Remote Access Protocol
# Steve T. Chiang <schiang@cisco.com>
-drp 1974/udp # DRP
-drp 1974/tcp # DRP
-# Richard Alan Johnson <raj@cisco.com>
-tcoflashagent 1975/udp # TCO Flash Agent
-tcoflashagent 1975/tcp # TCO Flash Agent
-tcoregagent 1976/udp # TCO Reg Agent
-tcoregagent 1976/tcp # TCO Reg Agent
-tcoaddressbook 1977/udp # TCO Address Book
-tcoaddressbook 1977/tcp # TCO Address Book
-# Allan Panitch <allanp@tcosoft.com>
-unisql 1978/udp # UniSQL
-unisql 1978/tcp # UniSQL
-unisql-java 1979/udp # UniSQL Java
-unisql-java 1979/tcp # UniSQL Java
-# Keith Yarbrough <kyarbro@windtraveller.com>
+drp 1974/udp # DRP
+drp 1974/tcp # DRP
+# Richard Alan Johnson <raj@cisco.com>
+tcoflashagent 1975/udp # TCO Flash Agent
+tcoflashagent 1975/tcp # TCO Flash Agent
+tcoregagent 1976/udp # TCO Reg Agent
+tcoregagent 1976/tcp # TCO Reg Agent
+tcoaddressbook 1977/udp # TCO Address Book
+tcoaddressbook 1977/tcp # TCO Address Book
+# Allan Panitch <allanp@tcosoft.com>
+unisql 1978/udp # UniSQL
+unisql 1978/tcp # UniSQL
+unisql-java 1979/udp # UniSQL Java
+unisql-java 1979/tcp # UniSQL Java
+# Keith Yarbrough <kyarbro@windtraveller.com>
pearldoc-xact 1980/udp # PearlDoc XACT
pearldoc-xact 1980/tcp # PearlDoc XACT
# Chris Vertonghen <chrisv@pearldoc.com>
@@ -4543,12 +4543,12 @@ estamp 1982/tcp # Evidentiary Timestamp
lhtp 1983/udp # Loophole Test Protocol
lhtp 1983/tcp # Loophole Test Protocol
# Kade Hansson <kade_fh@postoffice.utas.edu.au>
-bb 1984/udp # BB
-bb 1984/tcp # BB
-# Sean MacGuire <sean@maclawran.ca>
-hsrp 1985/udp # Hot Standby Router Protocol
-hsrp 1985/tcp # Hot Standby Router Protocol
-# Phil Morton <pmorton@cisco.com>
+bb 1984/udp # BB
+bb 1984/tcp # BB
+# Sean MacGuire <sean@maclawran.ca>
+hsrp 1985/udp # Hot Standby Router Protocol
+hsrp 1985/tcp # Hot Standby Router Protocol
+# Phil Morton <pmorton@cisco.com>
licensedaemon 1986/udp # cisco license management
licensedaemon 1986/tcp # cisco license management
tr-rsrb-p1 1987/udp # cisco RSRB Priority 1 port
@@ -4589,101 +4589,101 @@ tcp-id-port 1999/tcp # cisco identification port
callbook 2000/udp # callbook
callbook 2000/tcp # callbook
# Devon Bowen <bowen@cs.buffalo.edu>
-wizard 2001/udp # curry
-dc 2001/tcp #
-globe 2002/udp #
-globe 2002/tcp #
+wizard 2001/udp # curry
+dc 2001/tcp #
+globe 2002/udp #
+globe 2002/tcp #
emce 2004/udp # CCWS mm conf
-mailbox 2004/tcp #
-oracle 2005/udp #
-berknet 2005/tcp #
-raid-cc 2006/udp # raid
-invokator 2006/tcp #
-raid-am 2007/udp #
-dectalk 2007/tcp #
-terminaldb 2008/udp #
-conf 2008/tcp #
-whosockami 2009/udp #
-news 2009/tcp #
-pipe_server 2010/udp #
-search 2010/tcp #
-servserv 2011/udp #
-raid-cc 2011/tcp # raid
-raid-ac 2012/udp #
-ttyinfo 2012/tcp #
-raid-cd 2013/udp #
-raid-am 2013/tcp #
-raid-sf 2014/udp #
-troff 2014/tcp #
-raid-cs 2015/udp #
-cypress 2015/tcp #
-bootserver 2016/udp #
-bootserver 2016/tcp #
-bootclient 2017/udp #
-cypress-stat 2017/tcp #
-rellpack 2018/udp #
-terminaldb 2018/tcp #
-about 2019/udp #
-whosockami 2019/tcp #
-xinupageserver 2020/udp #
-xinupageserver 2020/tcp #
-xinuexpansion1 2021/udp #
-servexec 2021/tcp #
-xinuexpansion2 2022/udp #
-down 2022/tcp #
-xinuexpansion3 2023/udp #
-xinuexpansion3 2023/tcp #
-xinuexpansion4 2024/udp #
-xinuexpansion4 2024/tcp #
-xribs 2025/udp #
-ellpack 2025/tcp #
-scrabble 2026/udp #
-scrabble 2026/tcp #
-shadowserver 2027/udp #
-shadowserver 2027/tcp #
-submitserver 2028/udp #
-submitserver 2028/tcp #
+mailbox 2004/tcp #
+oracle 2005/udp #
+berknet 2005/tcp #
+raid-cc 2006/udp # raid
+invokator 2006/tcp #
+raid-am 2007/udp #
+dectalk 2007/tcp #
+terminaldb 2008/udp #
+conf 2008/tcp #
+whosockami 2009/udp #
+news 2009/tcp #
+pipe_server 2010/udp #
+search 2010/tcp #
+servserv 2011/udp #
+raid-cc 2011/tcp # raid
+raid-ac 2012/udp #
+ttyinfo 2012/tcp #
+raid-cd 2013/udp #
+raid-am 2013/tcp #
+raid-sf 2014/udp #
+troff 2014/tcp #
+raid-cs 2015/udp #
+cypress 2015/tcp #
+bootserver 2016/udp #
+bootserver 2016/tcp #
+bootclient 2017/udp #
+cypress-stat 2017/tcp #
+rellpack 2018/udp #
+terminaldb 2018/tcp #
+about 2019/udp #
+whosockami 2019/tcp #
+xinupageserver 2020/udp #
+xinupageserver 2020/tcp #
+xinuexpansion1 2021/udp #
+servexec 2021/tcp #
+xinuexpansion2 2022/udp #
+down 2022/tcp #
+xinuexpansion3 2023/udp #
+xinuexpansion3 2023/tcp #
+xinuexpansion4 2024/udp #
+xinuexpansion4 2024/tcp #
+xribs 2025/udp #
+ellpack 2025/tcp #
+scrabble 2026/udp #
+scrabble 2026/tcp #
+shadowserver 2027/udp #
+shadowserver 2027/tcp #
+submitserver 2028/udp #
+submitserver 2028/tcp #
# 2029 Unassigned
-device2 2030/udp #
-device2 2030/tcp #
+device2 2030/udp #
+device2 2030/tcp #
# 2031 Unassigned
blackboard 2032/udp #
blackboard 2032/tcp #
-glogger 2033/udp #
-glogger 2033/tcp #
-scoremgr 2034/udp #
-scoremgr 2034/tcp #
-imsldoc 2035/udp #
-imsldoc 2035/tcp #
+glogger 2033/udp #
+glogger 2033/tcp #
+scoremgr 2034/udp #
+scoremgr 2034/tcp #
+imsldoc 2035/udp #
+imsldoc 2035/tcp #
# 2036 Unassigned
p2plus 2037/udp # P2plus Application Server
p2plus 2037/tcp # P2plus Application Server
# Thomas Boerkel <tb@ap-ag.com>
-objectmanager 2038/udp #
-objectmanager 2038/tcp #
+objectmanager 2038/udp #
+objectmanager 2038/tcp #
# 2039 Unassigned
-lam 2040/udp #
-lam 2040/tcp #
-interbase 2041/udp #
-interbase 2041/tcp #
-isis 2042/udp # isis
-isis 2042/tcp # isis
-isis-bcast 2043/udp # isis-bcast
-isis-bcast 2043/tcp # isis-bcast
+lam 2040/udp #
+lam 2040/tcp #
+interbase 2041/udp #
+interbase 2041/tcp #
+isis 2042/udp # isis
+isis 2042/tcp # isis
+isis-bcast 2043/udp # isis-bcast
+isis-bcast 2043/tcp # isis-bcast
# Ken Chapman <kchapman@isis.com>
-rimsl 2044/udp #
-rimsl 2044/tcp #
-cdfunc 2045/udp #
-cdfunc 2045/tcp #
-sdfunc 2046/udp #
-sdfunc 2046/tcp #
-dls 2047/udp #
-dls 2047/tcp #
-dls-monitor 2048/udp #
-dls-monitor 2048/tcp #
+rimsl 2044/udp #
+rimsl 2044/tcp #
+cdfunc 2045/udp #
+cdfunc 2045/tcp #
+sdfunc 2046/udp #
+sdfunc 2046/tcp #
+dls 2047/udp #
+dls 2047/tcp #
+dls-monitor 2048/udp #
+dls-monitor 2048/tcp #
# <== NOTE Conflict on 2049 !
-shilp 2049/udp nfs #
-shilp 2049/tcp nfs #
+shilp 2049/udp nfs #
+shilp 2049/tcp nfs #
# Brent Callaghan <brent@terra.eng.sun.com>
av-emb-config 2050/udp # Avaya EMB Config Port
av-emb-config 2050/tcp # Avaya EMB Config Port
@@ -4705,7 +4705,7 @@ iop 2055/tcp # Iliad-Odyssey Protocol
# Bruce Lueckenhoff <brucelu@cisco.com>
omnisky 2056/udp # OmniSky Port
omnisky 2056/tcp # OmniSky Port
-# Oren Hurvitz <oren@omnisky.com>
+# Oren Hurvitz <oren@omnisky.com>
rich-cp 2057/udp # Rich Content Protocol
rich-cp 2057/tcp # Rich Content Protocol
# Ronen Vainish <ronen@digitalfountain.com>
@@ -4789,39 +4789,39 @@ eli 2087/tcp # ELI - Event Logging Integration
sep 2089/udp # Security Encapsulation Protocol - SEP
sep 2089/tcp # Security Encapsulation Protocol - SEP
# Maya Zimerman <mayaz@radware.co.il>
-lrp 2090/udp # Load Report Protocol
-lrp 2090/tcp # Load Report Protocol
-# Amir Peless <amirp@radware.co.il>
-prp 2091/udp # PRP
-prp 2091/tcp # PRP
-# Amir Peless <amirp@radware.co.il>
-descent3 2092/udp # Descent 3
-descent3 2092/tcp # Descent 3
-# Kevin Bentley <Kevin@outrage.com>
-nbx-cc 2093/udp # NBX CC
-nbx-cc 2093/tcp # NBX CC
-nbx-au 2094/udp # NBX AU
-nbx-au 2094/tcp # NBX AU
-nbx-ser 2095/udp # NBX SER
-nbx-ser 2095/tcp # NBX SER
-nbx-dir 2096/udp # NBX DIR
-nbx-dir 2096/tcp # NBX DIR
-# Henry Houh <hhouh@nbxcorp.com>
-jetformpreview 2097/udp # Jet Form Preview
-jetformpreview 2097/tcp # Jet Form Preview
-# Zygmunt Wiercioch <zyg@jetform.com>
-dialog-port 2098/udp # Dialog Port
-dialog-port 2098/tcp # Dialog Port
-# Joseph Mathew <mjoseph@dosa.cisco.com>
-h2250-annex-g 2099/udp # H.225.0 Annex G
-h2250-annex-g 2099/tcp # H.225.0 Annex G
-# Gur Kimchi <gur.kimchi@vocaltec.com>
+lrp 2090/udp # Load Report Protocol
+lrp 2090/tcp # Load Report Protocol
+# Amir Peless <amirp@radware.co.il>
+prp 2091/udp # PRP
+prp 2091/tcp # PRP
+# Amir Peless <amirp@radware.co.il>
+descent3 2092/udp # Descent 3
+descent3 2092/tcp # Descent 3
+# Kevin Bentley <Kevin@outrage.com>
+nbx-cc 2093/udp # NBX CC
+nbx-cc 2093/tcp # NBX CC
+nbx-au 2094/udp # NBX AU
+nbx-au 2094/tcp # NBX AU
+nbx-ser 2095/udp # NBX SER
+nbx-ser 2095/tcp # NBX SER
+nbx-dir 2096/udp # NBX DIR
+nbx-dir 2096/tcp # NBX DIR
+# Henry Houh <hhouh@nbxcorp.com>
+jetformpreview 2097/udp # Jet Form Preview
+jetformpreview 2097/tcp # Jet Form Preview
+# Zygmunt Wiercioch <zyg@jetform.com>
+dialog-port 2098/udp # Dialog Port
+dialog-port 2098/tcp # Dialog Port
+# Joseph Mathew <mjoseph@dosa.cisco.com>
+h2250-annex-g 2099/udp # H.225.0 Annex G
+h2250-annex-g 2099/tcp # H.225.0 Annex G
+# Gur Kimchi <gur.kimchi@vocaltec.com>
amiganetfs 2100/udp # Amiga Network Filesystem
amiganetfs 2100/tcp # Amiga Network Filesystem
# Rudi Chiarito <nutello@sweetness.com>
-rtcm-sc104 2101/udp # rtcm-sc104
-rtcm-sc104 2101/tcp # rtcm-sc104
-# Wolfgang Rupprecht <wolfgang@wsrcc.com>
+rtcm-sc104 2101/udp # rtcm-sc104
+rtcm-sc104 2101/tcp # rtcm-sc104
+# Wolfgang Rupprecht <wolfgang@wsrcc.com>
zephyr-srv 2102/udp # Zephyr server
zephyr-srv 2102/tcp # Zephyr server
zephyr-clt 2103/udp # Zephyr serv-hm connection
@@ -4829,18 +4829,18 @@ zephyr-clt 2103/tcp # Zephyr serv-hm connection
zephyr-hm 2104/udp # Zephyr hostmanager
zephyr-hm 2104/tcp # Zephyr hostmanager
# Greg Hudson <zephyr-bugs@mit.edu>
-minipay 2105/udp # MiniPay
-minipay 2105/tcp # MiniPay
-# Amir Herzberg <amirh@vnet.ibm.com>
-mzap 2106/udp # MZAP
-mzap 2106/tcp # MZAP
-# Dave Thaler <dthaler@microsoft.com>
-bintec-admin 2107/udp # BinTec Admin
-bintec-admin 2107/tcp # BinTec Admin
-# Thomas Schmidt <ts@bintec.de>
-comcam 2108/udp # Comcam
-comcam 2108/tcp # Comcam
-# Don Gilbreath <don@comcam.net>
+minipay 2105/udp # MiniPay
+minipay 2105/tcp # MiniPay
+# Amir Herzberg <amirh@vnet.ibm.com>
+mzap 2106/udp # MZAP
+mzap 2106/tcp # MZAP
+# Dave Thaler <dthaler@microsoft.com>
+bintec-admin 2107/udp # BinTec Admin
+bintec-admin 2107/tcp # BinTec Admin
+# Thomas Schmidt <ts@bintec.de>
+comcam 2108/udp # Comcam
+comcam 2108/tcp # Comcam
+# Don Gilbreath <don@comcam.net>
ergolight 2109/udp # Ergolight
ergolight 2109/tcp # Ergolight
# Jindra Ryvola <jryvola@ledalite.com>
@@ -4931,7 +4931,7 @@ unbind-cluster 2138/udp # UNBIND-CLUSTER
unbind-cluster 2138/tcp # UNBIND-CLUSTER
# Francois Harvey <securiweb@pandore.qc.ca>
ias-auth 2139/udp # IAS-AUTH
-ias-auth 2139/tcp # IAS-AUTH
+ias-auth 2139/tcp # IAS-AUTH
ias-reg 2140/udp # IAS-REG
ias-reg 2140/tcp # IAS-REG
ias-admind 2141/udp # IAS-ADMIND
@@ -4953,13 +4953,13 @@ lv-auth 2147/tcp # Live Vault Authentication
# Ted Hess <thess@livevault.com>
veritas-ucl 2148/udp # VERITAS UNIVERSAL COMMUNICATION LAYER
veritas-ucl 2148/tcp # VERITAS UNIVERSAL COMMUNICATION LAYER
-# Songlin Ren <ren@veritas.com>
+# Songlin Ren <ren@veritas.com>
acptsys 2149/udp # ACPTSYS
acptsys 2149/tcp # ACPTSYS
# Michael Lekias <admin@psdesign.com.au>
dynamic3d 2150/udp # DYNAMIC3D
dynamic3d 2150/tcp # DYNAMIC3D
-# Tobias Wegner <wegner@novagate.de>
+# Tobias Wegner <wegner@novagate.de>
docent 2151/udp # DOCENT
docent 2151/tcp # DOCENT
# Hali Lindbloom <halil@docent.com>
@@ -4984,19 +4984,19 @@ navisphere-sec 2163/tcp # Navisphere Secure
ddns-v3 2164/udp # Dynamic DNS Version 3
ddns-v3 2164/tcp # Dynamic DNS Version 3
# Alan Yates <alany@ay.com.au>
-x-bone-api 2165/udp # X-Bone API
-x-bone-api 2165/tcp # X-Bone API
-# Joe Touch <touch@isi.edu>
+x-bone-api 2165/udp # X-Bone API
+x-bone-api 2165/tcp # X-Bone API
+# Joe Touch <touch@isi.edu>
iwserver 2166/udp # iwserver
iwserver 2166/tcp # iwserver
# Fred Surr <quest_iana@oz.quest.com>
raw-serial 2167/udp # Raw Async Serial Link
raw-serial 2167/tcp # Raw Async Serial Link
# Benjamin Green <benjamin@lh.co.nz>
-# 2168-2179 Unassigned
-mc-gt-srv 2180/udp # Millicent Vendor Gateway Server
-mc-gt-srv 2180/tcp # Millicent Vendor Gateway Server
-# Steve Glassman <steveg@pa.dec.com>
+# 2168-2179 Unassigned
+mc-gt-srv 2180/udp # Millicent Vendor Gateway Server
+mc-gt-srv 2180/tcp # Millicent Vendor Gateway Server
+# Steve Glassman <steveg@pa.dec.com>
eforward 2181/udp # eforward
eforward 2181/tcp # eforward
# Greg Pringle <admin@corvedia.com>
@@ -5022,42 +5022,42 @@ kali 2213/tcp # Kali
# Jay Cotton <JAY@calc.vet.uga.edu>
netiq 2220/udp # NetIQ End2End
netiq 2220/tcp # NetIQ End2End
-# Gary Weichinger <gary.weichinger@netiq.com>
-rockwell-csp1 2221/udp # Rockwell CSP1
-rockwell-csp1 2221/tcp # Rockwell CSP1
-rockwell-csp2 2222/udp # Rockwell CSP2
-rockwell-csp2 2222/tcp # Rockwell CSP2
-rockwell-csp3 2223/udp # Rockwell CSP3
-rockwell-csp3 2223/tcp # Rockwell CSP3
-# Brian Batke <babatke@ra.rockwell.com>
+# Gary Weichinger <gary.weichinger@netiq.com>
+rockwell-csp1 2221/udp # Rockwell CSP1
+rockwell-csp1 2221/tcp # Rockwell CSP1
+rockwell-csp2 2222/udp # Rockwell CSP2
+rockwell-csp2 2222/tcp # Rockwell CSP2
+rockwell-csp3 2223/udp # Rockwell CSP3
+rockwell-csp3 2223/tcp # Rockwell CSP3
+# Brian Batke <babatke@ra.rockwell.com>
#
ivs-video 2232/udp # IVS Video default
ivs-video 2232/tcp # IVS Video default
# Thierry Turletti <Thierry.Turletti@sophia.inria.fr>
-infocrypt 2233/udp # INFOCRYPT
-infocrypt 2233/tcp # INFOCRYPT
-# Erica Liu <liue@isolation.com>
+infocrypt 2233/udp # INFOCRYPT
+infocrypt 2233/tcp # INFOCRYPT
+# Erica Liu <liue@isolation.com>
directplay 2234/udp # DirectPlay
directplay 2234/tcp # DirectPlay
# Ajay Jindal <ajayj@microsoft.com>
sercomm-wlink 2235/udp # Sercomm-WLink
-sercomm-wlink 2235/tcp # Sercomm-WLink
-# Melinda Tsao <melinda@tpe1.sercomm.com.tw>
-nani 2236/udp # Nani
-nani 2236/tcp # Nani
-# Steve Benoit <sbenoi01@eng.eds.com>
+sercomm-wlink 2235/tcp # Sercomm-WLink
+# Melinda Tsao <melinda@tpe1.sercomm.com.tw>
+nani 2236/udp # Nani
+nani 2236/tcp # Nani
+# Steve Benoit <sbenoi01@eng.eds.com>
optech-port1-lm 2237/udp # Optech Port1 License Manager
optech-port1-lm 2237/tcp # Optech Port1 License Manager
-# Gerard Cannie <jcannie@opticaltech.com>
-aviva-sna 2238/udp # AVIVA SNA SERVER
-aviva-sna 2238/tcp # AVIVA SNA SERVER
-# Vick Keshishian <vickenK@192.219.82.71>
+# Gerard Cannie <jcannie@opticaltech.com>
+aviva-sna 2238/udp # AVIVA SNA SERVER
+aviva-sna 2238/tcp # AVIVA SNA SERVER
+# Vick Keshishian <vickenK@192.219.82.71>
imagequery 2239/udp # Image Query
-imagequery 2239/tcp # Image Query
-# Charles Jacobs <cjacobs@numinous.com>
-recipe 2240/udp # RECIPe
-recipe 2240/tcp # RECIPe
-# Charlie Limoges <charlie.limoges@gd-cs.com>
+imagequery 2239/tcp # Image Query
+# Charles Jacobs <cjacobs@numinous.com>
+recipe 2240/udp # RECIPe
+recipe 2240/tcp # RECIPe
+# Charlie Limoges <charlie.limoges@gd-cs.com>
ivsd 2241/udp # IVS Daemon
ivsd 2241/tcp # IVS Daemon
# Thierry Turletti
@@ -5065,38 +5065,38 @@ ivsd 2241/tcp # IVS Daemon
foliocorp 2242/udp # Folio Remote Server
foliocorp 2242/tcp # Folio Remote Server
# Pat Mcgowan <pmcgowan@folio.com>
-magicom 2243/udp # Magicom Protocol
-magicom 2243/tcp # Magicom Protocol
-# Yossi Appleboum <yossia@magicom.co.il>
-nmsserver 2244/udp # NMS Server
-nmsserver 2244/tcp # NMS Server
-# Dmitry Krasnonosenkikh
-# <Dmitry_Krasnonosenkih@nmss.com>
-hao 2245/udp # HaO
-hao 2245/tcp # HaO
-# Panic Ride <panicride@hao.org>
+magicom 2243/udp # Magicom Protocol
+magicom 2243/tcp # Magicom Protocol
+# Yossi Appleboum <yossia@magicom.co.il>
+nmsserver 2244/udp # NMS Server
+nmsserver 2244/tcp # NMS Server
+# Dmitry Krasnonosenkikh
+# <Dmitry_Krasnonosenkih@nmss.com>
+hao 2245/udp # HaO
+hao 2245/tcp # HaO
+# Panic Ride <panicride@hao.org>
pc-mta-addrmap 2246/udp # PacketCable MTA Addr Map
pc-mta-addrmap 2246/tcp # PacketCable MTA Addr Map
# Dave Maxwell <d.maxwell@cablelabs.com>
# 2247 Unassigned
-ums 2248/udp # User Management Service
+ums 2248/udp # User Management Service
ums 2248/tcp # User Management Service
# Andrew Crockford
# <andrew.crockford@modus-interactive.co.uk>
-rfmp 2249/udp # RISO File Manager Protocol
-rfmp 2249/tcp # RISO File Manager Protocol
+rfmp 2249/udp # RISO File Manager Protocol
+rfmp 2249/tcp # RISO File Manager Protocol
# Shinji Yamanaka <syamanaka@jci.co.jp>
remote-collab 2250/udp # remote-collab
remote-collab 2250/tcp # remote-collab
# Richard Walters <walters@cs.ucdavis.edu>
dif-port 2251/udp # Distributed Framework Port
-dif-port 2251/tcp # Distributed Framework Port
+dif-port 2251/tcp # Distributed Framework Port
# Sebastien Lambla <lambla@bouygtel.com>
njenet-ssl 2252/udp # NJENET using SSL
njenet-ssl 2252/tcp # NJENET using SSL
# Hans U Schmidt <schmidth@de.ibm.com>
dtv-chan-req 2253/udp # DTV Channel Request
-dtv-chan-req 2253/tcp # DTV Channel Request
+dtv-chan-req 2253/tcp # DTV Channel Request
# Richard Hodges <rh@matriplex.com>
seispoc 2254/udp # Seismic P.O.C. Port
seispoc 2254/tcp # Seismic P.O.C. Port
@@ -5128,229 +5128,229 @@ lnvmailmon 2285/tcp # LNVMAILMON
nas-metering 2286/udp # NAS-Metering
nas-metering 2286/tcp # NAS-Metering
# Steven Sawkins <ssawkins@symantec.com>
-dna 2287/udp # DNA
-dna 2287/tcp # DNA
-# Tung Nguyen <dash@ricochet.net>
-netml 2288/udp # NETML
-netml 2288/tcp # NETML
-# Jochen Hansmeyer <cjh@krypton.de>
+dna 2287/udp # DNA
+dna 2287/tcp # DNA
+# Tung Nguyen <dash@ricochet.net>
+netml 2288/udp # NETML
+netml 2288/tcp # NETML
+# Jochen Hansmeyer <cjh@krypton.de>
# 2289-2293 Unassigned
-konshus-lm 2294/udp # Konshus License Manager (FLEX)
-konshus-lm 2294/tcp # Konshus License Manager (FLEX)
-# Francois Painchaud <fpainchaud@konshus.com>
-advant-lm 2295/udp # Advant License Manager
-advant-lm 2295/tcp # Advant License Manager
-# Lars-Goran Magnusson
+konshus-lm 2294/udp # Konshus License Manager (FLEX)
+konshus-lm 2294/tcp # Konshus License Manager (FLEX)
+# Francois Painchaud <fpainchaud@konshus.com>
+advant-lm 2295/udp # Advant License Manager
+advant-lm 2295/tcp # Advant License Manager
+# Lars-Goran Magnusson
# <lars-goran.magnusson@seisy.mail.abb.com>
-theta-lm 2296/udp # Theta License Manager (Rainbow)
-theta-lm 2296/tcp # Theta License Manager (Rainbow)
-# David Thompson <theta@theta-ent.com>
-d2k-datamover1 2297/udp # D2K DataMover 1
-d2k-datamover1 2297/tcp # D2K DataMover 1
-d2k-datamover2 2298/udp # D2K DataMover 2
+theta-lm 2296/udp # Theta License Manager (Rainbow)
+theta-lm 2296/tcp # Theta License Manager (Rainbow)
+# David Thompson <theta@theta-ent.com>
+d2k-datamover1 2297/udp # D2K DataMover 1
+d2k-datamover1 2297/tcp # D2K DataMover 1
+d2k-datamover2 2298/udp # D2K DataMover 2
d2k-datamover2 2298/tcp # D2K DataMover 2
-# Eric Lan <elan@d2k.com>
-pc-telecommute 2299/udp # PC Telecommute
-pc-telecommute 2299/tcp # PC Telecommute
-# John Daniel Bonamico <jbonamico@symantec.com>
+# Eric Lan <elan@d2k.com>
+pc-telecommute 2299/udp # PC Telecommute
+pc-telecommute 2299/tcp # PC Telecommute
+# John Daniel Bonamico <jbonamico@symantec.com>
cvmmon 2300/udp # CVMMON
cvmmon 2300/tcp # CVMMON
# Roger Kumpf <kumpf@cup.hp.com>
cpq-wbem 2301/udp # Compaq HTTP
cpq-wbem 2301/tcp # Compaq HTTP
# Scott Shaffer <scott.shaffer@hp.com>
-binderysupport 2302/udp # Bindery Support
-binderysupport 2302/tcp # Bindery Support
-# Narasimha Rao N. <nnarasimharao@novell.com>
-proxy-gateway 2303/udp # Proxy Gateway
-proxy-gateway 2303/tcp # Proxy Gateway
-# Paul Funk <paul@funk.com>
-attachmate-uts 2304/udp # Attachmate UTS
-attachmate-uts 2304/tcp # Attachmate UTS
-# George Gianelos <Georgegi@Attachmate.com>
-mt-scaleserver 2305/udp # MT ScaleServer
-mt-scaleserver 2305/tcp # MT ScaleServer
-# Paul Glaubitz <Paul.Glaubitz@mt.com>
-tappi-boxnet 2306/udp # TAPPI BoxNet
-tappi-boxnet 2306/tcp # TAPPI BoxNet
-# Richard Spartz <rspartz@alliancetechnical.com>
+binderysupport 2302/udp # Bindery Support
+binderysupport 2302/tcp # Bindery Support
+# Narasimha Rao N. <nnarasimharao@novell.com>
+proxy-gateway 2303/udp # Proxy Gateway
+proxy-gateway 2303/tcp # Proxy Gateway
+# Paul Funk <paul@funk.com>
+attachmate-uts 2304/udp # Attachmate UTS
+attachmate-uts 2304/tcp # Attachmate UTS
+# George Gianelos <Georgegi@Attachmate.com>
+mt-scaleserver 2305/udp # MT ScaleServer
+mt-scaleserver 2305/tcp # MT ScaleServer
+# Paul Glaubitz <Paul.Glaubitz@mt.com>
+tappi-boxnet 2306/udp # TAPPI BoxNet
+tappi-boxnet 2306/tcp # TAPPI BoxNet
+# Richard Spartz <rspartz@alliancetechnical.com>
pehelp 2307/udp # pehelp
pehelp 2307/tcp # pehelp
# Jens Kilian <jensk@hpbeo82.bbn.hp.com>
-sdhelp 2308/udp # sdhelp
-sdhelp 2308/tcp # sdhelp
-# Annette Klecha <annette_klecha@bbn.hp.com>
-sdserver 2309/udp # SD Server
-sdserver 2309/tcp # SD Server
-sdclient 2310/udp # SD Client
-sdclient 2310/tcp # SD Client
-# Jeurgen Broesamle <juergb@bbn.hp.com>
-messageservice 2311/udp # Message Service
-messageservice 2311/tcp # Message Service
-# No contact Listed
-iapp 2313/udp # IAPP (Inter Access Point Protocol)
-iapp 2313/tcp # IAPP (Inter Access Point Protocol)
-# Henri Moelard <moelard@lucent.com>
-cr-websystems 2314/udp # CR WebSystems
-cr-websystems 2314/tcp # CR WebSystems
-# Robin Giese <rgiese@peddie.org>
-precise-sft 2315/udp # Precise Sft.
-precise-sft 2315/tcp # Precise Sft.
-# Michael Landwehr <mikel@precisesoft.co.il>
-sent-lm 2316/udp # SENT License Manager
-sent-lm 2316/tcp # SENT License Manager
-# Pisharath Krishnan <krishnan@axis-inc.com>
-attachmate-g32 2317/udp # Attachmate G32
-attachmate-g32 2317/tcp # Attachmate G32
-# Bryce Bhatnagar <BRYCEBH@Attachmate.com>
-cadencecontrol 2318/udp # Cadence Control
-cadencecontrol 2318/tcp # Cadence Control
-# Buck Caldwell <buck_c@polygon.com>
-infolibria 2319/udp # InfoLibria
-infolibria 2319/tcp # InfoLibria
-# Chris Chiotasso <cchiotasso@infolibria.com>
-siebel-ns 2320/udp # Siebel NS
-siebel-ns 2320/tcp # Siebel NS
-# Gilberto Arnaiz <garnaiz@siebel.com>
-rdlap 2321/udp # RDLAP
-rdlap 2321/tcp # RDLAP
-# Robert Wiebe <crw010@email.mot.com>
-ofsd 2322/udp # ofsd
-ofsd 2322/tcp # ofsd
-3d-nfsd 2323/udp # 3d-nfsd
-3d-nfsd 2323/tcp # 3d-nfsd
-# Mike Sherrill <sherrill@commvault.com>
-cosmocall 2324/udp # Cosmocall
-cosmocall 2324/tcp # Cosmocall
-# Steve Dellutri
-designspace-lm 2325/udp # Design Space License Management
-designspace-lm 2325/tcp # Design Space License Management
-# Suzanne Lorrin <suzanne.lorrin@ansys.com>
-idcp 2326/udp # IDCP
-idcp 2326/tcp # IDCP
-# Keisokugiken Corp. <adda@kgc.co.jp>
-xingcsm 2327/udp # xingcsm
-xingcsm 2327/tcp # xingcsm
-# Dave Spencer <dspencer@xingtech.com>
-netrix-sftm 2328/udp # Netrix SFTM
-netrix-sftm 2328/tcp # Netrix SFTM
-# Garrett Herschleb <garrett@netrix.com>
-nvd 2329/udp # NVD
-nvd 2329/tcp # NVD
-# Peter Weyman <pjweyman@noblenet.com>
-tscchat 2330/udp # TSCCHAT
-tscchat 2330/tcp # TSCCHAT
-# Mike Jackson <mhjack@tscnet.com>
-agentview 2331/udp # AGENTVIEW
-agentview 2331/tcp # AGENTVIEW
-# Ram Iyer <ram@aaccorp.com>
-rcc-host 2332/udp # RCC Host
-rcc-host 2332/tcp # RCC Host
-# Martin Shoemaker <shoemakerml@rapistan.com>
+sdhelp 2308/udp # sdhelp
+sdhelp 2308/tcp # sdhelp
+# Annette Klecha <annette_klecha@bbn.hp.com>
+sdserver 2309/udp # SD Server
+sdserver 2309/tcp # SD Server
+sdclient 2310/udp # SD Client
+sdclient 2310/tcp # SD Client
+# Jeurgen Broesamle <juergb@bbn.hp.com>
+messageservice 2311/udp # Message Service
+messageservice 2311/tcp # Message Service
+# No contact Listed
+iapp 2313/udp # IAPP (Inter Access Point Protocol)
+iapp 2313/tcp # IAPP (Inter Access Point Protocol)
+# Henri Moelard <moelard@lucent.com>
+cr-websystems 2314/udp # CR WebSystems
+cr-websystems 2314/tcp # CR WebSystems
+# Robin Giese <rgiese@peddie.org>
+precise-sft 2315/udp # Precise Sft.
+precise-sft 2315/tcp # Precise Sft.
+# Michael Landwehr <mikel@precisesoft.co.il>
+sent-lm 2316/udp # SENT License Manager
+sent-lm 2316/tcp # SENT License Manager
+# Pisharath Krishnan <krishnan@axis-inc.com>
+attachmate-g32 2317/udp # Attachmate G32
+attachmate-g32 2317/tcp # Attachmate G32
+# Bryce Bhatnagar <BRYCEBH@Attachmate.com>
+cadencecontrol 2318/udp # Cadence Control
+cadencecontrol 2318/tcp # Cadence Control
+# Buck Caldwell <buck_c@polygon.com>
+infolibria 2319/udp # InfoLibria
+infolibria 2319/tcp # InfoLibria
+# Chris Chiotasso <cchiotasso@infolibria.com>
+siebel-ns 2320/udp # Siebel NS
+siebel-ns 2320/tcp # Siebel NS
+# Gilberto Arnaiz <garnaiz@siebel.com>
+rdlap 2321/udp # RDLAP
+rdlap 2321/tcp # RDLAP
+# Robert Wiebe <crw010@email.mot.com>
+ofsd 2322/udp # ofsd
+ofsd 2322/tcp # ofsd
+3d-nfsd 2323/udp # 3d-nfsd
+3d-nfsd 2323/tcp # 3d-nfsd
+# Mike Sherrill <sherrill@commvault.com>
+cosmocall 2324/udp # Cosmocall
+cosmocall 2324/tcp # Cosmocall
+# Steve Dellutri
+designspace-lm 2325/udp # Design Space License Management
+designspace-lm 2325/tcp # Design Space License Management
+# Suzanne Lorrin <suzanne.lorrin@ansys.com>
+idcp 2326/udp # IDCP
+idcp 2326/tcp # IDCP
+# Keisokugiken Corp. <adda@kgc.co.jp>
+xingcsm 2327/udp # xingcsm
+xingcsm 2327/tcp # xingcsm
+# Dave Spencer <dspencer@xingtech.com>
+netrix-sftm 2328/udp # Netrix SFTM
+netrix-sftm 2328/tcp # Netrix SFTM
+# Garrett Herschleb <garrett@netrix.com>
+nvd 2329/udp # NVD
+nvd 2329/tcp # NVD
+# Peter Weyman <pjweyman@noblenet.com>
+tscchat 2330/udp # TSCCHAT
+tscchat 2330/tcp # TSCCHAT
+# Mike Jackson <mhjack@tscnet.com>
+agentview 2331/udp # AGENTVIEW
+agentview 2331/tcp # AGENTVIEW
+# Ram Iyer <ram@aaccorp.com>
+rcc-host 2332/udp # RCC Host
+rcc-host 2332/tcp # RCC Host
+# Martin Shoemaker <shoemakerml@rapistan.com>
snapp 2333/udp # SNAPP
snapp 2333/tcp # SNAPP
# Kevin Osborn <kosborn@snapappliance.com>
-ace-client 2334/udp # ACE Client Auth
-ace-client 2334/tcp # ACE Client Auth
-ace-proxy 2335/udp # ACE Proxy
-ace-proxy 2335/tcp # ACE Proxy
-# Riaz Zolfonoon <rzolfonoon@securitydynamics.com>
-appleugcontrol 2336/udp # Apple UG Control
+ace-client 2334/udp # ACE Client Auth
+ace-client 2334/tcp # ACE Client Auth
+ace-proxy 2335/udp # ACE Proxy
+ace-proxy 2335/tcp # ACE Proxy
+# Riaz Zolfonoon <rzolfonoon@securitydynamics.com>
+appleugcontrol 2336/udp # Apple UG Control
appleugcontrol 2336/tcp # Apple UG Control
-# Gene Tyacke <gene@apple.com>
-ideesrv 2337/udp # ideesrv
-ideesrv 2337/tcp # ideesrv
-# Marazzi <fmarazzi@ideetique.com>
-norton-lambert 2338/udp # Norton Lambert
-norton-lambert 2338/tcp # Norton Lambert
-# Richard de Mornay <rdemornay@norton-lambert.com>
-3com-webview 2339/udp # 3Com WebView
-3com-webview 2339/tcp # 3Com WebView
-# Jennifer Grace <Jennifer_Grace@3com.com>
-wrs_registry 2340/udp # WRS Registry
-wrs_registry 2340/tcp # WRS Registry
-# Christophe Cleraux <chrisc@wrs.com>
-xiostatus 2341/udp # XIO Status
-xiostatus 2341/tcp # XIO Status
-# Randy Maas <randym@xiotech.com>
-manage-exec 2342/udp # Seagate Manage Exec
-manage-exec 2342/tcp # Seagate Manage Exec
-# Jim Flaherty <jim.flaherty@seagatesoftware.com>
-nati-logos 2343/udp # nati logos
-nati-logos 2343/tcp # nati logos
-# David Pierce <David.Pierce@natinst.com>
-fcmsys 2344/udp # fcmsys
-fcmsys 2344/tcp # fcmsys
-dbm 2345/udp # dbm
-dbm 2345/tcp # dbm
-# Dean Robson <dean.robson@fujitsu.com.au>
-redstorm_join 2346/udp # Game Connection Port
-redstorm_join 2346/tcp # Game Connection Port
-redstorm_find 2347/udp # Game Announcement and Location
-redstorm_find 2347/tcp # Game Announcement and Location
-redstorm_info 2348/udp # Information to query for game status
-redstorm_info 2348/tcp # Information to query for game status
-redstorm_diag 2349/udp # Diagnostics Port
-redstorm_diag 2349/tcp # Diagnostics Port
-# David Weinstein <david.weinstein@redstorm.com>
-psbserver 2350/udp # psbserver
-psbserver 2350/tcp # psbserver
-psrserver 2351/udp # psrserver
-psrserver 2351/tcp # psrserver
-pslserver 2352/udp # pslserver
-pslserver 2352/tcp # pslserver
-pspserver 2353/udp # pspserver
-pspserver 2353/tcp # pspserver
-psprserver 2354/udp # psprserver
-psprserver 2354/tcp # psprserver
-psdbserver 2355/udp # psdbserver
-psdbserver 2355/tcp # psdbserver
-# Paul Reddy <Paul@pharos.co.nz>
-gxtelmd 2356/udp # GXT License Managemant
-gxtelmd 2356/tcp # GXT License Managemant
-# Robert Hodgson <rrh@gxt.com>
-unihub-server 2357/udp # UniHub Server
-unihub-server 2357/tcp # UniHub Server
-# Tim Kenyon <Tim_Kenyon@csicontrols.com>
-futrix 2358/udp # Futrix
-futrix 2358/tcp # Futrix
-# Peter Frankenberg <pcfberg@ibm.net>
-flukeserver 2359/udp # FlukeServer
-flukeserver 2359/tcp # FlukeServer
-# Bill Marbaker <wrm@fortenet.com>
-nexstorindltd 2360/udp # NexstorIndLtd
-nexstorindltd 2360/tcp # NexstorIndLtd
-# NexStor India Limited <next@nda.vsnl.net.in>
-tl1 2361/udp # TL1
-tl1 2361/tcp # TL1
-# Charles Scott Roberson <chip@cerent.com>
+# Gene Tyacke <gene@apple.com>
+ideesrv 2337/udp # ideesrv
+ideesrv 2337/tcp # ideesrv
+# Marazzi <fmarazzi@ideetique.com>
+norton-lambert 2338/udp # Norton Lambert
+norton-lambert 2338/tcp # Norton Lambert
+# Richard de Mornay <rdemornay@norton-lambert.com>
+3com-webview 2339/udp # 3Com WebView
+3com-webview 2339/tcp # 3Com WebView
+# Jennifer Grace <Jennifer_Grace@3com.com>
+wrs_registry 2340/udp # WRS Registry
+wrs_registry 2340/tcp # WRS Registry
+# Christophe Cleraux <chrisc@wrs.com>
+xiostatus 2341/udp # XIO Status
+xiostatus 2341/tcp # XIO Status
+# Randy Maas <randym@xiotech.com>
+manage-exec 2342/udp # Seagate Manage Exec
+manage-exec 2342/tcp # Seagate Manage Exec
+# Jim Flaherty <jim.flaherty@seagatesoftware.com>
+nati-logos 2343/udp # nati logos
+nati-logos 2343/tcp # nati logos
+# David Pierce <David.Pierce@natinst.com>
+fcmsys 2344/udp # fcmsys
+fcmsys 2344/tcp # fcmsys
+dbm 2345/udp # dbm
+dbm 2345/tcp # dbm
+# Dean Robson <dean.robson@fujitsu.com.au>
+redstorm_join 2346/udp # Game Connection Port
+redstorm_join 2346/tcp # Game Connection Port
+redstorm_find 2347/udp # Game Announcement and Location
+redstorm_find 2347/tcp # Game Announcement and Location
+redstorm_info 2348/udp # Information to query for game status
+redstorm_info 2348/tcp # Information to query for game status
+redstorm_diag 2349/udp # Diagnostics Port
+redstorm_diag 2349/tcp # Diagnostics Port
+# David Weinstein <david.weinstein@redstorm.com>
+psbserver 2350/udp # psbserver
+psbserver 2350/tcp # psbserver
+psrserver 2351/udp # psrserver
+psrserver 2351/tcp # psrserver
+pslserver 2352/udp # pslserver
+pslserver 2352/tcp # pslserver
+pspserver 2353/udp # pspserver
+pspserver 2353/tcp # pspserver
+psprserver 2354/udp # psprserver
+psprserver 2354/tcp # psprserver
+psdbserver 2355/udp # psdbserver
+psdbserver 2355/tcp # psdbserver
+# Paul Reddy <Paul@pharos.co.nz>
+gxtelmd 2356/udp # GXT License Managemant
+gxtelmd 2356/tcp # GXT License Managemant
+# Robert Hodgson <rrh@gxt.com>
+unihub-server 2357/udp # UniHub Server
+unihub-server 2357/tcp # UniHub Server
+# Tim Kenyon <Tim_Kenyon@csicontrols.com>
+futrix 2358/udp # Futrix
+futrix 2358/tcp # Futrix
+# Peter Frankenberg <pcfberg@ibm.net>
+flukeserver 2359/udp # FlukeServer
+flukeserver 2359/tcp # FlukeServer
+# Bill Marbaker <wrm@fortenet.com>
+nexstorindltd 2360/udp # NexstorIndLtd
+nexstorindltd 2360/tcp # NexstorIndLtd
+# NexStor India Limited <next@nda.vsnl.net.in>
+tl1 2361/udp # TL1
+tl1 2361/tcp # TL1
+# Charles Scott Roberson <chip@cerent.com>
digiman 2362/udp # digiman
digiman 2362/tcp # digiman
# Aaron S. Kurland <akurland@netsilicon.com>
mediacntrlnfsd 2363/udp # Media Central NFSD
mediacntrlnfsd 2363/tcp # Media Central NFSD
-# shivakumar s. govindarajapuram <shivak@eng.sun.com>
-oi-2000 2364/udp # OI-2000
-oi-2000 2364/tcp # OI-2000
-# Software Horizons Inc. <oi2000@shorizons.com>
-dbref 2365/udp # dbref
-dbref 2365/tcp # dbref
-# Yoshihiro Yamazaki <yamazaki@ael.fujitsu.co.jp>
-qip-login 2366/udp # qip-login
-qip-login 2366/tcp # qip-login
-# Mike Morgan <mmorgan@lucent.com>
-service-ctrl 2367/udp # Service Control
-service-ctrl 2367/tcp # Service Control
-# Humberto Sanchez <Humberto_Sanchez@hp.com>
-opentable 2368/udp # OpenTable
-opentable 2368/tcp # OpenTable
-# Thomas Theobald <ttheobald@opentable.com>
-acs2000-dsp 2369/udp # ACS2000 DSP
-acs2000-dsp 2369/tcp # ACS2000 DSP
-# Jeffrey Beauchamp <jeffrey.beauchamp@acs2000.net>
-l3-hbmon 2370/udp # L3-HBMon
-l3-hbmon 2370/tcp # L3-HBMon
-# Dolores Scott <Dolores.Scott@L-3security.com>
+# shivakumar s. govindarajapuram <shivak@eng.sun.com>
+oi-2000 2364/udp # OI-2000
+oi-2000 2364/tcp # OI-2000
+# Software Horizons Inc. <oi2000@shorizons.com>
+dbref 2365/udp # dbref
+dbref 2365/tcp # dbref
+# Yoshihiro Yamazaki <yamazaki@ael.fujitsu.co.jp>
+qip-login 2366/udp # qip-login
+qip-login 2366/tcp # qip-login
+# Mike Morgan <mmorgan@lucent.com>
+service-ctrl 2367/udp # Service Control
+service-ctrl 2367/tcp # Service Control
+# Humberto Sanchez <Humberto_Sanchez@hp.com>
+opentable 2368/udp # OpenTable
+opentable 2368/tcp # OpenTable
+# Thomas Theobald <ttheobald@opentable.com>
+acs2000-dsp 2369/udp # ACS2000 DSP
+acs2000-dsp 2369/tcp # ACS2000 DSP
+# Jeffrey Beauchamp <jeffrey.beauchamp@acs2000.net>
+l3-hbmon 2370/udp # L3-HBMon
+l3-hbmon 2370/tcp # L3-HBMon
+# Dolores Scott <Dolores.Scott@L-3security.com>
#### Port 2370 Unofficially used by Compaq ####
worldwire 2371/udp # Compaq WorldWire Port
worldwire 2371/tcp # Compaq WorldWire Port
@@ -5359,134 +5359,134 @@ worldwire 2371/tcp # Compaq WorldWire Port
compaq-https 2381/udp # Compaq HTTPS
compaq-https 2381/tcp # Compaq HTTPS
# Scott Shaffer <scott.shaffer@hp.com>
-ms-olap3 2382/udp # Microsoft OLAP
-ms-olap3 2382/tcp # Microsoft OLAP
-ms-olap4 2383/udp # Microsoft OLAP
-ms-olap4 2383/tcp # Microsoft OLAP
-# Mosha Pasumansky <moshap@microsoft.com>
+ms-olap3 2382/udp # Microsoft OLAP
+ms-olap3 2382/tcp # Microsoft OLAP
+ms-olap4 2383/udp # Microsoft OLAP
+ms-olap4 2383/tcp # Microsoft OLAP
+# Mosha Pasumansky <moshap@microsoft.com>
sd-capacity 2384/udp # SD-CAPACITY
sd-request 2384/tcp # SD-REQUEST
# Jason McManus <jasonm@sleepdep.net>
sd-data 2385/udp # SD-DATA
sd-data 2385/tcp # SD-DATA
# Jason McManus <jasonm@sleepdep.net>
-virtualtape 2386/udp # Virtual Tape
-virtualtape 2386/tcp # Virtual Tape
+virtualtape 2386/udp # Virtual Tape
+virtualtape 2386/tcp # Virtual Tape
vsamredirector 2387/udp # VSAM Redirector
vsamredirector 2387/tcp # VSAM Redirector
# Ingo Franzki <ifranzki@de.ibm.com>
mynahautostart 2388/udp # MYNAH AutoStart
mynahautostart 2388/tcp # MYNAH AutoStart
# Thomas J. Klehr <tklehr@telcordia.com>
-ovsessionmgr 2389/udp # OpenView Session Mgr
-ovsessionmgr 2389/tcp # OpenView Session Mgr
-# Eric Pulsipher <eric_pulsipher@hp.com>
-rsmtp 2390/udp # RSMTP
-rsmtp 2390/tcp # RSMTP
-# Geoff Collyer <geoff@research.bell-labs.com>
-3com-net-mgmt 2391/udp # 3COM Net Management
-3com-net-mgmt 2391/tcp # 3COM Net Management
-# Prathibha Nagvar
-tacticalauth 2392/udp # Tactical Auth
-tacticalauth 2392/tcp # Tactical Auth
-# David Yon <yon@tactical-sw.com>
-ms-olap1 2393/udp # MS OLAP 1
-ms-olap1 2393/tcp # MS OLAP 1
-ms-olap2 2394/udp # MS OLAP 2
-ms-olap2 2394/tcp # MS OLAP 2
-# Mosha Pasumansky <moshap@microsoft.com>
-lan900_remote 2395/udp # LAN900 Remote
-lan900_remote 2395/tcp # LAN900 Remote
-# Tom Quinlan <tquinlan@digitechinc.com>
-wusage 2396/udp # Wusage
-wusage 2396/tcp # Wusage
-# Thomas Boutell <boutell@boutell.com>
-ncl 2397/udp # NCL
-ncl 2397/tcp # NCL
-# Robert Wiebe <crw010@email.mot.com>
-orbiter 2398/udp # Orbiter
-orbiter 2398/tcp # Orbiter
-# David Goldberg <dgoldberg@callisto.com>
-fmpro-fdal 2399/udp # FileMaker, Inc. - Data Access Layer
-fmpro-fdal 2399/tcp # FileMaker, Inc. - Data Access Layer
-# Clay Maeckal <clay_maeckel@filemaker.com>
-opequus-server 2400/udp # OpEquus Server
-opequus-server 2400/tcp # OpEquus Server
-# Gavin Hutchinson <gavinh@tesl.com>
+ovsessionmgr 2389/udp # OpenView Session Mgr
+ovsessionmgr 2389/tcp # OpenView Session Mgr
+# Eric Pulsipher <eric_pulsipher@hp.com>
+rsmtp 2390/udp # RSMTP
+rsmtp 2390/tcp # RSMTP
+# Geoff Collyer <geoff@research.bell-labs.com>
+3com-net-mgmt 2391/udp # 3COM Net Management
+3com-net-mgmt 2391/tcp # 3COM Net Management
+# Prathibha Nagvar
+tacticalauth 2392/udp # Tactical Auth
+tacticalauth 2392/tcp # Tactical Auth
+# David Yon <yon@tactical-sw.com>
+ms-olap1 2393/udp # MS OLAP 1
+ms-olap1 2393/tcp # MS OLAP 1
+ms-olap2 2394/udp # MS OLAP 2
+ms-olap2 2394/tcp # MS OLAP 2
+# Mosha Pasumansky <moshap@microsoft.com>
+lan900_remote 2395/udp # LAN900 Remote
+lan900_remote 2395/tcp # LAN900 Remote
+# Tom Quinlan <tquinlan@digitechinc.com>
+wusage 2396/udp # Wusage
+wusage 2396/tcp # Wusage
+# Thomas Boutell <boutell@boutell.com>
+ncl 2397/udp # NCL
+ncl 2397/tcp # NCL
+# Robert Wiebe <crw010@email.mot.com>
+orbiter 2398/udp # Orbiter
+orbiter 2398/tcp # Orbiter
+# David Goldberg <dgoldberg@callisto.com>
+fmpro-fdal 2399/udp # FileMaker, Inc. - Data Access Layer
+fmpro-fdal 2399/tcp # FileMaker, Inc. - Data Access Layer
+# Clay Maeckal <clay_maeckel@filemaker.com>
+opequus-server 2400/udp # OpEquus Server
+opequus-server 2400/tcp # OpEquus Server
+# Gavin Hutchinson <gavinh@tesl.com>
cvspserver 2401/udp # cvspserver
cvspserver 2401/tcp # cvspserver
# Jim Kingdon <kingdon@harvey.cyclic.com>
-taskmaster2000 2402/udp # TaskMaster 2000 Server
-taskmaster2000 2402/tcp # TaskMaster 2000 Server
-taskmaster2000 2403/udp # TaskMaster 2000 Web
-taskmaster2000 2403/tcp # TaskMaster 2000 Web
-# Ed Odjaghian <edo@datacap.com>
+taskmaster2000 2402/udp # TaskMaster 2000 Server
+taskmaster2000 2402/tcp # TaskMaster 2000 Server
+taskmaster2000 2403/udp # TaskMaster 2000 Web
+taskmaster2000 2403/tcp # TaskMaster 2000 Web
+# Ed Odjaghian <edo@datacap.com>
iec-104 2404/udp # IEC 60870-5-104 process control over IP
iec-104 2404/tcp # IEC 60870-5-104 process control over IP
# Walter K. Eichelburg <walter.eichelburg@sat-automation.com>
-trc-netpoll 2405/udp # TRC Netpoll
-trc-netpoll 2405/tcp # TRC Netpoll
-# Bizhan Ghavami <ghavami@telcores.com>
-jediserver 2406/udp # JediServer
-jediserver 2406/tcp # JediServer
-# Paul McEntire <paul.mcentire@columbiasc.ncr.com>
+trc-netpoll 2405/udp # TRC Netpoll
+trc-netpoll 2405/tcp # TRC Netpoll
+# Bizhan Ghavami <ghavami@telcores.com>
+jediserver 2406/udp # JediServer
+jediserver 2406/tcp # JediServer
+# Paul McEntire <paul.mcentire@columbiasc.ncr.com>
orion 2407/udp # Orion
orion 2407/tcp # Orion
# Matthew Horoschun <mhoroschun@canprint.com.au>
-optimanet 2408/udp # OptimaNet
-optimanet 2408/tcp # OptimaNet
-# John Graham-Cumming <jgc@optimal.com>
-sns-protocol 2409/udp # SNS Protocol
-sns-protocol 2409/tcp # SNS Protocol
-# Amir Blich <amir@netmanage.co.il>
-vrts-registry 2410/udp # VRTS Registry
-vrts-registry 2410/tcp # VRTS Registry
-# Pranay Varma <pran@veritas.com>
-netwave-ap-mgmt 2411/udp # Netwave AP Management
-netwave-ap-mgmt 2411/tcp # Netwave AP Management
-# Johnny Zweig <zweig@netwave-wireless.com>
-cdn 2412/udp # CDN
-cdn 2412/tcp # CDN
-# Alan Noble <noble@netmind.com>
-orion-rmi-reg 2413/udp # orion-rmi-reg
-orion-rmi-reg 2413/tcp # orion-rmi-reg
-# J.S. Greenfield <greeny@us.ibm.com>
-beeyond 2414/udp # Beeyond
-beeyond 2414/tcp # Beeyond
-# Bob Deblier <bob@virtualunlimited.com>
+optimanet 2408/udp # OptimaNet
+optimanet 2408/tcp # OptimaNet
+# John Graham-Cumming <jgc@optimal.com>
+sns-protocol 2409/udp # SNS Protocol
+sns-protocol 2409/tcp # SNS Protocol
+# Amir Blich <amir@netmanage.co.il>
+vrts-registry 2410/udp # VRTS Registry
+vrts-registry 2410/tcp # VRTS Registry
+# Pranay Varma <pran@veritas.com>
+netwave-ap-mgmt 2411/udp # Netwave AP Management
+netwave-ap-mgmt 2411/tcp # Netwave AP Management
+# Johnny Zweig <zweig@netwave-wireless.com>
+cdn 2412/udp # CDN
+cdn 2412/tcp # CDN
+# Alan Noble <noble@netmind.com>
+orion-rmi-reg 2413/udp # orion-rmi-reg
+orion-rmi-reg 2413/tcp # orion-rmi-reg
+# J.S. Greenfield <greeny@us.ibm.com>
+beeyond 2414/udp # Beeyond
+beeyond 2414/tcp # Beeyond
+# Bob Deblier <bob@virtualunlimited.com>
codima-rtp 2415/udp # Codima Remote Transaction Protocol
codima-rtp 2415/tcp # Codima Remote Transaction Protocol
# Sylvia Ross <sross@codimatech.com>
-rmtserver 2416/udp # RMT Server
-rmtserver 2416/tcp # RMT Server
-# Yvon Marineau <yvon@simware.com>
-composit-server 2417/udp # Composit Server
-composit-server 2417/tcp # Composit Server
-# Katsuaki Naoi <naoi@pfu.co.jp>
-cas 2418/udp # cas
-cas 2418/tcp # cas
-# Akiyoshi Ochi <akiyoshi@net.paso.fujitsu.co.jp>
-attachmate-s2s 2419/udp # Attachmate S2S
-attachmate-s2s 2419/tcp # Attachmate S2S
-# Chris Rominski <ChrisRom@attachmate.com>
-dslremote-mgmt 2420/udp # DSL Remote Management
-dslremote-mgmt 2420/tcp # DSL Remote Management
-# Westell, Inc. <jronk@westell.com>
-g-talk 2421/udp # G-Talk
-g-talk 2421/tcp # G-Talk
-# Matt Hammond <matt_hammond@four-sight.co.uk>
-crmsbits 2422/udp # CRMSBITS
-crmsbits 2422/tcp # CRMSBITS
-# Rod Ward <RWard@vaccmel1.telstra.com.au>
-rnrp 2423/udp # RNRP
-rnrp 2423/tcp # RNRP
-# Per Sahlqvist <psahlqvi@sw.seisy.abb.se>
-kofax-svr 2424/udp # KOFAX-SVR
-kofax-svr 2424/tcp # KOFAX-SVR
-# Terry Reagan <treagan@kofax.com>
-fjitsuappmgr 2425/udp # Fujitsu App Manager
-fjitsuappmgr 2425/tcp # Fujitsu App Manager
-# Hiroyuki Kawabuchi <buchi@ael.fujitsu.co.jp>
+rmtserver 2416/udp # RMT Server
+rmtserver 2416/tcp # RMT Server
+# Yvon Marineau <yvon@simware.com>
+composit-server 2417/udp # Composit Server
+composit-server 2417/tcp # Composit Server
+# Katsuaki Naoi <naoi@pfu.co.jp>
+cas 2418/udp # cas
+cas 2418/tcp # cas
+# Akiyoshi Ochi <akiyoshi@net.paso.fujitsu.co.jp>
+attachmate-s2s 2419/udp # Attachmate S2S
+attachmate-s2s 2419/tcp # Attachmate S2S
+# Chris Rominski <ChrisRom@attachmate.com>
+dslremote-mgmt 2420/udp # DSL Remote Management
+dslremote-mgmt 2420/tcp # DSL Remote Management
+# Westell, Inc. <jronk@westell.com>
+g-talk 2421/udp # G-Talk
+g-talk 2421/tcp # G-Talk
+# Matt Hammond <matt_hammond@four-sight.co.uk>
+crmsbits 2422/udp # CRMSBITS
+crmsbits 2422/tcp # CRMSBITS
+# Rod Ward <RWard@vaccmel1.telstra.com.au>
+rnrp 2423/udp # RNRP
+rnrp 2423/tcp # RNRP
+# Per Sahlqvist <psahlqvi@sw.seisy.abb.se>
+kofax-svr 2424/udp # KOFAX-SVR
+kofax-svr 2424/tcp # KOFAX-SVR
+# Terry Reagan <treagan@kofax.com>
+fjitsuappmgr 2425/udp # Fujitsu App Manager
+fjitsuappmgr 2425/tcp # Fujitsu App Manager
+# Hiroyuki Kawabuchi <buchi@ael.fujitsu.co.jp>
# 2426 Unassigned (Removed 2002-04-29)
mgcp-gateway 2427/udp # Media Gateway Control Protocol Gateway
mgcp-gateway 2427/tcp # Media Gateway Control Protocol Gateway
@@ -5494,418 +5494,418 @@ mgcp-gateway 2427/tcp # Media Gateway Control Protocol Gateway
ott 2428/udp # One Way Trip Time
ott 2428/tcp # One Way Trip Time
# Greg Troxel <gdt@ir.bbn.com>
-ft-role 2429/udp # FT-ROLE
-ft-role 2429/tcp # FT-ROLE
-# Doug Boone <dboone@atg.CLR.com>
-venus 2430/udp # venus
-venus 2430/tcp # venus
-venus-se 2431/udp # venus-se
-venus-se 2431/tcp # venus-se
-codasrv 2432/udp # codasrv
-codasrv 2432/tcp # codasrv
-codasrv-se 2433/udp # codasrv-se
-codasrv-se 2433/tcp # codasrv-se
-# Robert Watson <robert@cyrus.watson.org>
-pxc-epmap 2434/udp # pxc-epmap
-pxc-epmap 2434/tcp # pxc-epmap
-# Jun Nakamura <jnakamur@cp10.es.xerox.com>
-optilogic 2435/udp # OptiLogic
-optilogic 2435/tcp # OptiLogic
-# Clark Williams <clark@wirespeed.com>
-topx 2436/udp # TOP/X
-topx 2436/tcp # TOP/X
-# Dragos Pop <dragos@cs.ubbcluj.ro>
-unicontrol 2437/udp # UniControl
-unicontrol 2437/tcp # UniControl
-# Ing. Markus Huemer <markus.huemer@hsd.at>
-msp 2438/udp # MSP
-msp 2438/tcp # MSP
-# Evan Caves <evan@acc.com>
-sybasedbsynch 2439/udp # SybaseDBSynch
-sybasedbsynch 2439/tcp # SybaseDBSynch
-# Dave Neudoerffer <Dave.Neudoerffer@ianywhere.com>
-spearway 2440/udp # Spearway Lockers
-spearway 2440/tcp # Spearway Lockers
-# Pierre Frisch <Pierre.Frisch@spearway.com>
+ft-role 2429/udp # FT-ROLE
+ft-role 2429/tcp # FT-ROLE
+# Doug Boone <dboone@atg.CLR.com>
+venus 2430/udp # venus
+venus 2430/tcp # venus
+venus-se 2431/udp # venus-se
+venus-se 2431/tcp # venus-se
+codasrv 2432/udp # codasrv
+codasrv 2432/tcp # codasrv
+codasrv-se 2433/udp # codasrv-se
+codasrv-se 2433/tcp # codasrv-se
+# Robert Watson <robert@cyrus.watson.org>
+pxc-epmap 2434/udp # pxc-epmap
+pxc-epmap 2434/tcp # pxc-epmap
+# Jun Nakamura <jnakamur@cp10.es.xerox.com>
+optilogic 2435/udp # OptiLogic
+optilogic 2435/tcp # OptiLogic
+# Clark Williams <clark@wirespeed.com>
+topx 2436/udp # TOP/X
+topx 2436/tcp # TOP/X
+# Dragos Pop <dragos@cs.ubbcluj.ro>
+unicontrol 2437/udp # UniControl
+unicontrol 2437/tcp # UniControl
+# Ing. Markus Huemer <markus.huemer@hsd.at>
+msp 2438/udp # MSP
+msp 2438/tcp # MSP
+# Evan Caves <evan@acc.com>
+sybasedbsynch 2439/udp # SybaseDBSynch
+sybasedbsynch 2439/tcp # SybaseDBSynch
+# Dave Neudoerffer <Dave.Neudoerffer@ianywhere.com>
+spearway 2440/udp # Spearway Lockers
+spearway 2440/tcp # Spearway Lockers
+# Pierre Frisch <Pierre.Frisch@spearway.com>
pvsw-inet 2441/udp # Pervasive I*net Data Server
pvsw-inet 2441/tcp # Pervasive I*net Data Server
# Chuck Talk <ctalk@pervasive.com>
-netangel 2442/udp # Netangel
-netangel 2442/tcp # Netangel
-# Ladislav Baranyay <identcod@identcode.sk>
+netangel 2442/udp # Netangel
+netangel 2442/tcp # Netangel
+# Ladislav Baranyay <identcod@identcode.sk>
powerclientcsf 2443/udp # PowerClient Central Storage Facility
powerclientcsf 2443/tcp # PowerClient Central Storage Facility
-# Brian Klassen <Brian.Klassen@Unisys.com>
+# Brian Klassen <Brian.Klassen@Unisys.com>
btpp2sectrans 2444/udp # BT PP2 Sectrans
btpp2sectrans 2444/tcp # BT PP2 Sectrans
# Ian Daniels <btexact.ports@bt.com>
-dtn1 2445/udp # DTN1
-dtn1 2445/tcp # DTN1
-# Bob Gaddie <bobg@dtn.com>
-bues_service 2446/udp # bues_service
-bues_service 2446/tcp # bues_service
-# Leonhard Diekmann
+dtn1 2445/udp # DTN1
+dtn1 2445/tcp # DTN1
+# Bob Gaddie <bobg@dtn.com>
+bues_service 2446/udp # bues_service
+bues_service 2446/tcp # bues_service
+# Leonhard Diekmann
# <diekmann@04.mstr02.telekom400.dbp.de>
-ovwdb 2447/udp # OpenView NNM daemon
-ovwdb 2447/tcp # OpenView NNM daemon
-# Eric Pulsipher <eric_pulsipher@fc.hp.com>
-hpppssvr 2448/udp # hpppsvr
-hpppssvr 2448/tcp # hpppsvr
-# Bridgette Landers <blanders@boi.hp.com>
-ratl 2449/udp # RATL
-ratl 2449/tcp # RATL
-# Paul Greenfield <paul.greenfield@unisys.com>
-netadmin 2450/udp # netadmin
-netadmin 2450/tcp # netadmin
-netchat 2451/udp # netchat
-netchat 2451/tcp # netchat
-# Julian Mehnle <julian@mehnle.net>
-snifferclient 2452/udp # SnifferClient
-snifferclient 2452/tcp # SnifferClient
-# Amy Weaver <amy_weaver@nai.com>
-madge-om 2453/udp # madge-om
-madge-om 2453/tcp # madge-om
-# Andrew Draper <adraper@dev.madge.com>
-indx-dds 2454/udp # IndX-DDS
-indx-dds 2454/tcp # IndX-DDS
-# Paul Carmichael <paulcarmichael@indx.net>
-wago-io-system 2455/udp # WAGO-IO-SYSTEM
-wago-io-system 2455/tcp # WAGO-IO-SYSTEM
-# Uwe Rathert <uwe.rathert@ieee.org>
-altav-remmgt 2456/udp # altav-remmgt
-altav-remmgt 2456/tcp # altav-remmgt
-# Gary M. Allen <gallen@symantec.com>
-rapido-ip 2457/udp # Rapido_IP
-rapido-ip 2457/tcp # Rapido_IP
-# Man Shuen Cheung <man_shuen_cheung@wamnet.co.uk>
-griffin 2458/udp # griffin
-griffin 2458/tcp # griffin
-# Tom Taylor <Tom.Taylor@unisys.com>
-community 2459/udp # Community
-community 2459/tcp # Community
-# David Schwartz <davids@webmaster.com>
-ms-theater 2460/udp # ms-theater
-ms-theater 2460/tcp # ms-theater
-# Anton Kucer <a-antonk@microsoft.com>
-qadmifoper 2461/udp # qadmifoper
-qadmifoper 2461/tcp # qadmifoper
-qadmifevent 2462/udp # qadmifevent
-qadmifevent 2462/tcp # qadmifevent
-# Pekka Takaranta <pekka.takaranta@tellabs.fi>
-symbios-raid 2463/udp # Symbios Raid
-symbios-raid 2463/tcp # Symbios Raid
-# Bill Delaney <bill.delaney@symbios.com>
-direcpc-si 2464/udp # DirecPC SI
-direcpc-si 2464/tcp # DirecPC SI
-# Doug Dillon <dillon@hns.com>
-lbm 2465/udp # Load Balance Management
-lbm 2465/tcp # Load Balance Management
-lbf 2466/udp # Load Balance Forwarding
-lbf 2466/tcp # Load Balance Forwarding
-# Kazuhiro Koide <kaz@pfu.co.jp>
-high-criteria 2467/udp # High Criteria
-high-criteria 2467/tcp # High Criteria
-# Konstantin Iavid <kiavid@highcriteria.com>
-qip-msgd 2468/udp # qip_msgd
-qip-msgd 2468/tcp # qip_msgd
-# Mike Morgan <mmorgan@lucent.com>
-mti-tcs-comm 2469/udp # MTI-TCS-COMM
-mti-tcs-comm 2469/tcp # MTI-TCS-COMM
-# Mario Bonin <boninm@microtempus.com>
-taskman-port 2470/udp # taskman port
-taskman-port 2470/tcp # taskman port
-# Boris Panteleev <bpanteleev@himel.com>
-seaodbc 2471/udp # SeaODBC
-seaodbc 2471/tcp # SeaODBC
-# Adrian Hornby <Adrian.Hornby@aran.co.uk>
-c3 2472/udp # C3
-c3 2472/tcp # C3
-# Eckhard Grieger <e.grieger@com-on.de>
-aker-cdp 2473/udp # Aker-cdp
-aker-cdp 2473/tcp # Aker-cdp
-# Rodrigo Ormonde <ormonde@aker.com.br>
-vitalanalysis 2474/udp # Vital Analysis
-vitalanalysis 2474/tcp # Vital Analysis
-# Srinivas Reddy <sreddy@vitalsigns.com>
-ace-server 2475/udp # ACE Server
-ace-server 2475/tcp # ACE Server
-ace-svr-prop 2476/udp # ACE Server Propagation
-ace-svr-prop 2476/tcp # ACE Server Propagation
-ssm-cvs 2477/udp # SecurSight Certificate Valifation Service
-ssm-cvs 2477/tcp # SecurSight Certificate Valifation Service
-ssm-cssps 2478/udp # SecurSight Authentication Server (SSL)
-ssm-cssps 2478/tcp # SecurSight Authentication Server (SSL)
-ssm-els 2479/udp # SecurSight Event Logging Server (SSL)
-ssm-els 2479/tcp # SecurSight Event Logging Server (SSL)
-# John Linn <jlinn@securitydynamics.com>
-lingwood 2480/udp # Lingwood's Detail
-lingwood 2480/tcp # Lingwood's Detail
-# Dave Richmond <drichmond@striva.com>
-giop 2481/udp # Oracle GIOP
-giop 2481/tcp # Oracle GIOP
-giop-ssl 2482/udp # Oracle GIOP SSL
-giop-ssl 2482/tcp # Oracle GIOP SSL
-ttc 2483/udp # Oracle TTC
-ttc 2483/tcp # Oracle TTC
-ttc-ssl 2484/udp # Oracle TTC SSL
-ttc-ssl 2484/tcp # Oracle TTC SSL
-# Chandar Venkataraman <CVENKATA@us.oracle.com>
-netobjects1 2485/udp # Net Objects1
-netobjects1 2485/tcp # Net Objects1
-netobjects2 2486/udp # Net Objects2
-netobjects2 2486/tcp # Net Objects2
-# Francois Granade <francois@netobjects.com>
-pns 2487/udp # Policy Notice Service
-pns 2487/tcp # Policy Notice Service
-# Akiyoshi Ochi <akiyoshi@net.paso.fujitsu.co.jp>
-moy-corp 2488/udp # Moy Corporation
-moy-corp 2488/tcp # Moy Corporation
-# Gang Gong Moy
-tsilb 2489/udp # TSILB
-tsilb 2489/tcp # TSILB
-# James Irwin <jimi@travsoft.com>
-qip-qdhcp 2490/udp # qip_qdhcp
-qip-qdhcp 2490/tcp # qip_qdhcp
-# Mike Morgan <mmorgan@lucent.com>
-conclave-cpp 2491/udp # Conclave CPP
-conclave-cpp 2491/tcp # Conclave CPP
-# Larry Lipstone <lrl@interdyn.com>
-groove 2492/udp # GROOVE
-groove 2492/tcp # GROOVE
-# Ray Ozzie <ray@rocks.net>
-talarian-mqs 2493/udp # Talarian MQS
-talarian-mqs 2493/tcp # Talarian MQS
-# Jim Stabile <jstabile@talarian.com>
-bmc-ar 2494/udp # BMC AR
-bmc-ar 2494/tcp # BMC AR
-# Shelia Childs <sheila_childs@bmc.com>
-fast-rem-serv 2495/udp # Fast Remote Services
-fast-rem-serv 2495/tcp # Fast Remote Services
-# Scott St. Clair <stclair@NTC.ADAPTEC.com>
-dirgis 2496/udp # DIRGIS
-dirgis 2496/tcp # DIRGIS
-# Deutschland Informations- und
+ovwdb 2447/udp # OpenView NNM daemon
+ovwdb 2447/tcp # OpenView NNM daemon
+# Eric Pulsipher <eric_pulsipher@fc.hp.com>
+hpppssvr 2448/udp # hpppsvr
+hpppssvr 2448/tcp # hpppsvr
+# Bridgette Landers <blanders@boi.hp.com>
+ratl 2449/udp # RATL
+ratl 2449/tcp # RATL
+# Paul Greenfield <paul.greenfield@unisys.com>
+netadmin 2450/udp # netadmin
+netadmin 2450/tcp # netadmin
+netchat 2451/udp # netchat
+netchat 2451/tcp # netchat
+# Julian Mehnle <julian@mehnle.net>
+snifferclient 2452/udp # SnifferClient
+snifferclient 2452/tcp # SnifferClient
+# Amy Weaver <amy_weaver@nai.com>
+madge-om 2453/udp # madge-om
+madge-om 2453/tcp # madge-om
+# Andrew Draper <adraper@dev.madge.com>
+indx-dds 2454/udp # IndX-DDS
+indx-dds 2454/tcp # IndX-DDS
+# Paul Carmichael <paulcarmichael@indx.net>
+wago-io-system 2455/udp # WAGO-IO-SYSTEM
+wago-io-system 2455/tcp # WAGO-IO-SYSTEM
+# Uwe Rathert <uwe.rathert@ieee.org>
+altav-remmgt 2456/udp # altav-remmgt
+altav-remmgt 2456/tcp # altav-remmgt
+# Gary M. Allen <gallen@symantec.com>
+rapido-ip 2457/udp # Rapido_IP
+rapido-ip 2457/tcp # Rapido_IP
+# Man Shuen Cheung <man_shuen_cheung@wamnet.co.uk>
+griffin 2458/udp # griffin
+griffin 2458/tcp # griffin
+# Tom Taylor <Tom.Taylor@unisys.com>
+community 2459/udp # Community
+community 2459/tcp # Community
+# David Schwartz <davids@webmaster.com>
+ms-theater 2460/udp # ms-theater
+ms-theater 2460/tcp # ms-theater
+# Anton Kucer <a-antonk@microsoft.com>
+qadmifoper 2461/udp # qadmifoper
+qadmifoper 2461/tcp # qadmifoper
+qadmifevent 2462/udp # qadmifevent
+qadmifevent 2462/tcp # qadmifevent
+# Pekka Takaranta <pekka.takaranta@tellabs.fi>
+symbios-raid 2463/udp # Symbios Raid
+symbios-raid 2463/tcp # Symbios Raid
+# Bill Delaney <bill.delaney@symbios.com>
+direcpc-si 2464/udp # DirecPC SI
+direcpc-si 2464/tcp # DirecPC SI
+# Doug Dillon <dillon@hns.com>
+lbm 2465/udp # Load Balance Management
+lbm 2465/tcp # Load Balance Management
+lbf 2466/udp # Load Balance Forwarding
+lbf 2466/tcp # Load Balance Forwarding
+# Kazuhiro Koide <kaz@pfu.co.jp>
+high-criteria 2467/udp # High Criteria
+high-criteria 2467/tcp # High Criteria
+# Konstantin Iavid <kiavid@highcriteria.com>
+qip-msgd 2468/udp # qip_msgd
+qip-msgd 2468/tcp # qip_msgd
+# Mike Morgan <mmorgan@lucent.com>
+mti-tcs-comm 2469/udp # MTI-TCS-COMM
+mti-tcs-comm 2469/tcp # MTI-TCS-COMM
+# Mario Bonin <boninm@microtempus.com>
+taskman-port 2470/udp # taskman port
+taskman-port 2470/tcp # taskman port
+# Boris Panteleev <bpanteleev@himel.com>
+seaodbc 2471/udp # SeaODBC
+seaodbc 2471/tcp # SeaODBC
+# Adrian Hornby <Adrian.Hornby@aran.co.uk>
+c3 2472/udp # C3
+c3 2472/tcp # C3
+# Eckhard Grieger <e.grieger@com-on.de>
+aker-cdp 2473/udp # Aker-cdp
+aker-cdp 2473/tcp # Aker-cdp
+# Rodrigo Ormonde <ormonde@aker.com.br>
+vitalanalysis 2474/udp # Vital Analysis
+vitalanalysis 2474/tcp # Vital Analysis
+# Srinivas Reddy <sreddy@vitalsigns.com>
+ace-server 2475/udp # ACE Server
+ace-server 2475/tcp # ACE Server
+ace-svr-prop 2476/udp # ACE Server Propagation
+ace-svr-prop 2476/tcp # ACE Server Propagation
+ssm-cvs 2477/udp # SecurSight Certificate Valifation Service
+ssm-cvs 2477/tcp # SecurSight Certificate Valifation Service
+ssm-cssps 2478/udp # SecurSight Authentication Server (SSL)
+ssm-cssps 2478/tcp # SecurSight Authentication Server (SSL)
+ssm-els 2479/udp # SecurSight Event Logging Server (SSL)
+ssm-els 2479/tcp # SecurSight Event Logging Server (SSL)
+# John Linn <jlinn@securitydynamics.com>
+lingwood 2480/udp # Lingwood's Detail
+lingwood 2480/tcp # Lingwood's Detail
+# Dave Richmond <drichmond@striva.com>
+giop 2481/udp # Oracle GIOP
+giop 2481/tcp # Oracle GIOP
+giop-ssl 2482/udp # Oracle GIOP SSL
+giop-ssl 2482/tcp # Oracle GIOP SSL
+ttc 2483/udp # Oracle TTC
+ttc 2483/tcp # Oracle TTC
+ttc-ssl 2484/udp # Oracle TTC SSL
+ttc-ssl 2484/tcp # Oracle TTC SSL
+# Chandar Venkataraman <CVENKATA@us.oracle.com>
+netobjects1 2485/udp # Net Objects1
+netobjects1 2485/tcp # Net Objects1
+netobjects2 2486/udp # Net Objects2
+netobjects2 2486/tcp # Net Objects2
+# Francois Granade <francois@netobjects.com>
+pns 2487/udp # Policy Notice Service
+pns 2487/tcp # Policy Notice Service
+# Akiyoshi Ochi <akiyoshi@net.paso.fujitsu.co.jp>
+moy-corp 2488/udp # Moy Corporation
+moy-corp 2488/tcp # Moy Corporation
+# Gang Gong Moy
+tsilb 2489/udp # TSILB
+tsilb 2489/tcp # TSILB
+# James Irwin <jimi@travsoft.com>
+qip-qdhcp 2490/udp # qip_qdhcp
+qip-qdhcp 2490/tcp # qip_qdhcp
+# Mike Morgan <mmorgan@lucent.com>
+conclave-cpp 2491/udp # Conclave CPP
+conclave-cpp 2491/tcp # Conclave CPP
+# Larry Lipstone <lrl@interdyn.com>
+groove 2492/udp # GROOVE
+groove 2492/tcp # GROOVE
+# Ray Ozzie <ray@rocks.net>
+talarian-mqs 2493/udp # Talarian MQS
+talarian-mqs 2493/tcp # Talarian MQS
+# Jim Stabile <jstabile@talarian.com>
+bmc-ar 2494/udp # BMC AR
+bmc-ar 2494/tcp # BMC AR
+# Shelia Childs <sheila_childs@bmc.com>
+fast-rem-serv 2495/udp # Fast Remote Services
+fast-rem-serv 2495/tcp # Fast Remote Services
+# Scott St. Clair <stclair@NTC.ADAPTEC.com>
+dirgis 2496/udp # DIRGIS
+dirgis 2496/tcp # DIRGIS
+# Deutschland Informations- und
# Reservierungsgesellschaft mbH <beratung@dirg.de>
-quaddb 2497/udp # Quad DB
-quaddb 2497/tcp # Quad DB
-# Jeff Rosenthal <jrosenthal@quad-sys.com>
-odn-castraq 2498/udp # ODN-CasTraq
-odn-castraq 2498/tcp # ODN-CasTraq
-# Richard Hodges <rh@source.net>
-unicontrol 2499/udp # UniControl
-unicontrol 2499/tcp # UniControl
-# Ing. Markus Huemer
+quaddb 2497/udp # Quad DB
+quaddb 2497/tcp # Quad DB
+# Jeff Rosenthal <jrosenthal@quad-sys.com>
+odn-castraq 2498/udp # ODN-CasTraq
+odn-castraq 2498/tcp # ODN-CasTraq
+# Richard Hodges <rh@source.net>
+unicontrol 2499/udp # UniControl
+unicontrol 2499/tcp # UniControl
+# Ing. Markus Huemer
rtsserv 2500/udp # Resource Tracking system server
rtsserv 2500/tcp # Resource Tracking system server
rtsclient 2501/udp # Resource Tracking system client
rtsclient 2501/tcp # Resource Tracking system client
# Aubrey Turner
# <S95525ta%etsuacad.bitnet@ETSUADMN.ETSU.EDU>
-kentrox-prot 2502/udp # Kentrox Protocol
-kentrox-prot 2502/tcp # Kentrox Protocol
-# Anil Lakhwara <anil_lakhwara@kentrox.com>
-nms-dpnss 2503/udp # NMS-DPNSS
-nms-dpnss 2503/tcp # NMS-DPNSS
-# Jean-Christophe Desire
-# <Jean-Christophe_Desire@NMS-Europe.com>
-wlbs 2504/udp # WLBS
-wlbs 2504/tcp # WLBS
-# William Bain <bbain@microsoft.com>
+kentrox-prot 2502/udp # Kentrox Protocol
+kentrox-prot 2502/tcp # Kentrox Protocol
+# Anil Lakhwara <anil_lakhwara@kentrox.com>
+nms-dpnss 2503/udp # NMS-DPNSS
+nms-dpnss 2503/tcp # NMS-DPNSS
+# Jean-Christophe Desire
+# <Jean-Christophe_Desire@NMS-Europe.com>
+wlbs 2504/udp # WLBS
+wlbs 2504/tcp # WLBS
+# William Bain <bbain@microsoft.com>
# 2505 Removed (2002-06-14)
-jbroker 2506/udp # jbroker
-jbroker 2506/tcp # jbroker
-# Rohit Garg <rohit@objectScape.com>
-spock 2507/udp # spock
-spock 2507/tcp # spock
-# Jon A. Christopher <jac8792@tamu.edu>
-jdatastore 2508/udp # JDataStore
-jdatastore 2508/tcp # JDataStore
-# Tod Landis <tlandis@inprise.com>
-fjmpss 2509/udp # fjmpss
-fjmpss 2509/tcp # fjmpss
-# Makoto Watanabe <makoto@saint.nm.fujitsu.co.jp>
-fjappmgrbulk 2510/udp # fjappmgrbulk
-fjappmgrbulk 2510/tcp # fjappmgrbulk
-# Hiroyuki Kawabuchi <buchi@ael.fujitsu.co.jp>
-metastorm 2511/udp # Metastorm
-metastorm 2511/tcp # Metastorm
-# Eric Isom <eisom@metastorm.com>
-citrixima 2512/udp # Citrix IMA
-citrixima 2512/tcp # Citrix IMA
-citrixadmin 2513/udp # Citrix ADMIN
-citrixadmin 2513/tcp # Citrix ADMIN
-# Myk Willis <myk.willis@citrix.com>
-facsys-ntp 2514/udp # Facsys NTP
-facsys-ntp 2514/tcp # Facsys NTP
-facsys-router 2515/udp # Facsys Router
-facsys-router 2515/tcp # Facsys Router
-# Jeff Hoffman <jeffh@facsys.com>
-maincontrol 2516/udp # Main Control
-maincontrol 2516/tcp # Main Control
-# Nathan Sadia <sadia@maincontrol.com>
-call-sig-trans 2517/udp # H.323 Annex E call signaling transport
-call-sig-trans 2517/tcp # H.323 Annex E call signaling transport
-# Gur Kimchi <gur.kimchi@vocaltec.com>
-willy 2518/udp # Willy
-willy 2518/tcp # Willy
-# Carl-Johan Wik <cjw@hudsmoar.com>
-globmsgsvc 2519/udp # globmsgsvc
-globmsgsvc 2519/tcp # globmsgsvc
-# David Wiltz <dwiltz@hf.intel.com>
+jbroker 2506/udp # jbroker
+jbroker 2506/tcp # jbroker
+# Rohit Garg <rohit@objectScape.com>
+spock 2507/udp # spock
+spock 2507/tcp # spock
+# Jon A. Christopher <jac8792@tamu.edu>
+jdatastore 2508/udp # JDataStore
+jdatastore 2508/tcp # JDataStore
+# Tod Landis <tlandis@inprise.com>
+fjmpss 2509/udp # fjmpss
+fjmpss 2509/tcp # fjmpss
+# Makoto Watanabe <makoto@saint.nm.fujitsu.co.jp>
+fjappmgrbulk 2510/udp # fjappmgrbulk
+fjappmgrbulk 2510/tcp # fjappmgrbulk
+# Hiroyuki Kawabuchi <buchi@ael.fujitsu.co.jp>
+metastorm 2511/udp # Metastorm
+metastorm 2511/tcp # Metastorm
+# Eric Isom <eisom@metastorm.com>
+citrixima 2512/udp # Citrix IMA
+citrixima 2512/tcp # Citrix IMA
+citrixadmin 2513/udp # Citrix ADMIN
+citrixadmin 2513/tcp # Citrix ADMIN
+# Myk Willis <myk.willis@citrix.com>
+facsys-ntp 2514/udp # Facsys NTP
+facsys-ntp 2514/tcp # Facsys NTP
+facsys-router 2515/udp # Facsys Router
+facsys-router 2515/tcp # Facsys Router
+# Jeff Hoffman <jeffh@facsys.com>
+maincontrol 2516/udp # Main Control
+maincontrol 2516/tcp # Main Control
+# Nathan Sadia <sadia@maincontrol.com>
+call-sig-trans 2517/udp # H.323 Annex E call signaling transport
+call-sig-trans 2517/tcp # H.323 Annex E call signaling transport
+# Gur Kimchi <gur.kimchi@vocaltec.com>
+willy 2518/udp # Willy
+willy 2518/tcp # Willy
+# Carl-Johan Wik <cjw@hudsmoar.com>
+globmsgsvc 2519/udp # globmsgsvc
+globmsgsvc 2519/tcp # globmsgsvc
+# David Wiltz <dwiltz@hf.intel.com>
pvsw 2520/udp # Pervasive Listener
pvsw 2520/tcp # Pervasive Listener
# Chuck Talk <ctalk@pervasive.com>
-adaptecmgr 2521/udp # Adaptec Manager
-adaptecmgr 2521/tcp # Adaptec Manager
-# Mark Parenti <map@ntc.adaptec.com>
-windb 2522/udp # WinDb
-windb 2522/tcp # WinDb
-# Larry Traylor <larry@arium.com>
+adaptecmgr 2521/udp # Adaptec Manager
+adaptecmgr 2521/tcp # Adaptec Manager
+# Mark Parenti <map@ntc.adaptec.com>
+windb 2522/udp # WinDb
+windb 2522/tcp # WinDb
+# Larry Traylor <larry@arium.com>
qke-llc-v3 2523/udp # Qke LLC V.3
qke-llc-v3 2523/tcp # Qke LLC V.3
# Joerg Niehoff <joerg.niehoff@alcatel-ke.de>
-optiwave-lm 2524/udp # Optiwave License Management
-optiwave-lm 2524/tcp # Optiwave License Management
-# Slawomir Krzesinski <slavek@optiwave.com>
-ms-v-worlds 2525/udp # MS V-Worlds
-ms-v-worlds 2525/tcp # MS V-Worlds
-# Pete Wong <petewong@microsoft.com>
-ema-sent-lm 2526/udp # EMA License Manager
-ema-sent-lm 2526/tcp # EMA License Manager
-# Thaddeus Perala <tr@emaden.com>
-iqserver 2527/udp # IQ Server
-iqserver 2527/tcp # IQ Server
-# Nick Straguzzi <Nick_Straguzzi@akbs.com>
-ncr_ccl 2528/udp # NCR CCL
-ncr_ccl 2528/tcp # NCR CCL
-# Amitava Dutta <Amitava.Dutta@WoodbridgeNJ.ncr.com>
-utsftp 2529/udp # UTS FTP
-utsftp 2529/tcp # UTS FTP
-# David Moore <dmoore@uttc-uts.com>
-vrcommerce 2530/udp # VR Commerce
-vrcommerce 2530/tcp # VR Commerce
-# Yosi Mass <yosimass@haifa.vnet.ibm.com>
-ito-e-gui 2531/udp # ITO-E GUI
-ito-e-gui 2531/tcp # ITO-E GUI
-# Michael Haeuptle <Michael_Haeuptle@hp.com>
-ovtopmd 2532/udp # OVTOPMD
-ovtopmd 2532/tcp # OVTOPMD
-# Eric Pulsipher <eric_pulsipher@hp.com>
-snifferserver 2533/udp # SnifferServer
-snifferserver 2533/tcp # SnifferServer
-# Amy Weaver <Amy_Weaver@NAI.com>
-combox-web-acc 2534/udp # Combox Web Access
-combox-web-acc 2534/tcp # Combox Web Access
-# Yochai Cohen <yochai@combox.co.il>
-madcap 2535/udp # MADCAP
-madcap 2535/tcp # MADCAP
-# Stephen Hanna <steve.hanna@sun.com>
+optiwave-lm 2524/udp # Optiwave License Management
+optiwave-lm 2524/tcp # Optiwave License Management
+# Slawomir Krzesinski <slavek@optiwave.com>
+ms-v-worlds 2525/udp # MS V-Worlds
+ms-v-worlds 2525/tcp # MS V-Worlds
+# Pete Wong <petewong@microsoft.com>
+ema-sent-lm 2526/udp # EMA License Manager
+ema-sent-lm 2526/tcp # EMA License Manager
+# Thaddeus Perala <tr@emaden.com>
+iqserver 2527/udp # IQ Server
+iqserver 2527/tcp # IQ Server
+# Nick Straguzzi <Nick_Straguzzi@akbs.com>
+ncr_ccl 2528/udp # NCR CCL
+ncr_ccl 2528/tcp # NCR CCL
+# Amitava Dutta <Amitava.Dutta@WoodbridgeNJ.ncr.com>
+utsftp 2529/udp # UTS FTP
+utsftp 2529/tcp # UTS FTP
+# David Moore <dmoore@uttc-uts.com>
+vrcommerce 2530/udp # VR Commerce
+vrcommerce 2530/tcp # VR Commerce
+# Yosi Mass <yosimass@haifa.vnet.ibm.com>
+ito-e-gui 2531/udp # ITO-E GUI
+ito-e-gui 2531/tcp # ITO-E GUI
+# Michael Haeuptle <Michael_Haeuptle@hp.com>
+ovtopmd 2532/udp # OVTOPMD
+ovtopmd 2532/tcp # OVTOPMD
+# Eric Pulsipher <eric_pulsipher@hp.com>
+snifferserver 2533/udp # SnifferServer
+snifferserver 2533/tcp # SnifferServer
+# Amy Weaver <Amy_Weaver@NAI.com>
+combox-web-acc 2534/udp # Combox Web Access
+combox-web-acc 2534/tcp # Combox Web Access
+# Yochai Cohen <yochai@combox.co.il>
+madcap 2535/udp # MADCAP
+madcap 2535/tcp # MADCAP
+# Stephen Hanna <steve.hanna@sun.com>
btpp2audctr1 2536/udp # btpp2audctr1
btpp2audctr1 2536/tcp # btpp2audctr1
# Ian Daniels <btexact.ports@bt.com>
-upgrade 2537/udp # Upgrade Protocol
-upgrade 2537/tcp # Upgrade Protocol
-# Breck Auten <bauten@dst-inc.com>
-vnwk-prapi 2538/udp # vnwk-prapi
-vnwk-prapi 2538/tcp # vnwk-prapi
-# John Hasselkus <Jhasselkus@VisualNetworks.com>
-vsiadmin 2539/udp # VSI Admin
-vsiadmin 2539/tcp # VSI Admin
-# Rob Juergens <robj@vsi.com>
-lonworks 2540/udp # LonWorks
-lonworks 2540/tcp # LonWorks
-lonworks2 2541/udp # LonWorks2
-lonworks2 2541/tcp # LonWorks2
-# Gary Bartlett <garyb@echelon.com>
+upgrade 2537/udp # Upgrade Protocol
+upgrade 2537/tcp # Upgrade Protocol
+# Breck Auten <bauten@dst-inc.com>
+vnwk-prapi 2538/udp # vnwk-prapi
+vnwk-prapi 2538/tcp # vnwk-prapi
+# John Hasselkus <Jhasselkus@VisualNetworks.com>
+vsiadmin 2539/udp # VSI Admin
+vsiadmin 2539/tcp # VSI Admin
+# Rob Juergens <robj@vsi.com>
+lonworks 2540/udp # LonWorks
+lonworks 2540/tcp # LonWorks
+lonworks2 2541/udp # LonWorks2
+lonworks2 2541/tcp # LonWorks2
+# Gary Bartlett <garyb@echelon.com>
davinci 2542/udp # daVinci Presenter
davinci 2542/tcp # daVinci Presenter
# b-novative GmbH <info@b-novative.com>
-reftek 2543/udp # REFTEK
-reftek 2543/tcp # REFTEK
-# Robert Banfill <r.banfill@reftek.com>
-novell-zen 2544/udp # Novell ZEN
-novell-zen 2544/tcp # Novell ZEN
-# Randy Cook <RACOOK@novell.com>
-sis-emt 2545/udp # sis-emt
-sis-emt 2545/tcp # sis-emt
-# Bill Crawford <Bill.Crawford@securicor.co.uk>
-vytalvaultbrtp 2546/udp # vytalvaultbrtp
+reftek 2543/udp # REFTEK
+reftek 2543/tcp # REFTEK
+# Robert Banfill <r.banfill@reftek.com>
+novell-zen 2544/udp # Novell ZEN
+novell-zen 2544/tcp # Novell ZEN
+# Randy Cook <RACOOK@novell.com>
+sis-emt 2545/udp # sis-emt
+sis-emt 2545/tcp # sis-emt
+# Bill Crawford <Bill.Crawford@securicor.co.uk>
+vytalvaultbrtp 2546/udp # vytalvaultbrtp
vytalvaultbrtp 2546/tcp # vytalvaultbrtp
-vytalvaultvsmp 2547/udp # vytalvaultvsmp
-vytalvaultvsmp 2547/tcp # vytalvaultvsmp
-vytalvaultpipe 2548/udp # vytalvaultpipe
-vytalvaultpipe 2548/tcp # vytalvaultpipe
-# Tim Boldt <timb@vytalnet.com>
-ipass 2549/udp # IPASS
-ipass 2549/tcp # IPASS
-# Michael Fischer <otterley@Pass.COM>
-ads 2550/udp # ADS
-ads 2550/tcp # ADS
-# Michael O'Connor <moconnor@adobe.com>
-isg-uda-server 2551/udp # ISG UDA Server
-isg-uda-server 2551/tcp # ISG UDA Server
-# Dror Harari <Dror.Harari@isgsoft.com>
-call-logging 2552/udp # Call Logging
-call-logging 2552/tcp # Call Logging
-# Dean Webb <dean.webb@ascend.com>
-efidiningport 2553/udp # efidiningport
-efidiningport 2553/tcp # efidiningport
-# Lynn Carter <carterl@execpc.com>
-vcnet-link-v10 2554/udp # VCnet-Link v10
-vcnet-link-v10 2554/tcp # VCnet-Link v10
-# Csaba Mate <mc36@freemail.c3.hu>
-compaq-wcp 2555/udp # Compaq WCP
-compaq-wcp 2555/tcp # Compaq WCP
-# Ferruccio Barletta <ferruccio.barletta@compaq.com>
-nicetec-nmsvc 2556/udp # nicetec-nmsvc
-nicetec-nmsvc 2556/tcp # nicetec-nmsvc
-nicetec-mgmt 2557/udp # nicetec-mgmt
-nicetec-mgmt 2557/tcp # nicetec-mgmt
-# Joerg Paulus <tech@nicetec.de>
-pclemultimedia 2558/udp # PCLE Multi Media
-pclemultimedia 2558/tcp # PCLE Multi Media
-# Bernd Scharping <bscharping@pinnaclesys.com>
-lstp 2559/udp # LSTP
-lstp 2559/tcp # LSTP
-# Waiki Wright <waiki@us.ibm.com>
-labrat 2560/udp # labrat
-labrat 2560/tcp # labrat
-# John Harvey <johnbob@austin.ibm.com>
-mosaixcc 2561/udp # MosaixCC
-mosaixcc 2561/tcp # MosaixCC
-# Steven Frare <stevefr@mosaix.com>
-delibo 2562/udp # Delibo
-delibo 2562/tcp # Delibo
-# NovaWiz LTD <Moshe@Novawiz.com>
-cti-redwood 2563/udp # CTI Redwood
-cti-redwood 2563/tcp # CTI Redwood
-# Songwon Chi <swchi@daou.co.kr>
+vytalvaultvsmp 2547/udp # vytalvaultvsmp
+vytalvaultvsmp 2547/tcp # vytalvaultvsmp
+vytalvaultpipe 2548/udp # vytalvaultpipe
+vytalvaultpipe 2548/tcp # vytalvaultpipe
+# Tim Boldt <timb@vytalnet.com>
+ipass 2549/udp # IPASS
+ipass 2549/tcp # IPASS
+# Michael Fischer <otterley@Pass.COM>
+ads 2550/udp # ADS
+ads 2550/tcp # ADS
+# Michael O'Connor <moconnor@adobe.com>
+isg-uda-server 2551/udp # ISG UDA Server
+isg-uda-server 2551/tcp # ISG UDA Server
+# Dror Harari <Dror.Harari@isgsoft.com>
+call-logging 2552/udp # Call Logging
+call-logging 2552/tcp # Call Logging
+# Dean Webb <dean.webb@ascend.com>
+efidiningport 2553/udp # efidiningport
+efidiningport 2553/tcp # efidiningport
+# Lynn Carter <carterl@execpc.com>
+vcnet-link-v10 2554/udp # VCnet-Link v10
+vcnet-link-v10 2554/tcp # VCnet-Link v10
+# Csaba Mate <mc36@freemail.c3.hu>
+compaq-wcp 2555/udp # Compaq WCP
+compaq-wcp 2555/tcp # Compaq WCP
+# Ferruccio Barletta <ferruccio.barletta@compaq.com>
+nicetec-nmsvc 2556/udp # nicetec-nmsvc
+nicetec-nmsvc 2556/tcp # nicetec-nmsvc
+nicetec-mgmt 2557/udp # nicetec-mgmt
+nicetec-mgmt 2557/tcp # nicetec-mgmt
+# Joerg Paulus <tech@nicetec.de>
+pclemultimedia 2558/udp # PCLE Multi Media
+pclemultimedia 2558/tcp # PCLE Multi Media
+# Bernd Scharping <bscharping@pinnaclesys.com>
+lstp 2559/udp # LSTP
+lstp 2559/tcp # LSTP
+# Waiki Wright <waiki@us.ibm.com>
+labrat 2560/udp # labrat
+labrat 2560/tcp # labrat
+# John Harvey <johnbob@austin.ibm.com>
+mosaixcc 2561/udp # MosaixCC
+mosaixcc 2561/tcp # MosaixCC
+# Steven Frare <stevefr@mosaix.com>
+delibo 2562/udp # Delibo
+delibo 2562/tcp # Delibo
+# NovaWiz LTD <Moshe@Novawiz.com>
+cti-redwood 2563/udp # CTI Redwood
+cti-redwood 2563/tcp # CTI Redwood
+# Songwon Chi <swchi@daou.co.kr>
hp-3000-telnet 2564/tcp # HP 3000 NS/VT block mode telnet
#
-coord-svr 2565/udp # Coordinator Server
-coord-svr 2565/tcp # Coordinator Server
-# Richard Steiger <steiger@ensemblesoft.com>
-pcs-pcw 2566/udp # pcs-pcw
-pcs-pcw 2566/tcp # pcs-pcw
-# W. Jordan Fitzhugh <jfitz@pcare.com>
-clp 2567/udp # Cisco Line Protocol
-clp 2567/tcp # Cisco Line Protocol
-# Susan Hinrichs <shinrich@cisco.com>
-spamtrap 2568/udp # SPAM TRAP
-spamtrap 2568/tcp # SPAM TRAP
-# Chuck Bennett <chuck@benatong.com>
-sonuscallsig 2569/udp # Sonus Call Signal
-sonuscallsig 2569/tcp # Sonus Call Signal
-# Mark Garti <mgarti@sonusnet.com>
-hs-port 2570/udp # HS Port
-hs-port 2570/tcp # HS Port
-# Uri Doron <uri@il.netect.com>
-cecsvc 2571/udp # CECSVC
-cecsvc 2571/tcp # CECSVC
-# Roger Pao <rpao@corder-eng.com>
-ibp 2572/udp # IBP
-ibp 2572/tcp # IBP
-# Jonathan Downes <jonno@activ.net.au>
+coord-svr 2565/udp # Coordinator Server
+coord-svr 2565/tcp # Coordinator Server
+# Richard Steiger <steiger@ensemblesoft.com>
+pcs-pcw 2566/udp # pcs-pcw
+pcs-pcw 2566/tcp # pcs-pcw
+# W. Jordan Fitzhugh <jfitz@pcare.com>
+clp 2567/udp # Cisco Line Protocol
+clp 2567/tcp # Cisco Line Protocol
+# Susan Hinrichs <shinrich@cisco.com>
+spamtrap 2568/udp # SPAM TRAP
+spamtrap 2568/tcp # SPAM TRAP
+# Chuck Bennett <chuck@benatong.com>
+sonuscallsig 2569/udp # Sonus Call Signal
+sonuscallsig 2569/tcp # Sonus Call Signal
+# Mark Garti <mgarti@sonusnet.com>
+hs-port 2570/udp # HS Port
+hs-port 2570/tcp # HS Port
+# Uri Doron <uri@il.netect.com>
+cecsvc 2571/udp # CECSVC
+cecsvc 2571/tcp # CECSVC
+# Roger Pao <rpao@corder-eng.com>
+ibp 2572/udp # IBP
+ibp 2572/tcp # IBP
+# Jonathan Downes <jonno@activ.net.au>
trustestablish 2573/udp # Trust Establish
trustestablish 2573/tcp # Trust Establish
# Yosi Mass <yosimass@haifa.vnet.ibm.com>
@@ -5920,425 +5920,425 @@ tclprodebugger 2576/tcp # TCL Pro Debugger
scipticslsrvr 2577/udp # Scriptics Lsrvr
scipticslsrvr 2577/tcp # Scriptics Lsrvr
# Brent Welch <welch@scriptics.com>
-rvs-isdn-dcp 2578/udp # RVS ISDN DCP
-rvs-isdn-dcp 2578/tcp # RVS ISDN DCP
-# Michael Zirpel <mbz@rvscom.com>
-mpfoncl 2579/udp # mpfoncl
-mpfoncl 2579/tcp # mpfoncl
-# Itaru Kimura <kimura@kel.fujitsu.co.jp>
-tributary 2580/udp # Tributary
-tributary 2580/tcp # Tributary
-# Louis Lu <LouisL@bristol.com>
-argis-te 2581/udp # ARGIS TE
-argis-te 2581/tcp # ARGIS TE
-argis-ds 2582/udp # ARGIS DS
-argis-ds 2582/tcp # ARGIS DS
-# John Legh-Page <john.legh-page@argis.com>
-mon 2583/udp # MON
-mon 2583/tcp # MON
-# Jim Trocki <trockij@transmeta.com>
-cyaserv 2584/udp # cyaserv
-cyaserv 2584/tcp # cyaserv
-# Morgan Jones <mwj@cyasolutions.com>
-netx-server 2585/udp # NETX Server
-netx-server 2585/tcp # NETX Server
-netx-agent 2586/udp # NETX Agent
-netx-agent 2586/tcp # NETX Agent
-# Brett Dolecheck <Dolecheck@IPMetrics.com>
-masc 2587/udp # MASC
-masc 2587/tcp # MASC
-# Pavlin Ivanov Radoslavov
-# <pavlin@catarina.usc.edu>
-privilege 2588/udp # Privilege
-privilege 2588/tcp # Privilege
-# Gil Hecht <GilH@aks.com>
-quartus-tcl 2589/udp # quartus tcl
-quartus-tcl 2589/tcp # quartus tcl
-# Subroto Datta <subrotod@altera.com>
-idotdist 2590/udp # idotdist
-idotdist 2590/tcp # idotdist
-# Jason Hunter <jthunter@invino.com>
-maytagshuffle 2591/udp # Maytag Shuffle
-maytagshuffle 2591/tcp # Maytag Shuffle
-# Maytag Corporation <hbuck@maytag.com>
+rvs-isdn-dcp 2578/udp # RVS ISDN DCP
+rvs-isdn-dcp 2578/tcp # RVS ISDN DCP
+# Michael Zirpel <mbz@rvscom.com>
+mpfoncl 2579/udp # mpfoncl
+mpfoncl 2579/tcp # mpfoncl
+# Itaru Kimura <kimura@kel.fujitsu.co.jp>
+tributary 2580/udp # Tributary
+tributary 2580/tcp # Tributary
+# Louis Lu <LouisL@bristol.com>
+argis-te 2581/udp # ARGIS TE
+argis-te 2581/tcp # ARGIS TE
+argis-ds 2582/udp # ARGIS DS
+argis-ds 2582/tcp # ARGIS DS
+# John Legh-Page <john.legh-page@argis.com>
+mon 2583/udp # MON
+mon 2583/tcp # MON
+# Jim Trocki <trockij@transmeta.com>
+cyaserv 2584/udp # cyaserv
+cyaserv 2584/tcp # cyaserv
+# Morgan Jones <mwj@cyasolutions.com>
+netx-server 2585/udp # NETX Server
+netx-server 2585/tcp # NETX Server
+netx-agent 2586/udp # NETX Agent
+netx-agent 2586/tcp # NETX Agent
+# Brett Dolecheck <Dolecheck@IPMetrics.com>
+masc 2587/udp # MASC
+masc 2587/tcp # MASC
+# Pavlin Ivanov Radoslavov
+# <pavlin@catarina.usc.edu>
+privilege 2588/udp # Privilege
+privilege 2588/tcp # Privilege
+# Gil Hecht <GilH@aks.com>
+quartus-tcl 2589/udp # quartus tcl
+quartus-tcl 2589/tcp # quartus tcl
+# Subroto Datta <subrotod@altera.com>
+idotdist 2590/udp # idotdist
+idotdist 2590/tcp # idotdist
+# Jason Hunter <jthunter@invino.com>
+maytagshuffle 2591/udp # Maytag Shuffle
+maytagshuffle 2591/tcp # Maytag Shuffle
+# Maytag Corporation <hbuck@maytag.com>
netrek 2592/udp # netrek
netrek 2592/tcp # netrek
# Al Guetzlaff <aeg@teamquest.com>
-mns-mail 2593/udp # MNS Mail Notice Service
-mns-mail 2593/tcp # MNS Mail Notice Service
-# Rumiko Kikuta <kiku@nd.net.fujitsu.co.jp>
-dts 2594/udp # Data Base Server
-dts 2594/tcp # Data Base Server
-# Andreas Roene <support@home-online.de>
-worldfusion1 2595/udp # World Fusion 1
-worldfusion1 2595/tcp # World Fusion 1
-worldfusion2 2596/udp # World Fusion 2
-worldfusion2 2596/tcp # World Fusion 2
-# World Fusion <net@worldfusion.com>
-homesteadglory 2597/udp # Homestead Glory
-homesteadglory 2597/tcp # Homestead Glory
-# John Tokash <jtokash@homestead.com>
-citriximaclient 2598/udp # Citrix MA Client
-citriximaclient 2598/tcp # Citrix MA Client
-# Myk Willis <myk.willis@citrix.com>
+mns-mail 2593/udp # MNS Mail Notice Service
+mns-mail 2593/tcp # MNS Mail Notice Service
+# Rumiko Kikuta <kiku@nd.net.fujitsu.co.jp>
+dts 2594/udp # Data Base Server
+dts 2594/tcp # Data Base Server
+# Andreas Roene <support@home-online.de>
+worldfusion1 2595/udp # World Fusion 1
+worldfusion1 2595/tcp # World Fusion 1
+worldfusion2 2596/udp # World Fusion 2
+worldfusion2 2596/tcp # World Fusion 2
+# World Fusion <net@worldfusion.com>
+homesteadglory 2597/udp # Homestead Glory
+homesteadglory 2597/tcp # Homestead Glory
+# John Tokash <jtokash@homestead.com>
+citriximaclient 2598/udp # Citrix MA Client
+citriximaclient 2598/tcp # Citrix MA Client
+# Myk Willis <myk.willis@citrix.com>
snapd 2599/udp # Snap Discovery
snapd 2599/tcp # Snap Discovery
# Kevin Osborn <kosborn@snapappliance.com>
-hpstgmgr 2600/udp # HPSTGMGR
-hpstgmgr 2600/tcp # HPSTGMGR
-# Kevin Collins <kevinc@.cnd.hp.com>
-discp-client 2601/udp # discp client
-discp-client 2601/tcp # discp client
-discp-server 2602/udp # discp server
-discp-server 2602/tcp # discp server
-# Peter White <peter_white@3com.com>
-servicemeter 2603/udp # Service Meter
-servicemeter 2603/tcp # Service Meter
-# Duncan Hare <Duncan.Hare@synoia.com>
-nsc-ccs 2604/udp # NSC CCS
-nsc-ccs 2604/tcp # NSC CCS
-nsc-posa 2605/udp # NSC POSA
-nsc-posa 2605/tcp # NSC POSA
-# Tom Findley <tom.findley@networksciences.net>
-netmon 2606/udp # Dell Netmon
-netmon 2606/tcp # Dell Netmon
-connection 2607/udp # Dell Connection
-connection 2607/tcp # Dell Connection
-# Sudhir Shetty <Sudhir_Shetty@Dell.com>
-wag-service 2608/udp # Wag Service
-wag-service 2608/tcp # Wag Service
-# Gilles Bourquard <gbo@wag.ch>
-system-monitor 2609/udp # System Monitor
-system-monitor 2609/tcp # System Monitor
-# Greg Robson-Garth <gregr@alphalink.com.au>
-versa-tek 2610/udp # VersaTek
-versa-tek 2610/tcp # VersaTek
-# James Kou <Jamesk@versatek.com>
-lionhead 2611/udp # LIONHEAD
-lionhead 2611/tcp # LIONHEAD
-# Tim Rance <trance@lionhead.co.uk>
-qpasa-agent 2612/udp # Qpasa Agent
-qpasa-agent 2612/tcp # Qpasa Agent
-# Craig Ching <cching@mqsoftware.com>
-smntubootstrap 2613/udp # SMNTUBootstrap
-smntubootstrap 2613/tcp # SMNTUBootstrap
-# Matt Cecile <mattc@metrics.com>
-neveroffline 2614/udp # Never Offline
-neveroffline 2614/tcp # Never Offline
-# Dustin Brand <amo@amo.net>
+hpstgmgr 2600/udp # HPSTGMGR
+hpstgmgr 2600/tcp # HPSTGMGR
+# Kevin Collins <kevinc@.cnd.hp.com>
+discp-client 2601/udp # discp client
+discp-client 2601/tcp # discp client
+discp-server 2602/udp # discp server
+discp-server 2602/tcp # discp server
+# Peter White <peter_white@3com.com>
+servicemeter 2603/udp # Service Meter
+servicemeter 2603/tcp # Service Meter
+# Duncan Hare <Duncan.Hare@synoia.com>
+nsc-ccs 2604/udp # NSC CCS
+nsc-ccs 2604/tcp # NSC CCS
+nsc-posa 2605/udp # NSC POSA
+nsc-posa 2605/tcp # NSC POSA
+# Tom Findley <tom.findley@networksciences.net>
+netmon 2606/udp # Dell Netmon
+netmon 2606/tcp # Dell Netmon
+connection 2607/udp # Dell Connection
+connection 2607/tcp # Dell Connection
+# Sudhir Shetty <Sudhir_Shetty@Dell.com>
+wag-service 2608/udp # Wag Service
+wag-service 2608/tcp # Wag Service
+# Gilles Bourquard <gbo@wag.ch>
+system-monitor 2609/udp # System Monitor
+system-monitor 2609/tcp # System Monitor
+# Greg Robson-Garth <gregr@alphalink.com.au>
+versa-tek 2610/udp # VersaTek
+versa-tek 2610/tcp # VersaTek
+# James Kou <Jamesk@versatek.com>
+lionhead 2611/udp # LIONHEAD
+lionhead 2611/tcp # LIONHEAD
+# Tim Rance <trance@lionhead.co.uk>
+qpasa-agent 2612/udp # Qpasa Agent
+qpasa-agent 2612/tcp # Qpasa Agent
+# Craig Ching <cching@mqsoftware.com>
+smntubootstrap 2613/udp # SMNTUBootstrap
+smntubootstrap 2613/tcp # SMNTUBootstrap
+# Matt Cecile <mattc@metrics.com>
+neveroffline 2614/udp # Never Offline
+neveroffline 2614/tcp # Never Offline
+# Dustin Brand <amo@amo.net>
firepower 2615/udp # firepower
firepower 2615/tcp # firepower
# Jason Volk <jason@teknidude.com>
-appswitch-emp 2616/udp # appswitch-emp
-appswitch-emp 2616/tcp # appswitch-emp
-# Ted Ross <ross@TopLayer.com>
-cmadmin 2617/udp # Clinical Context Managers
-cmadmin 2617/tcp # Clinical Context Managers
-# Mark Morwood <markm@sentillion.com>
-priority-e-com 2618/udp # Priority E-Com
-priority-e-com 2618/tcp # Priority E-Com
-# Marcelo Einhorn <marcelo@eshbel.com>
-bruce 2619/udp # bruce
-bruce 2619/tcp # bruce
-# Alec Muffett <alecm@sun.com>
-lpsrecommender 2620/udp # LPSRecommender
-lpsrecommender 2620/tcp # LPSRecommender
-# Pritham Shetty <pritham@andromedia.com>
-miles-apart 2621/udp # Miles Apart Jukebox Server
-miles-apart 2621/tcp # Miles Apart Jukebox Server
-# Michael Rathmann <rathmann_ia@milesinfo.com>
-metricadbc 2622/udp # MetricaDBC
-metricadbc 2622/tcp # MetricaDBC
-# Russ Olivant <russ.olivant@metrica.co.uk>
-lmdp 2623/udp # LMDP
-lmdp 2623/tcp # LMDP
-# Ken Bailey <kbailey@rockettalk.com>
-aria 2624/udp # Aria
-aria 2624/tcp # Aria
-# Logan Bruns <logan@andromedia.com>
-blwnkl-port 2625/udp # Blwnkl Port
-blwnkl-port 2625/tcp # Blwnkl Port
-# Weng Chin (Winson) Yung <Winson_Yung@3com.com>
-gbjd816 2626/udp # gbjd816
-gbjd816 2626/tcp # gbjd816
-# George Balesta <George.Baletsa@tfn.com>
-moshebeeri 2627/udp # Moshe Beeri
-moshebeeri 2627/tcp # Moshe Beeri
-# Moshe Beeri <moshe@whale-com.com>
-dict 2628/udp # DICT
-dict 2628/tcp # DICT
-# Rik Faith <faith@cs.unc.edu>
-sitaraserver 2629/udp # Sitara Server
-sitaraserver 2629/tcp # Sitara Server
-sitaramgmt 2630/udp # Sitara Management
-sitaramgmt 2630/tcp # Sitara Management
-sitaradir 2631/udp # Sitara Dir
-sitaradir 2631/tcp # Sitara Dir
-# Manickam R.Sridhar <msridhar@sitaranetworks.com>
-irdg-post 2632/udp # IRdg Post
-irdg-post 2632/tcp # IRdg Post
-# IRdg, Inc. <jtaylor@irdg.com>
-interintelli 2633/udp # InterIntelli
-interintelli 2633/tcp # InterIntelli
-# Mike Gagle <MikeG@inter-intelli.com>
+appswitch-emp 2616/udp # appswitch-emp
+appswitch-emp 2616/tcp # appswitch-emp
+# Ted Ross <ross@TopLayer.com>
+cmadmin 2617/udp # Clinical Context Managers
+cmadmin 2617/tcp # Clinical Context Managers
+# Mark Morwood <markm@sentillion.com>
+priority-e-com 2618/udp # Priority E-Com
+priority-e-com 2618/tcp # Priority E-Com
+# Marcelo Einhorn <marcelo@eshbel.com>
+bruce 2619/udp # bruce
+bruce 2619/tcp # bruce
+# Alec Muffett <alecm@sun.com>
+lpsrecommender 2620/udp # LPSRecommender
+lpsrecommender 2620/tcp # LPSRecommender
+# Pritham Shetty <pritham@andromedia.com>
+miles-apart 2621/udp # Miles Apart Jukebox Server
+miles-apart 2621/tcp # Miles Apart Jukebox Server
+# Michael Rathmann <rathmann_ia@milesinfo.com>
+metricadbc 2622/udp # MetricaDBC
+metricadbc 2622/tcp # MetricaDBC
+# Russ Olivant <russ.olivant@metrica.co.uk>
+lmdp 2623/udp # LMDP
+lmdp 2623/tcp # LMDP
+# Ken Bailey <kbailey@rockettalk.com>
+aria 2624/udp # Aria
+aria 2624/tcp # Aria
+# Logan Bruns <logan@andromedia.com>
+blwnkl-port 2625/udp # Blwnkl Port
+blwnkl-port 2625/tcp # Blwnkl Port
+# Weng Chin (Winson) Yung <Winson_Yung@3com.com>
+gbjd816 2626/udp # gbjd816
+gbjd816 2626/tcp # gbjd816
+# George Balesta <George.Baletsa@tfn.com>
+moshebeeri 2627/udp # Moshe Beeri
+moshebeeri 2627/tcp # Moshe Beeri
+# Moshe Beeri <moshe@whale-com.com>
+dict 2628/udp # DICT
+dict 2628/tcp # DICT
+# Rik Faith <faith@cs.unc.edu>
+sitaraserver 2629/udp # Sitara Server
+sitaraserver 2629/tcp # Sitara Server
+sitaramgmt 2630/udp # Sitara Management
+sitaramgmt 2630/tcp # Sitara Management
+sitaradir 2631/udp # Sitara Dir
+sitaradir 2631/tcp # Sitara Dir
+# Manickam R.Sridhar <msridhar@sitaranetworks.com>
+irdg-post 2632/udp # IRdg Post
+irdg-post 2632/tcp # IRdg Post
+# IRdg, Inc. <jtaylor@irdg.com>
+interintelli 2633/udp # InterIntelli
+interintelli 2633/tcp # InterIntelli
+# Mike Gagle <MikeG@inter-intelli.com>
pk-electronics 2634/udp # PK Electronics
pk-electronics 2634/tcp # PK Electronics
-# Seb Ibis <seb_ibis@pkworld.com>
-backburner 2635/udp # Back Burner
-backburner 2635/tcp # Back Burner
-# Kevin Teiskoetter <kevint@metacreations.com>
-solve 2636/udp # Solve
-solve 2636/tcp # Solve
-# Peter Morrison <peter_morrison@sydney.sterling.com>
-imdocsvc 2637/udp # Import Document Service
-imdocsvc 2637/tcp # Import Document Service
-# Zia Bhatti <zia@netright.com>
-sybaseanywhere 2638/udp # Sybase Anywhere
+# Seb Ibis <seb_ibis@pkworld.com>
+backburner 2635/udp # Back Burner
+backburner 2635/tcp # Back Burner
+# Kevin Teiskoetter <kevint@metacreations.com>
+solve 2636/udp # Solve
+solve 2636/tcp # Solve
+# Peter Morrison <peter_morrison@sydney.sterling.com>
+imdocsvc 2637/udp # Import Document Service
+imdocsvc 2637/tcp # Import Document Service
+# Zia Bhatti <zia@netright.com>
+sybaseanywhere 2638/udp # Sybase Anywhere
sybaseanywhere 2638/tcp # Sybase Anywhere
-# Dave Neudoerffer <Dave.Neudoerffer@ianywhere.com>
-aminet 2639/udp # AMInet
-aminet 2639/tcp # AMInet
-# Alcorn McBride Inc. <jeff@alcorn.com>
-sai_sentlm 2640/udp # Sabbagh Associates Licence Manager
-sai_sentlm 2640/tcp # Sabbagh Associates Licence Manager
-# Elias Sabbagh <ehs@sabbagh.com>
-hdl-srv 2641/udp # HDL Server
-hdl-srv 2641/tcp # HDL Server
-# David Ely <dely@cnri.reston.va.us>
-tragic 2642/udp # Tragic
-tragic 2642/tcp # Tragic
-# Stu Mark <fordii@j51.com>
-gte-samp 2643/udp # GTE-SAMP
-gte-samp 2643/tcp # GTE-SAMP
-# Asher Altman <Asher.Altman@GSC.GTE.Com>
-travsoft-ipx-t 2644/udp # Travsoft IPX Tunnel
-travsoft-ipx-t 2644/tcp # Travsoft IPX Tunnel
-# Jack Wilson <JackW@travsoft.com>
-novell-ipx-cmd 2645/udp # Novell IPX CMD
-novell-ipx-cmd 2645/tcp # Novell IPX CMD
-# Juan Carlos Luciani <jluciani@novell.com>
-and-lm 2646/udp # AND License Manager
-and-lm 2646/tcp # AND License Manager
-# Dick van der Sijs <dick@and.nl>
-syncserver 2647/udp # SyncServer
-syncserver 2647/tcp # SyncServer
-# Dave Finnegan <dave@syncinc.com>
-upsnotifyprot 2648/udp # Upsnotifyprot
-upsnotifyprot 2648/tcp # Upsnotifyprot
-# Mario Leboute <leboute@pro.via-rs.com.br>
-vpsipport 2649/udp # VPSIPPORT
-vpsipport 2649/tcp # VPSIPPORT
-# Joon Radley <jradley@csir.co.za>
+# Dave Neudoerffer <Dave.Neudoerffer@ianywhere.com>
+aminet 2639/udp # AMInet
+aminet 2639/tcp # AMInet
+# Alcorn McBride Inc. <jeff@alcorn.com>
+sai_sentlm 2640/udp # Sabbagh Associates Licence Manager
+sai_sentlm 2640/tcp # Sabbagh Associates Licence Manager
+# Elias Sabbagh <ehs@sabbagh.com>
+hdl-srv 2641/udp # HDL Server
+hdl-srv 2641/tcp # HDL Server
+# David Ely <dely@cnri.reston.va.us>
+tragic 2642/udp # Tragic
+tragic 2642/tcp # Tragic
+# Stu Mark <fordii@j51.com>
+gte-samp 2643/udp # GTE-SAMP
+gte-samp 2643/tcp # GTE-SAMP
+# Asher Altman <Asher.Altman@GSC.GTE.Com>
+travsoft-ipx-t 2644/udp # Travsoft IPX Tunnel
+travsoft-ipx-t 2644/tcp # Travsoft IPX Tunnel
+# Jack Wilson <JackW@travsoft.com>
+novell-ipx-cmd 2645/udp # Novell IPX CMD
+novell-ipx-cmd 2645/tcp # Novell IPX CMD
+# Juan Carlos Luciani <jluciani@novell.com>
+and-lm 2646/udp # AND License Manager
+and-lm 2646/tcp # AND License Manager
+# Dick van der Sijs <dick@and.nl>
+syncserver 2647/udp # SyncServer
+syncserver 2647/tcp # SyncServer
+# Dave Finnegan <dave@syncinc.com>
+upsnotifyprot 2648/udp # Upsnotifyprot
+upsnotifyprot 2648/tcp # Upsnotifyprot
+# Mario Leboute <leboute@pro.via-rs.com.br>
+vpsipport 2649/udp # VPSIPPORT
+vpsipport 2649/tcp # VPSIPPORT
+# Joon Radley <jradley@csir.co.za>
eristwoguns 2650/udp # eristwoguns
eristwoguns 2650/tcp # eristwoguns
# NetPro Computing Inc. <ports@netpro.com>
-ebinsite 2651/udp # EBInSite
-ebinsite 2651/tcp # EBInSite
-# Lefteris Kalamaras <lefteris@ebi.com>
-interpathpanel 2652/udp # InterPathPanel
-interpathpanel 2652/tcp # InterPathPanel
-# Stephen Misel <steve.misel@interpath.net>
-sonus 2653/udp # Sonus
-sonus 2653/tcp # Sonus
-# Mark Garti <mgarti@sonusnet.com>
+ebinsite 2651/udp # EBInSite
+ebinsite 2651/tcp # EBInSite
+# Lefteris Kalamaras <lefteris@ebi.com>
+interpathpanel 2652/udp # InterPathPanel
+interpathpanel 2652/tcp # InterPathPanel
+# Stephen Misel <steve.misel@interpath.net>
+sonus 2653/udp # Sonus
+sonus 2653/tcp # Sonus
+# Mark Garti <mgarti@sonusnet.com>
corel_vncadmin 2654/udp # Corel VNC Admin
-corel_vncadmin 2654/tcp # Corel VNC Admin
-# Oleg Noskov <olegn@corelcomputer.com>
-unglue 2655/udp # UNIX Nt Glue
-unglue 2655/tcp # UNIX Nt Glue
-# Peter Santoro <peter@pscomp.com>
-kana 2656/udp # Kana
-kana 2656/tcp # Kana
-# Colin Goldstein <Colin@kana.com>
-sns-dispatcher 2657/udp # SNS Dispatcher
-sns-dispatcher 2657/tcp # SNS Dispatcher
-sns-admin 2658/udp # SNS Admin
-sns-admin 2658/tcp # SNS Admin
-sns-query 2659/udp # SNS Query
-sns-query 2659/tcp # SNS Query
-# Mary Holstege <holstege@firstfloor.com>
-gcmonitor 2660/udp # GC Monitor
-gcmonitor 2660/tcp # GC Monitor
-# Gustavo Rodriguez-Rivera <grr@geodesic.com>
-olhost 2661/udp # OLHOST
-olhost 2661/tcp # OLHOST
-# Robert Ripberger <rip@lan-aces.com>
-bintec-capi 2662/udp # BinTec-CAPI
-bintec-capi 2662/tcp # BinTec-CAPI
-bintec-tapi 2663/udp # BinTec-TAPI
-bintec-tapi 2663/tcp # BinTec-TAPI
+corel_vncadmin 2654/tcp # Corel VNC Admin
+# Oleg Noskov <olegn@corelcomputer.com>
+unglue 2655/udp # UNIX Nt Glue
+unglue 2655/tcp # UNIX Nt Glue
+# Peter Santoro <peter@pscomp.com>
+kana 2656/udp # Kana
+kana 2656/tcp # Kana
+# Colin Goldstein <Colin@kana.com>
+sns-dispatcher 2657/udp # SNS Dispatcher
+sns-dispatcher 2657/tcp # SNS Dispatcher
+sns-admin 2658/udp # SNS Admin
+sns-admin 2658/tcp # SNS Admin
+sns-query 2659/udp # SNS Query
+sns-query 2659/tcp # SNS Query
+# Mary Holstege <holstege@firstfloor.com>
+gcmonitor 2660/udp # GC Monitor
+gcmonitor 2660/tcp # GC Monitor
+# Gustavo Rodriguez-Rivera <grr@geodesic.com>
+olhost 2661/udp # OLHOST
+olhost 2661/tcp # OLHOST
+# Robert Ripberger <rip@lan-aces.com>
+bintec-capi 2662/udp # BinTec-CAPI
+bintec-capi 2662/tcp # BinTec-CAPI
+bintec-tapi 2663/udp # BinTec-TAPI
+bintec-tapi 2663/tcp # BinTec-TAPI
#
-patrol-mq-gm 2664/udp # Patrol for MQ GM
-patrol-mq-gm 2664/tcp # Patrol for MQ GM
-patrol-mq-nm 2665/udp # Patrol for MQ NM
-patrol-mq-nm 2665/tcp # Patrol for MQ NM
-# Richard Nikula <richard_nikula@bmc.com>
-extensis 2666/udp # extensis
-extensis 2666/tcp # extensis
-# Milton Sagen <msagen@extensis.com>
-alarm-clock-s 2667/udp # Alarm Clock Server
-alarm-clock-s 2667/tcp # Alarm Clock Server
-alarm-clock-c 2668/udp # Alarm Clock Client
-alarm-clock-c 2668/tcp # Alarm Clock Client
-toad 2669/udp # TOAD
-toad 2669/tcp # TOAD
-# Michael Marking <marking@tatanka.com>
-tve-announce 2670/udp # TVE Announce
-tve-announce 2670/tcp # TVE Announce
-# Dean Blackketter <dean@corp.webtv.net>
-newlixreg 2671/udp # newlixreg
-newlixreg 2671/tcp # newlixreg
-# Jean-Serge Gagnon <jsg@newlix.com>
-nhserver 2672/udp # nhserver
-nhserver 2672/tcp # nhserver
-# Adrian Hornby <Adrian.Hornby@aran.co.uk>
-firstcall42 2673/udp # First Call 42
-firstcall42 2673/tcp # First Call 42
-# Luke Bowen <leb@tfn.com>
-ewnn 2674/udp # ewnn
-ewnn 2674/tcp # ewnn
-# Yasunari Yamashita <yamasita@omronsoft.co.jp>
-ttc-etap 2675/udp # TTC ETAP
-ttc-etap 2675/tcp # TTC ETAP
-# Daniel Becker <becker2d@ttc.com>
-simslink 2676/udp # SIMSLink
-simslink 2676/tcp # SIMSLink
-# Steve Ryckman <sryckman@simsware.com>
-gadgetgate1way 2677/udp # Gadget Gate 1 Way
-gadgetgate1way 2677/tcp # Gadget Gate 1 Way
-gadgetgate2way 2678/udp # Gadget Gate 2 Way
-gadgetgate2way 2678/tcp # Gadget Gate 2 Way
-# Matt Rollins <matt@internetgadgets.com>
-syncserverssl 2679/udp # Sync Server SSL
-syncserverssl 2679/tcp # Sync Server SSL
-# Dave Finnegan <dave@syncinc.com>
-pxc-sapxom 2680/udp # pxc-sapxom
-pxc-sapxom 2680/tcp # pxc-sapxom
-# Hideki Kiriyama <kiriyama@cp10.es.xerox.com>
-mpnjsomb 2681/udp # mpnjsomb
-mpnjsomb 2681/tcp # mpnjsomb
-# Takenori Miyahara <miyahara@pfu.co.jp>
+patrol-mq-gm 2664/udp # Patrol for MQ GM
+patrol-mq-gm 2664/tcp # Patrol for MQ GM
+patrol-mq-nm 2665/udp # Patrol for MQ NM
+patrol-mq-nm 2665/tcp # Patrol for MQ NM
+# Richard Nikula <richard_nikula@bmc.com>
+extensis 2666/udp # extensis
+extensis 2666/tcp # extensis
+# Milton Sagen <msagen@extensis.com>
+alarm-clock-s 2667/udp # Alarm Clock Server
+alarm-clock-s 2667/tcp # Alarm Clock Server
+alarm-clock-c 2668/udp # Alarm Clock Client
+alarm-clock-c 2668/tcp # Alarm Clock Client
+toad 2669/udp # TOAD
+toad 2669/tcp # TOAD
+# Michael Marking <marking@tatanka.com>
+tve-announce 2670/udp # TVE Announce
+tve-announce 2670/tcp # TVE Announce
+# Dean Blackketter <dean@corp.webtv.net>
+newlixreg 2671/udp # newlixreg
+newlixreg 2671/tcp # newlixreg
+# Jean-Serge Gagnon <jsg@newlix.com>
+nhserver 2672/udp # nhserver
+nhserver 2672/tcp # nhserver
+# Adrian Hornby <Adrian.Hornby@aran.co.uk>
+firstcall42 2673/udp # First Call 42
+firstcall42 2673/tcp # First Call 42
+# Luke Bowen <leb@tfn.com>
+ewnn 2674/udp # ewnn
+ewnn 2674/tcp # ewnn
+# Yasunari Yamashita <yamasita@omronsoft.co.jp>
+ttc-etap 2675/udp # TTC ETAP
+ttc-etap 2675/tcp # TTC ETAP
+# Daniel Becker <becker2d@ttc.com>
+simslink 2676/udp # SIMSLink
+simslink 2676/tcp # SIMSLink
+# Steve Ryckman <sryckman@simsware.com>
+gadgetgate1way 2677/udp # Gadget Gate 1 Way
+gadgetgate1way 2677/tcp # Gadget Gate 1 Way
+gadgetgate2way 2678/udp # Gadget Gate 2 Way
+gadgetgate2way 2678/tcp # Gadget Gate 2 Way
+# Matt Rollins <matt@internetgadgets.com>
+syncserverssl 2679/udp # Sync Server SSL
+syncserverssl 2679/tcp # Sync Server SSL
+# Dave Finnegan <dave@syncinc.com>
+pxc-sapxom 2680/udp # pxc-sapxom
+pxc-sapxom 2680/tcp # pxc-sapxom
+# Hideki Kiriyama <kiriyama@cp10.es.xerox.com>
+mpnjsomb 2681/udp # mpnjsomb
+mpnjsomb 2681/tcp # mpnjsomb
+# Takenori Miyahara <miyahara@pfu.co.jp>
# 2682 Removed (2002-04-30)
-ncdloadbalance 2683/udp # NCDLoadBalance
-ncdloadbalance 2683/tcp # NCDLoadBalance
-# Tim Stevenson <tes@ncd.com>
-mpnjsosv 2684/udp # mpnjsosv
-mpnjsosv 2684/tcp # mpnjsosv
-mpnjsocl 2685/udp # mpnjsocl
-mpnjsocl 2685/tcp # mpnjsocl
-mpnjsomg 2686/udp # mpnjsomg
-mpnjsomg 2686/tcp # mpnjsomg
-# Takenori Miyahara <miyahara@pfu.co.jp>
-pq-lic-mgmt 2687/udp # pq-lic-mgmt
-pq-lic-mgmt 2687/tcp # pq-lic-mgmt
-# Bob Sledge <bob@pqsystems.com>
-md-cg-http 2688/udp # md-cf-http
-md-cg-http 2688/tcp # md-cf-http
-# Lyndon Nerenberg <lyndon@execmail.ca>
-fastlynx 2689/udp # FastLynx
-fastlynx 2689/tcp # FastLynx
-# Dave Sewell <dave@sewelld.com>
-hp-nnm-data 2690/udp # HP NNM Embedded Database
-hp-nnm-data 2690/tcp # HP NNM Embedded Database
-# Chris Das <cdas@cnd.hp.com>
-itinternet 2691/udp # ITInternet ISM Server
-itinternet 2691/tcp # ITInternet ISM Server
-# Ron Ehli <ron@itinternet.net>
-admins-lms 2692/udp # Admins LMS
-admins-lms 2692/tcp # Admins LMS
-# Dagfinn Saether <Dagfinn@admins.com>
-belarc-http 2693/udp # belarc-http
-belarc-http 2693/tcp # belarc-http
-# Gary Newman <gnewman@belarc.com>
-pwrsevent 2694/udp # pwrsevent
-pwrsevent 2694/tcp # pwrsevent
-# Yoshinobu Nakamura
-# <nakamura@np.lps.cs.fujitsu.co.jp>
-vspread 2695/udp # VSPREAD
-vspread 2695/tcp # VSPREAD
-# Sumitake kobayashi
-# <kobayashi@np.lps.cs.fujitsu.co.jp>
+ncdloadbalance 2683/udp # NCDLoadBalance
+ncdloadbalance 2683/tcp # NCDLoadBalance
+# Tim Stevenson <tes@ncd.com>
+mpnjsosv 2684/udp # mpnjsosv
+mpnjsosv 2684/tcp # mpnjsosv
+mpnjsocl 2685/udp # mpnjsocl
+mpnjsocl 2685/tcp # mpnjsocl
+mpnjsomg 2686/udp # mpnjsomg
+mpnjsomg 2686/tcp # mpnjsomg
+# Takenori Miyahara <miyahara@pfu.co.jp>
+pq-lic-mgmt 2687/udp # pq-lic-mgmt
+pq-lic-mgmt 2687/tcp # pq-lic-mgmt
+# Bob Sledge <bob@pqsystems.com>
+md-cg-http 2688/udp # md-cf-http
+md-cg-http 2688/tcp # md-cf-http
+# Lyndon Nerenberg <lyndon@execmail.ca>
+fastlynx 2689/udp # FastLynx
+fastlynx 2689/tcp # FastLynx
+# Dave Sewell <dave@sewelld.com>
+hp-nnm-data 2690/udp # HP NNM Embedded Database
+hp-nnm-data 2690/tcp # HP NNM Embedded Database
+# Chris Das <cdas@cnd.hp.com>
+itinternet 2691/udp # ITInternet ISM Server
+itinternet 2691/tcp # ITInternet ISM Server
+# Ron Ehli <ron@itinternet.net>
+admins-lms 2692/udp # Admins LMS
+admins-lms 2692/tcp # Admins LMS
+# Dagfinn Saether <Dagfinn@admins.com>
+belarc-http 2693/udp # belarc-http
+belarc-http 2693/tcp # belarc-http
+# Gary Newman <gnewman@belarc.com>
+pwrsevent 2694/udp # pwrsevent
+pwrsevent 2694/tcp # pwrsevent
+# Yoshinobu Nakamura
+# <nakamura@np.lps.cs.fujitsu.co.jp>
+vspread 2695/udp # VSPREAD
+vspread 2695/tcp # VSPREAD
+# Sumitake kobayashi
+# <kobayashi@np.lps.cs.fujitsu.co.jp>
unifyadmin 2696/udp # Unify Admin
unifyadmin 2696/tcp # Unify Admin
# Duane Gibson <ianaportmaster@unify.com>
oce-snmp-trap 2697/udp # Oce SNMP Trap Port
oce-snmp-trap 2697/tcp # Oce SNMP Trap Port
# Peter Teeuwen <ptee@oce.nl>
-mck-ivpip 2698/udp # MCK-IVPIP
-mck-ivpip 2698/tcp # MCK-IVPIP
-# Robert Vincent <bert@mck.com>
-csoft-plusclnt 2699/udp # Csoft Plus Client
-csoft-plusclnt 2699/tcp # Csoft Plus Client
-# Nedelcho Stanev <nstanev@csoft.bg>
+mck-ivpip 2698/udp # MCK-IVPIP
+mck-ivpip 2698/tcp # MCK-IVPIP
+# Robert Vincent <bert@mck.com>
+csoft-plusclnt 2699/udp # Csoft Plus Client
+csoft-plusclnt 2699/tcp # Csoft Plus Client
+# Nedelcho Stanev <nstanev@csoft.bg>
tqdata 2700/udp # tqdata
tqdata 2700/tcp # tqdata
# Al Guetzlaff <aeg@teamquest.com>
-sms-rcinfo 2701/udp # SMS RCINFO
-sms-rcinfo 2701/tcp # SMS RCINFO
-sms-xfer 2702/udp # SMS XFER
-sms-xfer 2702/tcp # SMS XFER
-sms-chat 2703/udp # SMS CHAT
-sms-chat 2703/tcp # SMS CHAT
-sms-remctrl 2704/udp # SMS REMCTRL
-sms-remctrl 2704/tcp # SMS REMCTRL
-# Tom Friend <tomfr@microsoft.com>
-sds-admin 2705/udp # SDS Admin
-sds-admin 2705/tcp # SDS Admin
-# Don Traub <don.traub@sun.com>
-ncdmirroring 2706/udp # NCD Mirroring
-ncdmirroring 2706/tcp # NCD Mirroring
-# Tim Stevenson <tes@ncd.com>
-emcsymapiport 2707/udp # EMCSYMAPIPORT
-emcsymapiport 2707/tcp # EMCSYMAPIPORT
-# Bruce Ferjulian <ferjulian_bruce@emc.com>
-banyan-net 2708/udp # Banyan-Net
-banyan-net 2708/tcp # Banyan-Net
-# R. Thirumurthy <rtm@banyannetworks.com>
-supermon 2709/udp # Supermon
-supermon 2709/tcp # Supermon
-# Ron Minnich <rminnich@acl.lanl.gov>
-sso-service 2710/udp # SSO Service
-sso-service 2710/tcp # SSO Service
-sso-control 2711/udp # SSO Control
-sso-control 2711/tcp # SSO Control
-# Martin Proulx <mproulx@okiok.com>
-aocp 2712/udp # Axapta Object Communication Protocol
-aocp 2712/tcp # Axapta Object Communication Protocol
-# Jakob Steen Hansen <jsh@dk.damgaard.com>
-raven1 2713/udp # Raven1
-raven1 2713/tcp # Raven1
-raven2 2714/udp # Raven2
-raven2 2714/tcp # Raven2
-# Daniel Sorlov <Daniel@sorlov.com>
-hpstgmgr2 2715/udp # HPSTGMGR2
-hpstgmgr2 2715/tcp # HPSTGMGR2
-# Kevin Collins <kevinc@cnd.hp.com>
-inova-ip-disco 2716/udp # Inova IP Disco
-inova-ip-disco 2716/tcp # Inova IP Disco
-# Chris Koeritz <ckoeritz@inovacorp.com>
-pn-requester 2717/udp # PN REQUESTER
-pn-requester 2717/tcp # PN REQUESTER
-pn-requester2 2718/udp # PN REQUESTER 2
-pn-requester2 2718/tcp # PN REQUESTER 2
-# Edmund Chang <Edmund_Chang@bmc.com>
-scan-change 2719/udp # Scan & Change
-scan-change 2719/tcp # Scan & Change
-# Alexander Raji <araji@lucent.com>
-wkars 2720/udp # wkars
-wkars 2720/tcp # wkars
-# Barry Shelton <bshelton@wirelessknowledge.com>
-smart-diagnose 2721/udp # Smart Diagnose
-smart-diagnose 2721/tcp # Smart Diagnose
-# Geoffry Meek <geoff@meek.com>
-proactivesrvr 2722/udp # Proactive Server
-proactivesrvr 2722/tcp # Proactive Server
-# Dalit Naor <dalit@il.ibm.com>
-watchdognt 2723/udp # WatchDog NT
-watchdognt 2723/tcp # WatchDog NT
-# Glen Sansoucie <glens@llmwin.com>
-qotps 2724/udp # qotps
-qotps 2724/tcp # qotps
-# Piotr Parlewicz <pparlewicz@queryobject.com>
+sms-rcinfo 2701/udp # SMS RCINFO
+sms-rcinfo 2701/tcp # SMS RCINFO
+sms-xfer 2702/udp # SMS XFER
+sms-xfer 2702/tcp # SMS XFER
+sms-chat 2703/udp # SMS CHAT
+sms-chat 2703/tcp # SMS CHAT
+sms-remctrl 2704/udp # SMS REMCTRL
+sms-remctrl 2704/tcp # SMS REMCTRL
+# Tom Friend <tomfr@microsoft.com>
+sds-admin 2705/udp # SDS Admin
+sds-admin 2705/tcp # SDS Admin
+# Don Traub <don.traub@sun.com>
+ncdmirroring 2706/udp # NCD Mirroring
+ncdmirroring 2706/tcp # NCD Mirroring
+# Tim Stevenson <tes@ncd.com>
+emcsymapiport 2707/udp # EMCSYMAPIPORT
+emcsymapiport 2707/tcp # EMCSYMAPIPORT
+# Bruce Ferjulian <ferjulian_bruce@emc.com>
+banyan-net 2708/udp # Banyan-Net
+banyan-net 2708/tcp # Banyan-Net
+# R. Thirumurthy <rtm@banyannetworks.com>
+supermon 2709/udp # Supermon
+supermon 2709/tcp # Supermon
+# Ron Minnich <rminnich@acl.lanl.gov>
+sso-service 2710/udp # SSO Service
+sso-service 2710/tcp # SSO Service
+sso-control 2711/udp # SSO Control
+sso-control 2711/tcp # SSO Control
+# Martin Proulx <mproulx@okiok.com>
+aocp 2712/udp # Axapta Object Communication Protocol
+aocp 2712/tcp # Axapta Object Communication Protocol
+# Jakob Steen Hansen <jsh@dk.damgaard.com>
+raven1 2713/udp # Raven1
+raven1 2713/tcp # Raven1
+raven2 2714/udp # Raven2
+raven2 2714/tcp # Raven2
+# Daniel Sorlov <Daniel@sorlov.com>
+hpstgmgr2 2715/udp # HPSTGMGR2
+hpstgmgr2 2715/tcp # HPSTGMGR2
+# Kevin Collins <kevinc@cnd.hp.com>
+inova-ip-disco 2716/udp # Inova IP Disco
+inova-ip-disco 2716/tcp # Inova IP Disco
+# Chris Koeritz <ckoeritz@inovacorp.com>
+pn-requester 2717/udp # PN REQUESTER
+pn-requester 2717/tcp # PN REQUESTER
+pn-requester2 2718/udp # PN REQUESTER 2
+pn-requester2 2718/tcp # PN REQUESTER 2
+# Edmund Chang <Edmund_Chang@bmc.com>
+scan-change 2719/udp # Scan & Change
+scan-change 2719/tcp # Scan & Change
+# Alexander Raji <araji@lucent.com>
+wkars 2720/udp # wkars
+wkars 2720/tcp # wkars
+# Barry Shelton <bshelton@wirelessknowledge.com>
+smart-diagnose 2721/udp # Smart Diagnose
+smart-diagnose 2721/tcp # Smart Diagnose
+# Geoffry Meek <geoff@meek.com>
+proactivesrvr 2722/udp # Proactive Server
+proactivesrvr 2722/tcp # Proactive Server
+# Dalit Naor <dalit@il.ibm.com>
+watchdognt 2723/udp # WatchDog NT
+watchdognt 2723/tcp # WatchDog NT
+# Glen Sansoucie <glens@llmwin.com>
+qotps 2724/udp # qotps
+qotps 2724/tcp # qotps
+# Piotr Parlewicz <pparlewicz@queryobject.com>
msolap-ptp2 2725/udp # MSOLAP PTP2
msolap-ptp2 2725/tcp # MSOLAP PTP2
# Cristian Petculescu <cristp@microsoft.com>
@@ -6348,165 +6348,165 @@ tams 2726/tcp # TAMS
mgcp-callagent 2727/udp # Media Gateway Control Protocol Call Agent
mgcp-callagent 2727/tcp # Media Gateway Control Protocol Call Agent
# Christian Huitema <huitema@research.telcordia.com>
-sqdr 2728/udp # SQDR
-sqdr 2728/tcp # SQDR
-# Matthew Orzen <standards@starquest.com>
-tcim-control 2729/udp # TCIM Control
-tcim-control 2729/tcp # TCIM Control
-# Dean Skelton <mdskel@ftw.rsc.raytheon.com>
-nec-raidplus 2730/udp # NEC RaidPlus
-nec-raidplus 2730/tcp # NEC RaidPlus
-# Yusuke Asai <yasai@nw1.file.fc.nec.co.jp>
-fyre-messanger 2731/udp # Fyre Messagner
-fyre-messanger 2731/tcp # Fyre Messanger
-# Robert Waters <bobtek@hotmail.com>
-g5m 2732/udp # G5M
-g5m 2732/tcp # G5M
-# Graham Klyne <GK@ACM.ORG>
-signet-ctf 2733/udp # Signet CTF
-signet-ctf 2733/tcp # Signet CTF
-# Greg Broiles <greg@sac.net>
-ccs-software 2734/udp # CCS Software
-ccs-software 2734/tcp # CCS Software
-# Bertus Jacobs <bertus@ccs-software.co.za>
+sqdr 2728/udp # SQDR
+sqdr 2728/tcp # SQDR
+# Matthew Orzen <standards@starquest.com>
+tcim-control 2729/udp # TCIM Control
+tcim-control 2729/tcp # TCIM Control
+# Dean Skelton <mdskel@ftw.rsc.raytheon.com>
+nec-raidplus 2730/udp # NEC RaidPlus
+nec-raidplus 2730/tcp # NEC RaidPlus
+# Yusuke Asai <yasai@nw1.file.fc.nec.co.jp>
+fyre-messanger 2731/udp # Fyre Messagner
+fyre-messanger 2731/tcp # Fyre Messanger
+# Robert Waters <bobtek@hotmail.com>
+g5m 2732/udp # G5M
+g5m 2732/tcp # G5M
+# Graham Klyne <GK@ACM.ORG>
+signet-ctf 2733/udp # Signet CTF
+signet-ctf 2733/tcp # Signet CTF
+# Greg Broiles <greg@sac.net>
+ccs-software 2734/udp # CCS Software
+ccs-software 2734/tcp # CCS Software
+# Bertus Jacobs <bertus@ccs-software.co.za>
netiq-mc 2735/udp # NetIQ Monitor Console
netiq-mc 2735/tcp # NetIQ Monitor Console
-# Scott Southard <scott.southard@netiq.com>
-radwiz-nms-srv 2736/udp # RADWIZ NMS SRV
-radwiz-nms-srv 2736/tcp # RADWIZ NMS SRV
-# Israel Shainert <israels@209.88.177.2>
-srp-feedback 2737/udp # SRP Feedback
-srp-feedback 2737/tcp # SRP Feedback
-# Werner Almesberger <Werner.Almesberger@epfl.ch>
-ndl-tcp-ois-gw 2738/udp # NDL TCP-OSI Gateway
-ndl-tcp-ois-gw 2738/tcp # NDL TCP-OSI Gateway
-# Martin Norman <martin@ndl.co.uk>
-tn-timing 2739/udp # TN Timing
-tn-timing 2739/tcp # TN Timing
-# Paul Roberts <PaulRoberts@engineer.com>
-alarm 2740/udp # Alarm
-alarm 2740/tcp # Alarm
-# Uriy Makasjuk <racer@bfpg.ru>
-tsb 2741/udp # TSB
-tsb 2741/tcp # TSB
-tsb2 2742/udp # TSB2
-tsb2 2742/tcp # TSB2
-# Ashish Chatterjee
-# <achatterjee@freeway.proxy.lucent.com>
-murx 2743/udp # murx
-murx 2743/tcp # murx
-# Thomas Kuiper <engerim@dachbu.de>
-honyaku 2744/udp # honyaku
-honyaku 2744/tcp # honyaku
-# Yasunari Yamashita <yamasita@omronsoft.co.jp>
-urbisnet 2745/udp # URBISNET
-urbisnet 2745/tcp # URBISNET
-# Urbis.Net Ltd <postmaster@urbis.net>
-cpudpencap 2746/udp # CPUDPENCAP
-cpudpencap 2746/tcp # CPUDPENCAP
-# Tamir Zegman <zegman@checkpoint.com>
-fjippol-swrly 2747/udp #
-fjippol-swrly 2747/tcp #
-fjippol-polsvr 2748/udp #
-fjippol-polsvr 2748/tcp #
-fjippol-cnsl 2749/udp #
-fjippol-cnsl 2749/tcp #
-fjippol-port1 2750/udp #
-fjippol-port1 2750/tcp #
-fjippol-port2 2751/udp #
-fjippol-port2 2751/tcp #
-# Shoichi Tachibana <tatibana@yk.fujitsu.co.jp>
-rsisysaccess 2752/udp # RSISYS ACCESS
-rsisysaccess 2752/tcp # RSISYS ACCESS
-# Christophe Besant
-de-spot 2753/udp # de-spot
-de-spot 2753/tcp # de-spot
-# Sanjay Parekh <spot@digitalenvoy.net>
-apollo-cc 2754/udp # APOLLO CC
-apollo-cc 2754/tcp # APOLLO CC
-# Brand Communications <donovan@brandcomms.com>
-expresspay 2755/udp # Express Pay
-expresspay 2755/tcp # Express Pay
-# Ben Higgins <bhiggins@netcom.ca>
-simplement-tie 2756/udp # simplement-tie
-simplement-tie 2756/tcp # simplement-tie
-# Tzvika Chumash <tzvikac@netvision.net.il>
-cnrp 2757/udp # CNRP
-cnrp 2757/tcp # CNRP
-# Jacob Ulmert <Jacob.Ulmert@se.abb.com>
-apollo-status 2758/udp # APOLLO Status
-apollo-status 2758/tcp # APOLLO Status
-apollo-gms 2759/udp # APOLLO GMS
-apollo-gms 2759/tcp # APOLLO GMS
-# Simon Hovell <simonh@brandcomms.com>
-sabams 2760/udp # Saba MS
-sabams 2760/tcp # Saba MS
-# Davoud Maha <dmaha@saba.com>
-dicom-iscl 2761/udp # DICOM ISCL
-dicom-iscl 2761/tcp # DICOM ISCL
-dicom-tls 2762/udp # DICOM TLS
-dicom-tls 2762/tcp # DICOM TLS
-# Lawrence Tarbox <ltarbox@scr.siemens.com>
-desktop-dna 2763/udp # Desktop DNA
-desktop-dna 2763/tcp # Desktop DNA
-# Jon Walker <jwalker@miramarsys.com>
-data-insurance 2764/udp # Data Insurance
-data-insurance 2764/tcp # Data Insurance
-# Brent Irwin <birwin@standard.com>
-qip-audup 2765/udp # qip-audup
-qip-audup 2765/tcp # qip-audup
-# Mike Morgan <mmorgan@lucent.com>
-compaq-scp 2766/udp # Compaq SCP
-compaq-scp 2766/tcp # Compaq SCP
-# Ferruccio Barletta <ferruccio.barletta@compaq.com>
-uadtc 2767/udp # UADTC
-uadtc 2767/tcp # UADTC
-uacs 2768/udp # UACS
-uacs 2768/tcp # UACS
-# Vishwas Lele <Vishwas_Lele@appliedis.com>
-singlept-mvs 2769/udp # Single Point MVS
-singlept-mvs 2769/tcp # Single Point MVS
-# Thomas Anderson <anderson@clark.net>
-veronica 2770/udp # Veronica
-veronica 2770/tcp # Veronica
-# Jonas Oberg <jonas@coyote.org>
-vergencecm 2771/udp # Vergence CM
-vergencecm 2771/tcp # Vergence CM
-# Mark Morwood <markm@sentillion.com>
-auris 2772/udp # auris
-auris 2772/tcp # auris
-# Francisco Saez Arance <fsaez@tid.es>
+# Scott Southard <scott.southard@netiq.com>
+radwiz-nms-srv 2736/udp # RADWIZ NMS SRV
+radwiz-nms-srv 2736/tcp # RADWIZ NMS SRV
+# Israel Shainert <israels@209.88.177.2>
+srp-feedback 2737/udp # SRP Feedback
+srp-feedback 2737/tcp # SRP Feedback
+# Werner Almesberger <Werner.Almesberger@epfl.ch>
+ndl-tcp-ois-gw 2738/udp # NDL TCP-OSI Gateway
+ndl-tcp-ois-gw 2738/tcp # NDL TCP-OSI Gateway
+# Martin Norman <martin@ndl.co.uk>
+tn-timing 2739/udp # TN Timing
+tn-timing 2739/tcp # TN Timing
+# Paul Roberts <PaulRoberts@engineer.com>
+alarm 2740/udp # Alarm
+alarm 2740/tcp # Alarm
+# Uriy Makasjuk <racer@bfpg.ru>
+tsb 2741/udp # TSB
+tsb 2741/tcp # TSB
+tsb2 2742/udp # TSB2
+tsb2 2742/tcp # TSB2
+# Ashish Chatterjee
+# <achatterjee@freeway.proxy.lucent.com>
+murx 2743/udp # murx
+murx 2743/tcp # murx
+# Thomas Kuiper <engerim@dachbu.de>
+honyaku 2744/udp # honyaku
+honyaku 2744/tcp # honyaku
+# Yasunari Yamashita <yamasita@omronsoft.co.jp>
+urbisnet 2745/udp # URBISNET
+urbisnet 2745/tcp # URBISNET
+# Urbis.Net Ltd <postmaster@urbis.net>
+cpudpencap 2746/udp # CPUDPENCAP
+cpudpencap 2746/tcp # CPUDPENCAP
+# Tamir Zegman <zegman@checkpoint.com>
+fjippol-swrly 2747/udp #
+fjippol-swrly 2747/tcp #
+fjippol-polsvr 2748/udp #
+fjippol-polsvr 2748/tcp #
+fjippol-cnsl 2749/udp #
+fjippol-cnsl 2749/tcp #
+fjippol-port1 2750/udp #
+fjippol-port1 2750/tcp #
+fjippol-port2 2751/udp #
+fjippol-port2 2751/tcp #
+# Shoichi Tachibana <tatibana@yk.fujitsu.co.jp>
+rsisysaccess 2752/udp # RSISYS ACCESS
+rsisysaccess 2752/tcp # RSISYS ACCESS
+# Christophe Besant
+de-spot 2753/udp # de-spot
+de-spot 2753/tcp # de-spot
+# Sanjay Parekh <spot@digitalenvoy.net>
+apollo-cc 2754/udp # APOLLO CC
+apollo-cc 2754/tcp # APOLLO CC
+# Brand Communications <donovan@brandcomms.com>
+expresspay 2755/udp # Express Pay
+expresspay 2755/tcp # Express Pay
+# Ben Higgins <bhiggins@netcom.ca>
+simplement-tie 2756/udp # simplement-tie
+simplement-tie 2756/tcp # simplement-tie
+# Tzvika Chumash <tzvikac@netvision.net.il>
+cnrp 2757/udp # CNRP
+cnrp 2757/tcp # CNRP
+# Jacob Ulmert <Jacob.Ulmert@se.abb.com>
+apollo-status 2758/udp # APOLLO Status
+apollo-status 2758/tcp # APOLLO Status
+apollo-gms 2759/udp # APOLLO GMS
+apollo-gms 2759/tcp # APOLLO GMS
+# Simon Hovell <simonh@brandcomms.com>
+sabams 2760/udp # Saba MS
+sabams 2760/tcp # Saba MS
+# Davoud Maha <dmaha@saba.com>
+dicom-iscl 2761/udp # DICOM ISCL
+dicom-iscl 2761/tcp # DICOM ISCL
+dicom-tls 2762/udp # DICOM TLS
+dicom-tls 2762/tcp # DICOM TLS
+# Lawrence Tarbox <ltarbox@scr.siemens.com>
+desktop-dna 2763/udp # Desktop DNA
+desktop-dna 2763/tcp # Desktop DNA
+# Jon Walker <jwalker@miramarsys.com>
+data-insurance 2764/udp # Data Insurance
+data-insurance 2764/tcp # Data Insurance
+# Brent Irwin <birwin@standard.com>
+qip-audup 2765/udp # qip-audup
+qip-audup 2765/tcp # qip-audup
+# Mike Morgan <mmorgan@lucent.com>
+compaq-scp 2766/udp # Compaq SCP
+compaq-scp 2766/tcp # Compaq SCP
+# Ferruccio Barletta <ferruccio.barletta@compaq.com>
+uadtc 2767/udp # UADTC
+uadtc 2767/tcp # UADTC
+uacs 2768/udp # UACS
+uacs 2768/tcp # UACS
+# Vishwas Lele <Vishwas_Lele@appliedis.com>
+singlept-mvs 2769/udp # Single Point MVS
+singlept-mvs 2769/tcp # Single Point MVS
+# Thomas Anderson <anderson@clark.net>
+veronica 2770/udp # Veronica
+veronica 2770/tcp # Veronica
+# Jonas Oberg <jonas@coyote.org>
+vergencecm 2771/udp # Vergence CM
+vergencecm 2771/tcp # Vergence CM
+# Mark Morwood <markm@sentillion.com>
+auris 2772/udp # auris
+auris 2772/tcp # auris
+# Francisco Saez Arance <fsaez@tid.es>
rbakcup1 2773/udp # RBackup Remote Backup
rbakcup1 2773/tcp # RBackup Remote Backup
rbakcup2 2774/udp # RBackup Remote Backup
rbakcup2 2774/tcp # RBackup Remote Backup
# Rob Cosgrove <rob@alice.net>
-smpp 2775/udp # SMPP
-smpp 2775/tcp # SMPP
-# Owen Sullivan <owen.sullivan@aldiscon.ie>
-ridgeway1 2776/udp # Ridgeway Systems & Software
-ridgeway1 2776/tcp # Ridgeway Systems & Software
-ridgeway2 2777/udp # Ridgeway Systems & Software
-ridgeway2 2777/tcp # Ridgeway Systems & Software
-# Steve Read <sread@ridgeway-sys.com>
-gwen-sonya 2778/udp # Gwen-Sonya
-gwen-sonya 2778/tcp # Gwen-Sonya
-# Mark Hurst <mhurst@inconnect.com>
-lbc-sync 2779/udp # LBC Sync
-lbc-sync 2779/tcp # LBC Sync
-lbc-control 2780/udp # LBC Control
-lbc-control 2780/tcp # LBC Control
-# Keiji Michine <michine@net.paso.fujitsu.co.jp>
-whosells 2781/udp # whosells
-whosells 2781/tcp # whosells
-# William Randolph Royere III
+smpp 2775/udp # SMPP
+smpp 2775/tcp # SMPP
+# Owen Sullivan <owen.sullivan@aldiscon.ie>
+ridgeway1 2776/udp # Ridgeway Systems & Software
+ridgeway1 2776/tcp # Ridgeway Systems & Software
+ridgeway2 2777/udp # Ridgeway Systems & Software
+ridgeway2 2777/tcp # Ridgeway Systems & Software
+# Steve Read <sread@ridgeway-sys.com>
+gwen-sonya 2778/udp # Gwen-Sonya
+gwen-sonya 2778/tcp # Gwen-Sonya
+# Mark Hurst <mhurst@inconnect.com>
+lbc-sync 2779/udp # LBC Sync
+lbc-sync 2779/tcp # LBC Sync
+lbc-control 2780/udp # LBC Control
+lbc-control 2780/tcp # LBC Control
+# Keiji Michine <michine@net.paso.fujitsu.co.jp>
+whosells 2781/udp # whosells
+whosells 2781/tcp # whosells
+# William Randolph Royere III
# <william@royere.net>
-everydayrc 2782/udp # everydayrc
-everydayrc 2782/tcp # everydayrc
-# Ahti Heinla <ahti@ahti.bluemoon.ee>
-aises 2783/udp # AISES
-aises 2783/tcp # AISES
-# Daniel Grazioli <dgrazioli@pgaero.co.uk>
+everydayrc 2782/udp # everydayrc
+everydayrc 2782/tcp # everydayrc
+# Ahti Heinla <ahti@ahti.bluemoon.ee>
+aises 2783/udp # AISES
+aises 2783/tcp # AISES
+# Daniel Grazioli <dgrazioli@pgaero.co.uk>
www-dev 2784/udp # world wide web - development
www-dev 2784/tcp # world wide web - development
aic-np 2785/udp # aic-np
@@ -6524,312 +6524,312 @@ fryeserv 2788/tcp # NetWare Loadable Module - Seagate Software
# <Joseph_M_LoPilato@notes.seagate.com>
media-agent 2789/udp # Media Agent
media-agent 2789/tcp # Media Agent
-# Nitzan Daube <nitzan@brm.com>
-plgproxy 2790/udp # PLG Proxy
-plgproxy 2790/tcp # PLG Proxy
-# Charlie Hava <charlieh@aks.com>
-mtport-regist 2791/udp # MT Port Registrator
-mtport-regist 2791/tcp # MT Port Registrator
-# Maxim Tseitlin <mtseitlin@iname.com>
-f5-globalsite 2792/udp # f5-globalsite
-f5-globalsite 2792/tcp # f5-globalsite
-# Christian Saether <c.saether@f5.com>
-initlsmsad 2793/udp # initlsmsad
-initlsmsad 2793/tcp # initlsmsad
-# Kelly Green <green@compaq.com>
-aaftp 2794/udp # aaftp
-aaftp 2794/tcp # aaftp
-# E. Jay Berkenbilt <ejb@ql.org>
-livestats 2795/udp # LiveStats
-livestats 2795/tcp # LiveStats
-# Chris Greene <cgreeneOA@avidsports.com>
-ac-tech 2796/udp # ac-tech
-ac-tech 2796/tcp # ac-tech
-# Chiming Huang <chuang@ac-tech.com>
-esp-encap 2797/udp # esp-encap
-esp-encap 2797/tcp # esp-encap
-# Jorn Sierwald <joern.sierwald@datafellows.com>
-tmesis-upshot 2798/udp # TMESIS-UPShot
-tmesis-upshot 2798/tcp # TMESIS-UPShot
-# Brian Schenkenberger <VAXman@TMESIS.COM>
-icon-discover 2799/udp # ICON Discover
-icon-discover 2799/tcp # ICON Discover
-# Alexander Falk <falk@icon.at>
-acc-raid 2800/udp # ACC RAID
-acc-raid 2800/tcp # ACC RAID
-# Scott St. Clair <stclair@ntc.adaptec.com>
-igcp 2801/udp # IGCP
-igcp 2801/tcp # IGCP
-# David Hampson <davidha@codemasters.com>
-veritas-udp1 2802/udp # Veritas UDP1
-veritas-tcp1 2802/tcp # Veritas TCP1
-# Russ Thrasher <Russell.Thrasher@veritas.com>
-btprjctrl 2803/udp # btprjctrl
-btprjctrl 2803/tcp # btprjctrl
-# Huw Thomas <huw.thomas@bt.com>
-telexis-vtu 2804/udp # Telexis VTU
-telexis-vtu 2804/tcp # Telexis VTU
-# Todd White <twhite@telexicorp.com>
-wta-wsp-s 2805/udp # WTA WSP-S
-wta-wsp-s 2805/tcp # WTA WSP-S
-# Sebastien Bury (WAP Forum)
-# <sebastien.bury@art.alcatel.fr>
-cspuni 2806/udp # cspuni
-cspuni 2806/tcp # cspuni
-cspmulti 2807/udp # cspmulti
-cspmulti 2807/tcp # cspmulti
-# Terumasa Yoneda <yonedat@pfu.co.jp>
-j-lan-p 2808/udp # J-LAN-P
-j-lan-p 2808/tcp # J-LAN-P
-# Takeshi Sahara <sahara@jdl.co.jp>
-corbaloc 2809/udp # CORBA LOC
-corbaloc 2809/tcp # CORBA LOC
-# Ted McFadden <mcfadden@dstc.edu.au>
-netsteward 2810/udp # Active Net Steward
-netsteward 2810/tcp # Active Net Steward
-# Keith Morley <keith@ndl.co.uk>
-gsiftp 2811/udp # GSI FTP
-gsiftp 2811/tcp # GSI FTP
-# Von Welch <vwelch@ncsa.uiuc.edu>
-atmtcp 2812/udp # atmtcp
-atmtcp 2812/tcp # atmtcp
-# Werner Almesberger <Werner.Almesberger@epfl.ch>
-llm-pass 2813/udp # llm-pass
-llm-pass 2813/tcp # llm-pass
-llm-csv 2814/udp # llm-csv
-llm-csv 2814/tcp # llm-csv
-# Glen Sansoucie <glen@llmwin.com>
-lbc-measure 2815/udp # LBC Measurement
-lbc-measure 2815/tcp # LBC Measurement
-lbc-watchdog 2816/udp # LBC Watchdog
-lbc-watchdog 2816/tcp # LBC Watchdog
-# Akiyoshi Ochi <akiyoshi@net.paso.fujitsu.co.jp>
-nmsigport 2817/udp # NMSig Port
-nmsigport 2817/tcp # NMSig Port
-# Peter Egli <peter.egli@mail.inalp.com>
-rmlnk 2818/udp # rmlnk
-rmlnk 2818/tcp # rmlnk
-fc-faultnotify 2819/udp # FC Fault Notification
-fc-faultnotify 2819/tcp # FC Fault Notification
-# Dave Watkins <davew@boi.hp.com>
-univision 2820/udp # UniVision
-univision 2820/tcp # UniVision
-# Keith Ansell <KeithA@fastfreenet.com>
+# Nitzan Daube <nitzan@brm.com>
+plgproxy 2790/udp # PLG Proxy
+plgproxy 2790/tcp # PLG Proxy
+# Charlie Hava <charlieh@aks.com>
+mtport-regist 2791/udp # MT Port Registrator
+mtport-regist 2791/tcp # MT Port Registrator
+# Maxim Tseitlin <mtseitlin@iname.com>
+f5-globalsite 2792/udp # f5-globalsite
+f5-globalsite 2792/tcp # f5-globalsite
+# Christian Saether <c.saether@f5.com>
+initlsmsad 2793/udp # initlsmsad
+initlsmsad 2793/tcp # initlsmsad
+# Kelly Green <green@compaq.com>
+aaftp 2794/udp # aaftp
+aaftp 2794/tcp # aaftp
+# E. Jay Berkenbilt <ejb@ql.org>
+livestats 2795/udp # LiveStats
+livestats 2795/tcp # LiveStats
+# Chris Greene <cgreeneOA@avidsports.com>
+ac-tech 2796/udp # ac-tech
+ac-tech 2796/tcp # ac-tech
+# Chiming Huang <chuang@ac-tech.com>
+esp-encap 2797/udp # esp-encap
+esp-encap 2797/tcp # esp-encap
+# Jorn Sierwald <joern.sierwald@datafellows.com>
+tmesis-upshot 2798/udp # TMESIS-UPShot
+tmesis-upshot 2798/tcp # TMESIS-UPShot
+# Brian Schenkenberger <VAXman@TMESIS.COM>
+icon-discover 2799/udp # ICON Discover
+icon-discover 2799/tcp # ICON Discover
+# Alexander Falk <falk@icon.at>
+acc-raid 2800/udp # ACC RAID
+acc-raid 2800/tcp # ACC RAID
+# Scott St. Clair <stclair@ntc.adaptec.com>
+igcp 2801/udp # IGCP
+igcp 2801/tcp # IGCP
+# David Hampson <davidha@codemasters.com>
+veritas-udp1 2802/udp # Veritas UDP1
+veritas-tcp1 2802/tcp # Veritas TCP1
+# Russ Thrasher <Russell.Thrasher@veritas.com>
+btprjctrl 2803/udp # btprjctrl
+btprjctrl 2803/tcp # btprjctrl
+# Huw Thomas <huw.thomas@bt.com>
+telexis-vtu 2804/udp # Telexis VTU
+telexis-vtu 2804/tcp # Telexis VTU
+# Todd White <twhite@telexicorp.com>
+wta-wsp-s 2805/udp # WTA WSP-S
+wta-wsp-s 2805/tcp # WTA WSP-S
+# Sebastien Bury (WAP Forum)
+# <sebastien.bury@art.alcatel.fr>
+cspuni 2806/udp # cspuni
+cspuni 2806/tcp # cspuni
+cspmulti 2807/udp # cspmulti
+cspmulti 2807/tcp # cspmulti
+# Terumasa Yoneda <yonedat@pfu.co.jp>
+j-lan-p 2808/udp # J-LAN-P
+j-lan-p 2808/tcp # J-LAN-P
+# Takeshi Sahara <sahara@jdl.co.jp>
+corbaloc 2809/udp # CORBA LOC
+corbaloc 2809/tcp # CORBA LOC
+# Ted McFadden <mcfadden@dstc.edu.au>
+netsteward 2810/udp # Active Net Steward
+netsteward 2810/tcp # Active Net Steward
+# Keith Morley <keith@ndl.co.uk>
+gsiftp 2811/udp # GSI FTP
+gsiftp 2811/tcp # GSI FTP
+# Von Welch <vwelch@ncsa.uiuc.edu>
+atmtcp 2812/udp # atmtcp
+atmtcp 2812/tcp # atmtcp
+# Werner Almesberger <Werner.Almesberger@epfl.ch>
+llm-pass 2813/udp # llm-pass
+llm-pass 2813/tcp # llm-pass
+llm-csv 2814/udp # llm-csv
+llm-csv 2814/tcp # llm-csv
+# Glen Sansoucie <glen@llmwin.com>
+lbc-measure 2815/udp # LBC Measurement
+lbc-measure 2815/tcp # LBC Measurement
+lbc-watchdog 2816/udp # LBC Watchdog
+lbc-watchdog 2816/tcp # LBC Watchdog
+# Akiyoshi Ochi <akiyoshi@net.paso.fujitsu.co.jp>
+nmsigport 2817/udp # NMSig Port
+nmsigport 2817/tcp # NMSig Port
+# Peter Egli <peter.egli@mail.inalp.com>
+rmlnk 2818/udp # rmlnk
+rmlnk 2818/tcp # rmlnk
+fc-faultnotify 2819/udp # FC Fault Notification
+fc-faultnotify 2819/tcp # FC Fault Notification
+# Dave Watkins <davew@boi.hp.com>
+univision 2820/udp # UniVision
+univision 2820/tcp # UniVision
+# Keith Ansell <KeithA@fastfreenet.com>
vrts-at-port 2821/udp # VERITAS Authentication Service
vrts-at-port 2821/tcp # VERITAS Authentication Service
# Stefan Winkel <stefan@veritas.com>
-ka0wuc 2822/udp # ka0wuc
-ka0wuc 2822/tcp # ka0wuc
-# Kit Haskins <kit@ka0wuc.org>
-cqg-netlan 2823/udp # CQG Net/LAN
-cqg-netlan 2823/tcp # CQG Net/LAN
+ka0wuc 2822/udp # ka0wuc
+ka0wuc 2822/tcp # ka0wuc
+# Kit Haskins <kit@ka0wuc.org>
+cqg-netlan 2823/udp # CQG Net/LAN
+cqg-netlan 2823/tcp # CQG Net/LAN
cqg-netlan-1 2824/udp # CQG Net/Lan 1
cqg-netlan-1 2824/tcp # CQG Net/LAN 1
-# Jeff Wood <jw@cqg.com>
+# Jeff Wood <jw@cqg.com>
# 2825 (unassigned) Possibly assigned
-slc-systemlog 2826/udp # slc systemlog
-slc-systemlog 2826/tcp # slc systemlog
-slc-ctrlrloops 2827/udp # slc ctrlrloops
-slc-ctrlrloops 2827/tcp # slc ctrlrloops
-# Erwin Hogeweg <erwin@airtech.demon.nl>
-itm-lm 2828/udp # ITM License Manager
-itm-lm 2828/tcp # ITM License Manager
-# Miles O'Neal <meo@us.itmasters.com>
-silkp1 2829/udp # silkp1
-silkp1 2829/tcp # silkp1
-silkp2 2830/udp # silkp2
-silkp2 2830/tcp # silkp2
-silkp3 2831/udp # silkp3
-silkp3 2831/tcp # silkp3
-silkp4 2832/udp # silkp4
-silkp4 2832/tcp # silkp4
-# Erik Skyten <eki@silknet.com>
-glishd 2833/udp # glishd
-glishd 2833/tcp # glishd
-# Darrell Schiebel <dschieb@cv.nrao.edu>
-evtp 2834/udp # EVTP
-evtp 2834/tcp # EVTP
-evtp-data 2835/udp # EVTP-DATA
-evtp-data 2835/tcp # EVTP-DATA
-# Eric Bruno <ebruno@solution-soft.com>
-catalyst 2836/udp # catalyst
-catalyst 2836/tcp # catalyst
-# Garret Tollkuhn <garret@multiviewgroup.com>
-repliweb 2837/udp # Repliweb
-repliweb 2837/tcp # Repliweb
-# William Orme <bill@repliweb.com>
-starbot 2838/udp # Starbot
-starbot 2838/tcp # Starbot
-# Markus Sabadello <sabadello@starbot.org>
-nmsigport 2839/udp # NMSigPort
-nmsigport 2839/tcp # NMSigPort
-# Peter Egli <peter.egli@mail.inalp.com>
-l3-exprt 2840/udp # l3-exprt
-l3-exprt 2840/tcp # l3-exprt
-l3-ranger 2841/udp # l3-ranger
-l3-ranger 2841/tcp # l3-ranger
-l3-hawk 2842/udp # l3-hawk
-l3-hawk 2842/tcp # l3-hawk
-# Dolores Scott <dolores.scott@l-3security.com>
-pdnet 2843/udp # PDnet
-pdnet 2843/tcp # PDnet
-# Torsten Scheffler <torsten.scheffler@apex.de>
-bpcp-poll 2844/udp # BPCP POLL
-bpcp-poll 2844/tcp # BPCP POLL
-bpcp-trap 2845/udp # BPCP TRAP
-bpcp-trap 2845/tcp # BPCP TRAP
-# Steve Van Duser
+slc-systemlog 2826/udp # slc systemlog
+slc-systemlog 2826/tcp # slc systemlog
+slc-ctrlrloops 2827/udp # slc ctrlrloops
+slc-ctrlrloops 2827/tcp # slc ctrlrloops
+# Erwin Hogeweg <erwin@airtech.demon.nl>
+itm-lm 2828/udp # ITM License Manager
+itm-lm 2828/tcp # ITM License Manager
+# Miles O'Neal <meo@us.itmasters.com>
+silkp1 2829/udp # silkp1
+silkp1 2829/tcp # silkp1
+silkp2 2830/udp # silkp2
+silkp2 2830/tcp # silkp2
+silkp3 2831/udp # silkp3
+silkp3 2831/tcp # silkp3
+silkp4 2832/udp # silkp4
+silkp4 2832/tcp # silkp4
+# Erik Skyten <eki@silknet.com>
+glishd 2833/udp # glishd
+glishd 2833/tcp # glishd
+# Darrell Schiebel <dschieb@cv.nrao.edu>
+evtp 2834/udp # EVTP
+evtp 2834/tcp # EVTP
+evtp-data 2835/udp # EVTP-DATA
+evtp-data 2835/tcp # EVTP-DATA
+# Eric Bruno <ebruno@solution-soft.com>
+catalyst 2836/udp # catalyst
+catalyst 2836/tcp # catalyst
+# Garret Tollkuhn <garret@multiviewgroup.com>
+repliweb 2837/udp # Repliweb
+repliweb 2837/tcp # Repliweb
+# William Orme <bill@repliweb.com>
+starbot 2838/udp # Starbot
+starbot 2838/tcp # Starbot
+# Markus Sabadello <sabadello@starbot.org>
+nmsigport 2839/udp # NMSigPort
+nmsigport 2839/tcp # NMSigPort
+# Peter Egli <peter.egli@mail.inalp.com>
+l3-exprt 2840/udp # l3-exprt
+l3-exprt 2840/tcp # l3-exprt
+l3-ranger 2841/udp # l3-ranger
+l3-ranger 2841/tcp # l3-ranger
+l3-hawk 2842/udp # l3-hawk
+l3-hawk 2842/tcp # l3-hawk
+# Dolores Scott <dolores.scott@l-3security.com>
+pdnet 2843/udp # PDnet
+pdnet 2843/tcp # PDnet
+# Torsten Scheffler <torsten.scheffler@apex.de>
+bpcp-poll 2844/udp # BPCP POLL
+bpcp-poll 2844/tcp # BPCP POLL
+bpcp-trap 2845/udp # BPCP TRAP
+bpcp-trap 2845/tcp # BPCP TRAP
+# Steve Van Duser
# <steve.vanduser@bestpower.gensig.com>
-aimpp-hello 2846/udp # AIMPP Hello
-aimpp-hello 2846/tcp # AIMPP Hello
-aimpp-port-req 2847/udp # AIMPP Port Req
-aimpp-port-req 2847/tcp # AIMPP Port Req
-# Brian Martinicky
+aimpp-hello 2846/udp # AIMPP Hello
+aimpp-hello 2846/tcp # AIMPP Hello
+aimpp-port-req 2847/udp # AIMPP Port Req
+aimpp-port-req 2847/tcp # AIMPP Port Req
+# Brian Martinicky
# <Brian_Martinicky@automationintelligence.com>
-amt-blc-port 2848/udp # AMT-BLC-PORT
-amt-blc-port 2848/tcp # AMT-BLC-PORT
-# Sandra Frulloni <frulloni.amtec@interbusiness.it>
-fxp 2849/udp # FXP
-fxp 2849/tcp # FXP
-# Martin Lichtin <lichtin@oanda.com>
-metaconsole 2850/udp # MetaConsole
-metaconsole 2850/tcp # MetaConsole
-# Rakesh Mahajan <rmahajan@netaphor-software.com>
-webemshttp 2851/udp # webemshttp
-webemshttp 2851/tcp # webemshttp
-# Stephen Tsun <stsun@jetstream.com>
-bears-01 2852/udp # bears-01
-bears-01 2852/tcp # bears-01
-# Bruce McKinnon <brucemck@bears.aust.com>
-ispipes 2853/udp # ISPipes
-ispipes 2853/tcp # ISPipes
-# Rajesh Nandyalam <rnandyal@emc.com>
-infomover 2854/udp # InfoMover
-infomover 2854/tcp # InfoMover
-# Carla Caputo <caputo@emc.com>
-cesdinv 2856/udp # cesdinv
-cesdinv 2856/tcp # cesdinv
-# Yoshiaki Tokumoto <toku@pfu.co.jp>
-simctlp 2857/udp # SimCtIP
-simctlp 2857/tcp # SimCtIP
-# Christian Zietz <czietz@gmx.net>
-ecnp 2858/udp # ECNP
-ecnp 2858/tcp # ECNP
-# Robert Reimiller <bob@certsoft.com>
-activememory 2859/udp # Active Memory
-activememory 2859/tcp # Active Memory
-# Joe Graham <joe@edaconsulting.com>
-dialpad-voice1 2860/udp # Dialpad Voice 1
-dialpad-voice1 2860/tcp # Dialpad Voice 1
-dialpad-voice2 2861/udp # Dialpad Voice 2
-dialpad-voice2 2861/tcp # Dialpad Voice 2
-# Wongyu Cho <wgcho@dialpad.com>
-ttg-protocol 2862/udp # TTG Protocol
-ttg-protocol 2862/tcp # TTG Protocol
-# Mark Boler <markb@ttgsoftware.com>
-sonardata 2863/udp # Sonar Data
-sonardata 2863/tcp # Sonar Data
-# Ian Higginbottom <sonardata@sonardata.com>
-astromed-main 2864/udp # main 5001 cmd
-astromed-main 2864/tcp # main 5001 cmd
-# Chris Tate <ctate@astromed.com>
-pit-vpn 2865/udp # pit-vpn
-pit-vpn 2865/tcp # pit-vpn
-# Norbert Sendetzky <norbert@linuxnetworks.de>
-iwlistener 2866/udp # iwlistener
-iwlistener 2866/tcp # iwlistener
-# Fred Surr <quest_iana@oz.quest.com>
-esps-portal 2867/udp # esps-portal
-esps-portal 2867/tcp # esps-portal
-# Nicholas Stowfis <nstowfis@esps.com>
-npep-messaging 2868/udp # NPEP Messaging
-npep-messaging 2868/tcp # NPEP Messaging
-# Kristian A. Bognaes <kbo@norman.no>
-icslap 2869/udp # ICSLAP
-icslap 2869/tcp # ICSLAP
-# Richard Lamb <rlamb@microsoft.com>
-daishi 2870/udp # daishi
-daishi 2870/tcp # daishi
-# Patrick Chipman <pchipman@memphis.edu>
-msi-selectplay 2871/udp # MSI Select Play
-msi-selectplay 2871/tcp # MSI Select Play
-# Paul Fonte <paul_fonte@mediastation.com>
-radix 2872/udp # RADIX
-radix 2872/tcp # RADIX
-# Stein Roger Skaflotten
+amt-blc-port 2848/udp # AMT-BLC-PORT
+amt-blc-port 2848/tcp # AMT-BLC-PORT
+# Sandra Frulloni <frulloni.amtec@interbusiness.it>
+fxp 2849/udp # FXP
+fxp 2849/tcp # FXP
+# Martin Lichtin <lichtin@oanda.com>
+metaconsole 2850/udp # MetaConsole
+metaconsole 2850/tcp # MetaConsole
+# Rakesh Mahajan <rmahajan@netaphor-software.com>
+webemshttp 2851/udp # webemshttp
+webemshttp 2851/tcp # webemshttp
+# Stephen Tsun <stsun@jetstream.com>
+bears-01 2852/udp # bears-01
+bears-01 2852/tcp # bears-01
+# Bruce McKinnon <brucemck@bears.aust.com>
+ispipes 2853/udp # ISPipes
+ispipes 2853/tcp # ISPipes
+# Rajesh Nandyalam <rnandyal@emc.com>
+infomover 2854/udp # InfoMover
+infomover 2854/tcp # InfoMover
+# Carla Caputo <caputo@emc.com>
+cesdinv 2856/udp # cesdinv
+cesdinv 2856/tcp # cesdinv
+# Yoshiaki Tokumoto <toku@pfu.co.jp>
+simctlp 2857/udp # SimCtIP
+simctlp 2857/tcp # SimCtIP
+# Christian Zietz <czietz@gmx.net>
+ecnp 2858/udp # ECNP
+ecnp 2858/tcp # ECNP
+# Robert Reimiller <bob@certsoft.com>
+activememory 2859/udp # Active Memory
+activememory 2859/tcp # Active Memory
+# Joe Graham <joe@edaconsulting.com>
+dialpad-voice1 2860/udp # Dialpad Voice 1
+dialpad-voice1 2860/tcp # Dialpad Voice 1
+dialpad-voice2 2861/udp # Dialpad Voice 2
+dialpad-voice2 2861/tcp # Dialpad Voice 2
+# Wongyu Cho <wgcho@dialpad.com>
+ttg-protocol 2862/udp # TTG Protocol
+ttg-protocol 2862/tcp # TTG Protocol
+# Mark Boler <markb@ttgsoftware.com>
+sonardata 2863/udp # Sonar Data
+sonardata 2863/tcp # Sonar Data
+# Ian Higginbottom <sonardata@sonardata.com>
+astromed-main 2864/udp # main 5001 cmd
+astromed-main 2864/tcp # main 5001 cmd
+# Chris Tate <ctate@astromed.com>
+pit-vpn 2865/udp # pit-vpn
+pit-vpn 2865/tcp # pit-vpn
+# Norbert Sendetzky <norbert@linuxnetworks.de>
+iwlistener 2866/udp # iwlistener
+iwlistener 2866/tcp # iwlistener
+# Fred Surr <quest_iana@oz.quest.com>
+esps-portal 2867/udp # esps-portal
+esps-portal 2867/tcp # esps-portal
+# Nicholas Stowfis <nstowfis@esps.com>
+npep-messaging 2868/udp # NPEP Messaging
+npep-messaging 2868/tcp # NPEP Messaging
+# Kristian A. Bognaes <kbo@norman.no>
+icslap 2869/udp # ICSLAP
+icslap 2869/tcp # ICSLAP
+# Richard Lamb <rlamb@microsoft.com>
+daishi 2870/udp # daishi
+daishi 2870/tcp # daishi
+# Patrick Chipman <pchipman@memphis.edu>
+msi-selectplay 2871/udp # MSI Select Play
+msi-selectplay 2871/tcp # MSI Select Play
+# Paul Fonte <paul_fonte@mediastation.com>
+radix 2872/udp # RADIX
+radix 2872/tcp # RADIX
+# Stein Roger Skaflotten
# <sskaflot@online.no>
-paspar2-zoomin 2873/udp # PASPAR2 ZoomIn
-paspar2-zoomin 2873/tcp # PASPAR2 ZoomIn
-# Amonn David <amnon@paspar2.com>
-dxmessagebase1 2874/udp # dxmessagebase1
-dxmessagebase1 2874/tcp # dxmessagebase1
-dxmessagebase2 2875/udp # dxmessagebase2
-dxmessagebase2 2875/tcp # dxmessagebase2
-# Ozz Nixon <root@delphix.com>
-sps-tunnel 2876/udp # SPS Tunnel
-sps-tunnel 2876/tcp # SPS Tunnel
-# Bill McIntosh <bmcintosh@fortresstech.com>
-bluelance 2877/udp # BLUELANCE
-bluelance 2877/tcp # BLUELANCE
-# Michael Padrezas <mpaderzas@bluelance.com>
-aap 2878/udp # AAP
-aap 2878/tcp # AAP
-# Stephen Hanna <steve.hanna@sun.com>
-ucentric-ds 2879/udp # ucentric-ds
-ucentric-ds 2879/tcp # ucentric-ds
-# Alex Vasilevsky <alexv@204.165.216.115>
-synapse 2880/udp # Synapse Transport
-synapse 2880/tcp # Synapse Transport
-# Ali Fracyon <sxdev@modulardreams.com>
-ndsp 2881/udp # NDSP
-ndsp 2881/tcp # NDSP
-ndtp 2882/udp # NDTP
-ndtp 2882/tcp # NDTP
-ndnp 2883/udp # NDNP
-ndnp 2883/tcp # NDNP
-# Khelben Blackstaff <khelben@gmx.at>
-flashmsg 2884/udp # Flash Msg
-flashmsg 2884/tcp # Flash Msg
-# Jeffrey Zinkerman <jeff@zinknet.com>
-topflow 2885/udp # TopFlow
-topflow 2885/tcp # TopFlow
-# Ted Ross <ross@toplayer.com>
+paspar2-zoomin 2873/udp # PASPAR2 ZoomIn
+paspar2-zoomin 2873/tcp # PASPAR2 ZoomIn
+# Amonn David <amnon@paspar2.com>
+dxmessagebase1 2874/udp # dxmessagebase1
+dxmessagebase1 2874/tcp # dxmessagebase1
+dxmessagebase2 2875/udp # dxmessagebase2
+dxmessagebase2 2875/tcp # dxmessagebase2
+# Ozz Nixon <root@delphix.com>
+sps-tunnel 2876/udp # SPS Tunnel
+sps-tunnel 2876/tcp # SPS Tunnel
+# Bill McIntosh <bmcintosh@fortresstech.com>
+bluelance 2877/udp # BLUELANCE
+bluelance 2877/tcp # BLUELANCE
+# Michael Padrezas <mpaderzas@bluelance.com>
+aap 2878/udp # AAP
+aap 2878/tcp # AAP
+# Stephen Hanna <steve.hanna@sun.com>
+ucentric-ds 2879/udp # ucentric-ds
+ucentric-ds 2879/tcp # ucentric-ds
+# Alex Vasilevsky <alexv@204.165.216.115>
+synapse 2880/udp # Synapse Transport
+synapse 2880/tcp # Synapse Transport
+# Ali Fracyon <sxdev@modulardreams.com>
+ndsp 2881/udp # NDSP
+ndsp 2881/tcp # NDSP
+ndtp 2882/udp # NDTP
+ndtp 2882/tcp # NDTP
+ndnp 2883/udp # NDNP
+ndnp 2883/tcp # NDNP
+# Khelben Blackstaff <khelben@gmx.at>
+flashmsg 2884/udp # Flash Msg
+flashmsg 2884/tcp # Flash Msg
+# Jeffrey Zinkerman <jeff@zinknet.com>
+topflow 2885/udp # TopFlow
+topflow 2885/tcp # TopFlow
+# Ted Ross <ross@toplayer.com>
responselogic 2886/udp # RESPONSELOGIC
responselogic 2886/tcp # RESPONSELOGIC
-# Bruce Casey <bcasey@responselogic.com>
+# Bruce Casey <bcasey@responselogic.com>
aironetddp 2887/udp # aironet
aironetddp 2887/tcp # aironet
-# Victor Griswold <vgris@aironet.com>
+# Victor Griswold <vgris@aironet.com>
spcsdlobby 2888/udp # SPCSDLOBBY
spcsdlobby 2888/tcp # SPCSDLOBBY
-# Matthew Williams <SPCsd_MWDD@hotmail.com>
+# Matthew Williams <SPCsd_MWDD@hotmail.com>
rsom 2889/udp # RSOM
rsom 2889/tcp # RSOM
-# Justine Higgins <iana@corsof.com>
+# Justine Higgins <iana@corsof.com>
cspclmulti 2890/udp # CSPCLMULTI
cspclmulti 2890/tcp # CSPCLMULTI
-# Yoneda Terumasa <yonedat@pfu.co.jp>
+# Yoneda Terumasa <yonedat@pfu.co.jp>
cinegrfx-elmd 2891/udp # CINEGRFX-ELMD License Manager
cinegrfx-elmd 2891/tcp # CINEGRFX-ELMD License Manager
-# Greg Ercolano <erco@cinegrfx.com>
+# Greg Ercolano <erco@cinegrfx.com>
snifferdata 2892/udp # SNIFFERDATA
snifferdata 2892/tcp # SNIFFERDATA
-# Jeff Mangasarian <jeffrey_mangasarian@nai.com>
+# Jeff Mangasarian <jeffrey_mangasarian@nai.com>
vseconnector 2893/udp # VSECONNECTOR
vseconnector 2893/tcp # VSECONNECTOR
-# Ingo Franzki <ifranzki@de.ibm.com>
+# Ingo Franzki <ifranzki@de.ibm.com>
abacus-remote 2894/udp # ABACUS-REMOTE
abacus-remote 2894/tcp # ABACUS-REMOTE
-# Mike Bello <mbello@zarak.com>
+# Mike Bello <mbello@zarak.com>
natuslink 2895/udp # NATUS LINK
natuslink 2895/tcp # NATUS LINK
-# Jonathan Mergy <mergy@natus.com>
+# Jonathan Mergy <mergy@natus.com>
ecovisiong6-1 2896/udp # ECOVISIONG6-1
ecovisiong6-1 2896/tcp # ECOVISIONG6-1
-# Henrik Holst <henrik.holst@ecovision.se>
-citrix-rtmp 2897/udp # Citrix RTMP
-citrix-rtmp 2897/tcp # Citrix RTMP
-# Myk Willis <myk.willis@citrix.com>
+# Henrik Holst <henrik.holst@ecovision.se>
+citrix-rtmp 2897/udp # Citrix RTMP
+citrix-rtmp 2897/tcp # Citrix RTMP
+# Myk Willis <myk.willis@citrix.com>
appliance-cfg 2898/udp # APPLIANCE-CFG
appliance-cfg 2898/tcp # APPLIANCE-CFG
# Gary A. James <gary.james@criticallink.com>
@@ -6865,35 +6865,35 @@ webmethods-b2b 2907/tcp # WEBMETHODS B2B
mao 2908/udp # mao
mao 2908/tcp # mao
# Marc Baudoin <babafou@babafou.eu.org>
-funk-dialout 2909/udp # Funk Dialout
-funk-dialout 2909/tcp # Funk Dialout
-# Cimarron Boozer <cboozer@funk.com>
-tdaccess 2910/udp # TDAccess
-tdaccess 2910/tcp # TDAccess
-# Tom Haapanen <tomh@metrics.com>
+funk-dialout 2909/udp # Funk Dialout
+funk-dialout 2909/tcp # Funk Dialout
+# Cimarron Boozer <cboozer@funk.com>
+tdaccess 2910/udp # TDAccess
+tdaccess 2910/tcp # TDAccess
+# Tom Haapanen <tomh@metrics.com>
blockade 2911/udp # Blockade
blockade 2911/tcp # Blockade
# VP - Research & Development <development@blockade.com>
-epicon 2912/udp # Epicon
-epicon 2912/tcp # Epicon
-# Michael Khalandovsky <mlk@epicon.com>
-boosterware 2913/udp # Booster Ware
-boosterware 2913/tcp # Booster Ware
-# Ido Ben-David <dgntcom@netvision.net.il>
+epicon 2912/udp # Epicon
+epicon 2912/tcp # Epicon
+# Michael Khalandovsky <mlk@epicon.com>
+boosterware 2913/udp # Booster Ware
+boosterware 2913/tcp # Booster Ware
+# Ido Ben-David <dgntcom@netvision.net.il>
gamelobby 2914/udp # Game Lobby
gamelobby 2914/tcp # Game Lobby
# Paul Ford-Hutchinson <paulfordh@uk.ibm.com>
-tksocket 2915/udp # TK Socket
-tksocket 2915/tcp # TK Socket
-# Alan Fahrner <alan@protix.com>
-elvin_server 2916/udp # Elvin Server
-elvin_server 2916/tcp # Elvin Server
-elvin_client 2917/udp # Elvin Client
-elvin_client 2917/tcp # Elvin Client
-# David Arnold <davida@pobox.com>
-kastenchasepad 2918/udp # Kasten Chase Pad
-kastenchasepad 2918/tcp # Kasten Chase Pad
-# Marc Gauthier <mgau@kastenchase.com>
+tksocket 2915/udp # TK Socket
+tksocket 2915/tcp # TK Socket
+# Alan Fahrner <alan@protix.com>
+elvin_server 2916/udp # Elvin Server
+elvin_server 2916/tcp # Elvin Server
+elvin_client 2917/udp # Elvin Client
+elvin_client 2917/tcp # Elvin Client
+# David Arnold <davida@pobox.com>
+kastenchasepad 2918/udp # Kasten Chase Pad
+kastenchasepad 2918/tcp # Kasten Chase Pad
+# Marc Gauthier <mgau@kastenchase.com>
roboer 2919/udp # ROBOER
roboer 2919/tcp # ROBOER
# Paul Snook <paul.snook@heroix.co.uk>
@@ -7041,35 +7041,35 @@ index-net 2970/tcp # INDEX-NET
netclip 2971/udp # NetClip clipboard daemon
netclip 2971/tcp # NetClip clipboard daemon
# Rudi Chiarito <nutello@sweetness.com>
-pmsm-webrctl 2972/udp # PMSM Webrctl
-pmsm-webrctl 2972/tcp # PMSM Webrctl
-# Markus Michels <mmi@pmsmicado.com>
-svnetworks 2973/udp # SV Networks
-svnetworks 2973/tcp # SV Networks
-# Sylvia Siu <ssiu@svnetworks.com>
-signal 2974/udp # Signal
-signal 2974/tcp # Signal
-# Wyatt Williams <wyattw@icall.com>
-fjmpcm 2975/udp # Fujitsu Configuration Management Service
-fjmpcm 2975/tcp # Fujitsu Configuration Management Service
-# Hiroki Kawano <kawano@saint.nm.fujitsu.co.jp>
-cns-srv-port 2976/udp # CNS Server Port
-cns-srv-port 2976/tcp # CNS Server Port
-# Ram Golla <rgolla@cisco.com>
-ttc-etap-ns 2977/udp # TTCs Enterprise Test Access Protocol - NS
-ttc-etap-ns 2977/tcp # TTCs Enterprise Test Access Protocol - NS
-ttc-etap-ds 2978/udp # TTCs Enterprise Test Access Protocol - DS
-ttc-etap-ds 2978/tcp # TTCs Enterprise Test Access Protocol - DS
-# Daniel Becker <beckerd@ttc.com>
-h263-video 2979/udp # H.263 Video Streaming
-h263-video 2979/tcp # H.263 Video Streaming
-# Jauvane C. de Oliveira <jauvane@acm.org>
-wimd 2980/udp # Instant Messaging Service
-wimd 2980/tcp # Instant Messaging Service
-# Kevin Birch <kbirch@pobox.com>
-mylxamport 2981/udp # MYLXAMPORT
-mylxamport 2981/tcp # MYLXAMPORT
-# Wei Gao <wei@mylex.com>
+pmsm-webrctl 2972/udp # PMSM Webrctl
+pmsm-webrctl 2972/tcp # PMSM Webrctl
+# Markus Michels <mmi@pmsmicado.com>
+svnetworks 2973/udp # SV Networks
+svnetworks 2973/tcp # SV Networks
+# Sylvia Siu <ssiu@svnetworks.com>
+signal 2974/udp # Signal
+signal 2974/tcp # Signal
+# Wyatt Williams <wyattw@icall.com>
+fjmpcm 2975/udp # Fujitsu Configuration Management Service
+fjmpcm 2975/tcp # Fujitsu Configuration Management Service
+# Hiroki Kawano <kawano@saint.nm.fujitsu.co.jp>
+cns-srv-port 2976/udp # CNS Server Port
+cns-srv-port 2976/tcp # CNS Server Port
+# Ram Golla <rgolla@cisco.com>
+ttc-etap-ns 2977/udp # TTCs Enterprise Test Access Protocol - NS
+ttc-etap-ns 2977/tcp # TTCs Enterprise Test Access Protocol - NS
+ttc-etap-ds 2978/udp # TTCs Enterprise Test Access Protocol - DS
+ttc-etap-ds 2978/tcp # TTCs Enterprise Test Access Protocol - DS
+# Daniel Becker <beckerd@ttc.com>
+h263-video 2979/udp # H.263 Video Streaming
+h263-video 2979/tcp # H.263 Video Streaming
+# Jauvane C. de Oliveira <jauvane@acm.org>
+wimd 2980/udp # Instant Messaging Service
+wimd 2980/tcp # Instant Messaging Service
+# Kevin Birch <kbirch@pobox.com>
+mylxamport 2981/udp # MYLXAMPORT
+mylxamport 2981/tcp # MYLXAMPORT
+# Wei Gao <wei@mylex.com>
iwb-whiteboard 2982/udp # IWB-WHITEBOARD
iwb-whiteboard 2982/tcp # IWB-WHITEBOARD
# David W. Radcliffe <davidr@adicarte.co.uk>
@@ -7110,18 +7110,18 @@ veritas-vis2 2994/tcp # VERITAS VIS2
idrs 2995/udp # IDRS
idrs 2995/tcp # IDRS
# Jeff Eaton <jeaton@intermec.com>
-vsixml 2996/udp # vsixml
-vsixml 2996/tcp # vsixml
-# Rob Juergens <robj@vsi.com>
+vsixml 2996/udp # vsixml
+vsixml 2996/tcp # vsixml
+# Rob Juergens <robj@vsi.com>
rebol 2997/udp # REBOL
-rebol 2997/tcp # REBOL
+rebol 2997/tcp # REBOL
# Holger Kruse <holger@rebol.net>
-realsecure 2998/udp # Real Secure
-realsecure 2998/tcp # Real Secure
-# Tim Farley <TFarley@iss.net>
-remoteware-un 2999/udp # RemoteWare Unassigned
-remoteware-un 2999/tcp # RemoteWare Unassigned
-# Tim Farley <Tim.Farley@xcellenet.com>
+realsecure 2998/udp # Real Secure
+realsecure 2998/tcp # Real Secure
+# Tim Farley <TFarley@iss.net>
+remoteware-un 2999/udp # RemoteWare Unassigned
+remoteware-un 2999/tcp # RemoteWare Unassigned
+# Tim Farley <Tim.Farley@xcellenet.com>
hbci 3000/udp # HBCI
hbci 3000/tcp # HBCI
# Kurt Haubner <haubner@ibm.net>
@@ -7200,9 +7200,9 @@ csregagent 3022/tcp # CSREGAGENT
# Nedelcho Stanev <nstanev@csoft.bg>
magicnotes 3023/udp # magicnotes
magicnotes 3023/tcp # magicnotes
-# Karl Edwall <karl@magicnotes.com>
+# Karl Edwall <karl@magicnotes.com>
nds_sso 3024/udp # NDS_SSO
-nds_sso 3024/tcp # NDS_SSO
+nds_sso 3024/tcp # NDS_SSO
# Mel Oyler <mel@novell.com>
arepa-raft 3025/udp # Arepa Raft
arepa-raft 3025/tcp # Arepa Raft
@@ -7231,10 +7231,10 @@ pdb 3033/tcp # PDB
# Don Bowman <don@pixstream.com>
osmosis-aeea 3034/udp # Osmosis / Helix (R) AEEA Port
osmosis-aeea 3034/tcp # Osmosis / Helix (R) AEEA Port
-# Larry Atkin <latkin@commongrnd.com>
+# Larry Atkin <latkin@commongrnd.com>
fjsv-gssagt 3035/udp # FJSV gssagt
fjsv-gssagt 3035/tcp # FJSV gssagt
-# Tomoji Koike <koike@ael.fujitsu.co.jp>
+# Tomoji Koike <koike@ael.fujitsu.co.jp>
hagel-dump 3036/udp # Hagel DUMP
hagel-dump 3036/tcp # Hagel DUMP
# Haim Gelfenbeyn <haim@hageltech.com>
@@ -7255,7 +7255,7 @@ di-traceware 3041/tcp # di-traceware
# Carlos Hung <chung@digisle.net>
journee 3042/udp # journee
journee 3042/tcp # journee
-# Kevin Calman <postmaster@journee.com>
+# Kevin Calman <postmaster@journee.com>
brp 3043/udp # BRP
brp 3043/tcp # BRP
# Greg Gee <ggee@hns.com>
@@ -7279,66 +7279,66 @@ nsws 3049/tcp # NSWS
# Ray Gwinn <p00321@psilink.com>
gds_db 3050/udp # gds_db
gds_db 3050/tcp # gds_db
-# Madhukar N. Thakur <mthakur@interbase.com>
-galaxy-server 3051/udp # Galaxy Server
-galaxy-server 3051/tcp # Galaxy Server
-# Michael Andre <mandre@gts-tkts.com>
+# Madhukar N. Thakur <mthakur@interbase.com>
+galaxy-server 3051/udp # Galaxy Server
+galaxy-server 3051/tcp # Galaxy Server
+# Michael Andre <mandre@gts-tkts.com>
apc-3052 3052/udp # APC 3052
apc-3052 3052/tcp # APC 3052
# American Power Conversion <ports@apcc.com>
-dsom-server 3053/udp # dsom-server
-dsom-server 3053/tcp # dsom-server
-# Daniel Sisk <danielr.sisk@pnl.gov>
-amt-cnf-prot 3054/udp # AMT CNF PROT
-amt-cnf-prot 3054/tcp # AMT CNF PROT
-# Marco Marcucci <mmarcucci.amtec@interbusiness.it>
-policyserver 3055/udp # Policy Server
-policyserver 3055/tcp # Policy Server
-# Mark Garti <mgarti@sonusnet.com>
-cdl-server 3056/udp # CDL Server
-cdl-server 3056/tcp # CDL Server
-# Paul Roberts <PaulRoberts@engineer.com>
-goahead-fldup 3057/udp # GoAhead FldUp
-goahead-fldup 3057/tcp # GoAhead FldUp
-# Alan Pickrell <alanp@goahead.com>
-videobeans 3058/udp # videobeans
-videobeans 3058/tcp # videobeans
-# Hiroyuki Takahashi <hiro.takahashi@eng.Sun.COM>
-qsoft 3059/udp # qsoft
-qsoft 3059/tcp # qsoft
-# James Kunz <jkunz@earlhaig.com>
-interserver 3060/udp # interserver
-interserver 3060/tcp # interserver
-# Madhukar N. Thakur <mthakur@interbase.com>
-cautcpd 3061/udp # cautcpd
-cautcpd 3061/tcp # cautcpd
-ncacn-ip-tcp 3062/udp # ncacn-ip-tcp
-ncacn-ip-tcp 3062/tcp # ncacn-ip-tcp
+dsom-server 3053/udp # dsom-server
+dsom-server 3053/tcp # dsom-server
+# Daniel Sisk <danielr.sisk@pnl.gov>
+amt-cnf-prot 3054/udp # AMT CNF PROT
+amt-cnf-prot 3054/tcp # AMT CNF PROT
+# Marco Marcucci <mmarcucci.amtec@interbusiness.it>
+policyserver 3055/udp # Policy Server
+policyserver 3055/tcp # Policy Server
+# Mark Garti <mgarti@sonusnet.com>
+cdl-server 3056/udp # CDL Server
+cdl-server 3056/tcp # CDL Server
+# Paul Roberts <PaulRoberts@engineer.com>
+goahead-fldup 3057/udp # GoAhead FldUp
+goahead-fldup 3057/tcp # GoAhead FldUp
+# Alan Pickrell <alanp@goahead.com>
+videobeans 3058/udp # videobeans
+videobeans 3058/tcp # videobeans
+# Hiroyuki Takahashi <hiro.takahashi@eng.Sun.COM>
+qsoft 3059/udp # qsoft
+qsoft 3059/tcp # qsoft
+# James Kunz <jkunz@earlhaig.com>
+interserver 3060/udp # interserver
+interserver 3060/tcp # interserver
+# Madhukar N. Thakur <mthakur@interbase.com>
+cautcpd 3061/udp # cautcpd
+cautcpd 3061/tcp # cautcpd
+ncacn-ip-tcp 3062/udp # ncacn-ip-tcp
+ncacn-ip-tcp 3062/tcp # ncacn-ip-tcp
ncadg-ip-udp 3063/udp # ncadg-ip-udp
-ncadg-ip-udp 3063/tcp # ncadg-ip-udp
-# Gabi Kalmar <kalga01@cai.com>
+ncadg-ip-udp 3063/tcp # ncadg-ip-udp
+# Gabi Kalmar <kalga01@cai.com>
rprt 3064/udp # Remote Port Redirector
rprt 3064/tcp # Remote Port Redirector
# Robin Johnston <robinj@learningtree.com>
-slinterbase 3065/udp # slinterbase
-slinterbase 3065/tcp # slinterbase
-# Bie Tie <stie@interbase.com>
+slinterbase 3065/udp # slinterbase
+slinterbase 3065/tcp # slinterbase
+# Bie Tie <stie@interbase.com>
netattachsdmp 3066/udp # NETATTACHSDMP
netattachsdmp 3066/tcp # NETATTACHSDMP
# Mike Young <myong@netattach.com>
fjhpjp 3067/udp # FJHPJP
fjhpjp 3067/tcp # FJHPJP
# Ryozo Furutani <furutani@np.lps.cs.fujitsu.co.jp>
-ls3bcast 3068/udp # ls3 Broadcast
-ls3bcast 3068/tcp # ls3 Broadcast
-ls3 3069/udp # ls3
-ls3 3069/tcp # ls3
-# Andrei Tsyganenko <atsyganenko@powerware.com>
+ls3bcast 3068/udp # ls3 Broadcast
+ls3bcast 3068/tcp # ls3 Broadcast
+ls3 3069/udp # ls3
+ls3 3069/tcp # ls3
+# Andrei Tsyganenko <atsyganenko@powerware.com>
mgxswitch 3070/udp # MGXSWITCH
mgxswitch 3070/tcp # MGXSWITCH
# George Walter <george.walter@ascentialsoftware.com>
csd-mgmt-port 3071/udp # ContinuStor Manager Port
-csd-mgmt-port 3071/tcp # ContinuStor Manager Port
+csd-mgmt-port 3071/tcp # ContinuStor Manager Port
csd-monitor 3072/udp # ContinuStor Monitor Port
csd-monitor 3072/tcp # ContinuStor Monitor Port
# Ray Jantz <ray.jantz@lsil.com>
@@ -7360,17 +7360,17 @@ orbix-cfg-ssl 3078/tcp # Orbix 2000 Locator SSL
lv-frontpanel 3079/udp # LV Front Panel
lv-frontpanel 3079/tcp # LV Front Panel
# Darshan Shah <darshan.shah@ni.com>
-stm_pproc 3080/udp # stm_pproc
-stm_pproc 3080/tcp # stm_pproc
-# Paul McGinnis <pmcginnis@server.stmi.com>
-tl1-lv 3081/udp # TL1-LV
-tl1-lv 3081/tcp # TL1-LV
-tl1-raw 3082/udp # TL1-RAW
-tl1-raw 3082/tcp # TL1-RAW
-tl1-telnet 3083/udp # TL1-TELNET
-tl1-telnet 3083/tcp # TL1-TELNET
-# SONET Internetworking Forum (SIF)
-# <bwarijsman@lucent.com> - SONET Contact
+stm_pproc 3080/udp # stm_pproc
+stm_pproc 3080/tcp # stm_pproc
+# Paul McGinnis <pmcginnis@server.stmi.com>
+tl1-lv 3081/udp # TL1-LV
+tl1-lv 3081/tcp # TL1-LV
+tl1-raw 3082/udp # TL1-RAW
+tl1-raw 3082/tcp # TL1-RAW
+tl1-telnet 3083/udp # TL1-TELNET
+tl1-telnet 3083/tcp # TL1-TELNET
+# SONET Internetworking Forum (SIF)
+# <bwarijsman@lucent.com> - SONET Contact
itm-mccs 3084/udp # ITM-MCCS
itm-mccs 3084/tcp # ITM-MCCS
# Alain Callebaut <ac@itmasters.com>
@@ -7381,7 +7381,7 @@ jdl-dbkitchen 3086/udp # JDL-DBKitchen
jdl-dbkitchen 3086/tcp # JDL-DBKitchen
# Hideo Wakabayashi <hiwaka@alles.or.jp>
asoki-sma 3087/udp # Asoki SMA
-asoki-sma 3087/tcp # Asoki SMA
+asoki-sma 3087/tcp # Asoki SMA
# Andrew Mossberg <amossberg@asoki.net>
xdtp 3088/udp # eXtensible Data Transfer Protocol
xdtp 3088/tcp # eXtensible Data Transfer Protocol
@@ -7433,17 +7433,17 @@ autocuesmi 3103/tcp # Autocue SMI Protocol
autocuetime 3104/udp # Autocue Time Service
autocuelog 3104/tcp # Autocue Logger Protocol
# Geoff Back <geoff@autocue.co.uk>
-cardbox 3105/udp # Cardbox
-cardbox 3105/tcp # Cardbox
-cardbox-http 3106/udp # Cardbox HTTP
-cardbox-http 3106/tcp # Cardbox HTTP
-# Martin Kochanski <martin@cardbox.co.uk>
-business 3107/udp # Business protocol
-business 3107/tcp # Business protocol
-geolocate 3108/udp # Geolocate protocol
-geolocate 3108/tcp # Geolocate protocol
-personnel 3109/udp # Personnel protocol
-personnel 3109/tcp # Personnel protocol
+cardbox 3105/udp # Cardbox
+cardbox 3105/tcp # Cardbox
+cardbox-http 3106/udp # Cardbox HTTP
+cardbox-http 3106/tcp # Cardbox HTTP
+# Martin Kochanski <martin@cardbox.co.uk>
+business 3107/udp # Business protocol
+business 3107/tcp # Business protocol
+geolocate 3108/udp # Geolocate protocol
+geolocate 3108/tcp # Geolocate protocol
+personnel 3109/udp # Personnel protocol
+personnel 3109/tcp # Personnel protocol
# William Randolph Royere III
# <william@royere.net>
sim-control 3110/udp # simulator control port
@@ -7504,12 +7504,12 @@ ndl-aas 3128/tcp # Active API Server Port
netport-id 3129/udp # NetPort Discovery Port
netport-id 3129/tcp # NetPort Discovery Port
# P.T.K. Farrar <farrarp@teccon.co.uk>
-icpv2 3130/udp # ICPv2
-icpv2 3130/tcp # ICPv2
-# Duane Wessels <wessels@nlanr.net>
-netbookmark 3131/udp # Net Book Mark
-netbookmark 3131/tcp # Net Book Mark
-# Yiftach Ravid <yiftach@haifa.vnet.ibm.com>
+icpv2 3130/udp # ICPv2
+icpv2 3130/tcp # ICPv2
+# Duane Wessels <wessels@nlanr.net>
+netbookmark 3131/udp # Net Book Mark
+netbookmark 3131/tcp # Net Book Mark
+# Yiftach Ravid <yiftach@haifa.vnet.ibm.com>
ms-rule-engine 3132/udp # Microsoft Business Rule Engine Update Service
ms-rule-engine 3132/tcp # Microsoft Business Rule Engine Update Service
# Anush Kumar <anushk@microsoft.com>
@@ -7540,40 +7540,40 @@ ariliamulti 3140/tcp # Arilia Multiplexor
vmodem 3141/udp # VMODEM
vmodem 3141/tcp # VMODEM
# Ray Gwinn <p00321@psilink.com>
-rdc-wh-eos 3142/udp # RDC WH EOS
-rdc-wh-eos 3142/tcp # RDC WH EOS
-# Udi Nir <udi_nir@ncc.co.il>
-seaview 3143/udp # Sea View
-seaview 3143/tcp # Sea View
-# Jim Flaherty <jim_e_flaherty@notes.seagate.com>
-tarantella 3144/udp # Tarantella
-tarantella 3144/tcp # Tarantella
-# Roger Binns <rogerb@sco.com>
-csi-lfap 3145/udp # CSI-LFAP
-csi-lfap 3145/tcp # CSI-LFAP
-# Paul Amsden <amsden@.ctron.com>
+rdc-wh-eos 3142/udp # RDC WH EOS
+rdc-wh-eos 3142/tcp # RDC WH EOS
+# Udi Nir <udi_nir@ncc.co.il>
+seaview 3143/udp # Sea View
+seaview 3143/tcp # Sea View
+# Jim Flaherty <jim_e_flaherty@notes.seagate.com>
+tarantella 3144/udp # Tarantella
+tarantella 3144/tcp # Tarantella
+# Roger Binns <rogerb@sco.com>
+csi-lfap 3145/udp # CSI-LFAP
+csi-lfap 3145/tcp # CSI-LFAP
+# Paul Amsden <amsden@.ctron.com>
bears-02 3146/udp # bears-02
bears-02 3146/tcp # bears-02
# Bruce McKinnon <brucemck@bearsolutions.com.au>
-rfio 3147/udp # RFIO
-rfio 3147/tcp # RFIO
-# Frederic Hemmer <Frederic.Hemmer@cern.ch>
-nm-game-admin 3148/udp # NetMike Game Administrator
-nm-game-admin 3148/tcp # NetMike Game Administrator
-nm-game-server 3149/udp # NetMike Game Server
-nm-game-server 3149/tcp # NetMike Game Server
-nm-asses-admin 3150/udp # NetMike Assessor Administrator
-nm-asses-admin 3150/tcp # NetMike Assessor Administrator
-nm-assessor 3151/udp # NetMike Assessor
-nm-assessor 3151/tcp # NetMike Assessor
-# Andrew Sharpe <help@smartsims.com>
+rfio 3147/udp # RFIO
+rfio 3147/tcp # RFIO
+# Frederic Hemmer <Frederic.Hemmer@cern.ch>
+nm-game-admin 3148/udp # NetMike Game Administrator
+nm-game-admin 3148/tcp # NetMike Game Administrator
+nm-game-server 3149/udp # NetMike Game Server
+nm-game-server 3149/tcp # NetMike Game Server
+nm-asses-admin 3150/udp # NetMike Assessor Administrator
+nm-asses-admin 3150/tcp # NetMike Assessor Administrator
+nm-assessor 3151/udp # NetMike Assessor
+nm-assessor 3151/tcp # NetMike Assessor
+# Andrew Sharpe <help@smartsims.com>
feitianrockey 3152/udp # FeiTian Port
feitianrockey 3152/tcp # FeiTian Port
# Huang Yu <llw@ftsafe.com>
s8-client-port 3153/udp # S8Cargo Client Port
s8-client-port 3153/tcp # S8Cargo Client Port
# Jon S. Kyle <JKyle@SpeedwaySoftware.com>
-ccmrmi 3154/udp # ON RMI Registry
+ccmrmi 3154/udp # ON RMI Registry
ccmrmi 3154/tcp # ON RMI Registry
# Ram Sudama <rsudama@on.com>
jpegmpeg 3155/udp # JpegMpeg Port
@@ -7601,10 +7601,10 @@ sflm 3162/udp # SFLM
sflm 3162/tcp # SFLM
# Keith Turner <support@silvaco.com>
res-sap 3163/udp # RES-SAP
-res-sap 3163/tcp # RES-SAP
+res-sap 3163/tcp # RES-SAP
# Bob Janssen <bob@res.nl>
imprs 3164/udp # IMPRS
-imprs 3164/tcp # IMPRS
+imprs 3164/tcp # IMPRS
# Lars Bohn <Lars.Bohn@nokia.com>
newgenpay 3165/udp # Newgenpay Engine Service
newgenpay 3165/tcp # Newgenpay Engine Service
@@ -7618,7 +7618,7 @@ poweronnud 3168/udp # poweronnud
poweronnud 3168/tcp # poweronnud
# Paul Cone <paul@poweronsoftware.com>
serverview-as 3169/udp # SERVERVIEW-AS
-serverview-as 3169/tcp # SERVERVIEW-AS
+serverview-as 3169/tcp # SERVERVIEW-AS
serverview-asn 3170/udp # SERVERVIEW-ASN
serverview-asn 3170/tcp # SERVERVIEW-ASN
serverview-gf 3171/udp # SERVERVIEW-GF
@@ -7647,14 +7647,14 @@ radclientport 3178/tcp # Radiance UltraEdge Port
h2gf-w-2m 3179/udp # H2GF W.2m Handover prot.
h2gf-w-2m 3179/tcp # H2GF W.2m Handover prot.
# Arne Norefors <Arne.Norefors@ericsson.com>
-mc-brk-srv 3180/udp # Millicent Broker Server
-mc-brk-srv 3180/tcp # Millicent Broker Server
-# Steve Glassman <steveg@pa.dec.com>
+mc-brk-srv 3180/udp # Millicent Broker Server
+mc-brk-srv 3180/tcp # Millicent Broker Server
+# Steve Glassman <steveg@pa.dec.com>
bmcpatrolagent 3181/udp # BMC Patrol Agent
-bmcpatrolagent 3181/tcp # BMC Patrol Agent
+bmcpatrolagent 3181/tcp # BMC Patrol Agent
bmcpatrolrnvu 3182/udp # BMC Patrol Rendezvous
-bmcpatrolrnvu 3182/tcp # BMC Patrol Rendezvous
-# Eric Anderson <eric_anderson@bmc.com>
+bmcpatrolrnvu 3182/tcp # BMC Patrol Rendezvous
+# Eric Anderson <eric_anderson@bmc.com>
cops-tls 3183/udp # COPS/TLS
cops-tls 3183/tcp # COPS/TLS
# Mark Stevens <mstevens@ellacoya.com>
@@ -7924,108 +7924,108 @@ ordinox-server 3274/tcp # Ordinox Server
samd 3275/udp # SAMD
samd 3275/tcp # SAMD
# Edgar Circenis <ec@fc.hp.com>
-maxim-asics 3276/udp # Maxim ASICs
-maxim-asics 3276/tcp # Maxim ASICs
-# Dave Inman <davei@mxim.com>
-awg-proxy 3277/udp # AWG Proxy
-awg-proxy 3277/tcp # AWG Proxy
-# Alex McDonald <alexm@an.hp.com>
-lkcmserver 3278/udp # LKCM Server
-lkcmserver 3278/tcp # LKCM Server
-# Javier Jimenez
-admind 3279/udp # admind
-admind 3279/tcp # admind
-# Jeff Haynes <haynes@chistech.com>
-vs-server 3280/udp # VS Server
-vs-server 3280/tcp # VS Server
-# Scott Godlew <Scott@godlew.com>
-sysopt 3281/udp # SYSOPT
-sysopt 3281/tcp # SYSOPT
-# Tony Hoffman <ajh@unx.dec.com>
-datusorb 3282/udp # Datusorb
-datusorb 3282/tcp # Datusorb
-# Thomas Martin <thomas@datus-usa.com>
-net-assistant 3283/udp # Net Assistant
-net-assistant 3283/tcp # Net Assistant
-# Michael Stein <mvs@apple.com>
-4talk 3284/udp # 4Talk
-4talk 3284/tcp # 4Talk
-# Tony Bushnell <tony_bushnell@four-sight.co.uk>
-plato 3285/udp # Plato
-plato 3285/tcp # Plato
-# Jim Battin <battin@tro.com>
-e-net 3286/udp # E-Net
-e-net 3286/tcp # E-Net
-# Steven Grigsby <sgrigsby@austin.eent.com>
-directvdata 3287/udp # DIRECTVDATA
-directvdata 3287/tcp # DIRECTVDATA
-# Michael Friedman <mfr1@worldnet.att.net>
-cops 3288/udp # COPS
-cops 3288/tcp # COPS
-# Shai Herzog <herzog@iphighway.com>
-enpc 3289/udp # ENPC
-enpc 3289/tcp # ENPC
-# SEIKO EPSON <Ishida.Hitoshi@exc.epson.co.jp>
-caps-lm 3290/udp # CAPS LOGISTICS TOOLKIT - LM
-caps-lm 3290/tcp # CAPS LOGISTICS TOOLKIT - LM
-# Joseph Krebs <joek@caps.com>
-sah-lm 3291/udp # S A Holditch & Associates - LM
-sah-lm 3291/tcp # S A Holditch & Associates - LM
-# Randy Hudgens <rhh@nmail.holditch.com>
-cart-o-rama 3292/udp # Cart O Rama
-cart-o-rama 3292/tcp # Cart O Rama
-# Phillip Dillinger <Phillip.Dillinger@sealabs.com>
-fg-fps 3293/udp # fg-fps
-fg-fps 3293/tcp # fg-fps
-fg-gip 3294/udp # fg-gip
-fg-gip 3294/tcp # fg-gip
-# Jean-Marc Frailong <jmf@freegate.net>
-dyniplookup 3295/udp # Dynamic IP Lookup
-dyniplookup 3295/tcp # Dynamic IP Lookup
-# Eugene Osovetsky <eugeneo@geocities.com>
-rib-slm 3296/udp # Rib License Manager
-rib-slm 3296/tcp # Rib License Manager
-# Kristean Heisler <kh@rib.de>
-cytel-lm 3297/udp # Cytel License Manager
-cytel-lm 3297/tcp # Cytel License Manager
-# Yogesh P. Gajjar <yogesh@cytel.com>
+maxim-asics 3276/udp # Maxim ASICs
+maxim-asics 3276/tcp # Maxim ASICs
+# Dave Inman <davei@mxim.com>
+awg-proxy 3277/udp # AWG Proxy
+awg-proxy 3277/tcp # AWG Proxy
+# Alex McDonald <alexm@an.hp.com>
+lkcmserver 3278/udp # LKCM Server
+lkcmserver 3278/tcp # LKCM Server
+# Javier Jimenez
+admind 3279/udp # admind
+admind 3279/tcp # admind
+# Jeff Haynes <haynes@chistech.com>
+vs-server 3280/udp # VS Server
+vs-server 3280/tcp # VS Server
+# Scott Godlew <Scott@godlew.com>
+sysopt 3281/udp # SYSOPT
+sysopt 3281/tcp # SYSOPT
+# Tony Hoffman <ajh@unx.dec.com>
+datusorb 3282/udp # Datusorb
+datusorb 3282/tcp # Datusorb
+# Thomas Martin <thomas@datus-usa.com>
+net-assistant 3283/udp # Net Assistant
+net-assistant 3283/tcp # Net Assistant
+# Michael Stein <mvs@apple.com>
+4talk 3284/udp # 4Talk
+4talk 3284/tcp # 4Talk
+# Tony Bushnell <tony_bushnell@four-sight.co.uk>
+plato 3285/udp # Plato
+plato 3285/tcp # Plato
+# Jim Battin <battin@tro.com>
+e-net 3286/udp # E-Net
+e-net 3286/tcp # E-Net
+# Steven Grigsby <sgrigsby@austin.eent.com>
+directvdata 3287/udp # DIRECTVDATA
+directvdata 3287/tcp # DIRECTVDATA
+# Michael Friedman <mfr1@worldnet.att.net>
+cops 3288/udp # COPS
+cops 3288/tcp # COPS
+# Shai Herzog <herzog@iphighway.com>
+enpc 3289/udp # ENPC
+enpc 3289/tcp # ENPC
+# SEIKO EPSON <Ishida.Hitoshi@exc.epson.co.jp>
+caps-lm 3290/udp # CAPS LOGISTICS TOOLKIT - LM
+caps-lm 3290/tcp # CAPS LOGISTICS TOOLKIT - LM
+# Joseph Krebs <joek@caps.com>
+sah-lm 3291/udp # S A Holditch & Associates - LM
+sah-lm 3291/tcp # S A Holditch & Associates - LM
+# Randy Hudgens <rhh@nmail.holditch.com>
+cart-o-rama 3292/udp # Cart O Rama
+cart-o-rama 3292/tcp # Cart O Rama
+# Phillip Dillinger <Phillip.Dillinger@sealabs.com>
+fg-fps 3293/udp # fg-fps
+fg-fps 3293/tcp # fg-fps
+fg-gip 3294/udp # fg-gip
+fg-gip 3294/tcp # fg-gip
+# Jean-Marc Frailong <jmf@freegate.net>
+dyniplookup 3295/udp # Dynamic IP Lookup
+dyniplookup 3295/tcp # Dynamic IP Lookup
+# Eugene Osovetsky <eugeneo@geocities.com>
+rib-slm 3296/udp # Rib License Manager
+rib-slm 3296/tcp # Rib License Manager
+# Kristean Heisler <kh@rib.de>
+cytel-lm 3297/udp # Cytel License Manager
+cytel-lm 3297/tcp # Cytel License Manager
+# Yogesh P. Gajjar <yogesh@cytel.com>
deskview 3298/udp # DeskView
deskview 3298/tcp # DeskView
# Manfred Randelzofer
# <manfred.randelzofer@fujitsu-siemens.com>
-pdrncs 3299/udp # pdrncs
-pdrncs 3299/tcp # pdrncs
-# Paul Wissenbach <paulwi@vnd.tek.com>
-########### 3300-3301 Unauthorized Use by SAP R/3 ######
-mcs-fastmail 3302/udp # MCS Fastmail
-mcs-fastmail 3302/tcp # MCS Fastmail
-# Patti Jo Newsom <pjn@mcsdallas.com>
+pdrncs 3299/udp # pdrncs
+pdrncs 3299/tcp # pdrncs
+# Paul Wissenbach <paulwi@vnd.tek.com>
+########### 3300-3301 Unauthorized Use by SAP R/3 ######
+mcs-fastmail 3302/udp # MCS Fastmail
+mcs-fastmail 3302/tcp # MCS Fastmail
+# Patti Jo Newsom <pjn@mcsdallas.com>
opsession-clnt 3303/udp # OP Session Client
-opsession-clnt 3303/tcp # OP Session Client
+opsession-clnt 3303/tcp # OP Session Client
opsession-srvr 3304/udp # OP Session Server
opsession-srvr 3304/tcp # OP Session Server
-# Amir Blich <amir@netmanage.co.il>
-odette-ftp 3305/udp # ODETTE-FTP
-odette-ftp 3305/tcp # ODETTE-FTP
-# David Nash <dnash@ford.com>
-mysql 3306/udp # MySQL
-mysql 3306/tcp # MySQL
-# Monty <monty@analytikerna.se>
-opsession-prxy 3307/udp # OP Session Proxy
-opsession-prxy 3307/tcp # OP Session Proxy
-# Amir Blich <amir@netmanage.co.il>
-tns-server 3308/udp # TNS Server
-tns-server 3308/tcp # TNS Server
-tns-adv 3309/udp # TNS ADV
-tns-adv 3309/tcp # TNS ADV
-# Jerome Albin <albin@taec.enet.dec.com>
-dyna-access 3310/udp # Dyna Access
-dyna-access 3310/tcp # Dyna Access
-# Dave Belliveau
-# <DaveBelliveau@cornerstonesoftware.com>
-mcns-tel-ret 3311/udp # MCNS Tel Ret
-mcns-tel-ret 3311/tcp # MCNS Tel Ret
-# Randall Atkinson <rja@home.net>
+# Amir Blich <amir@netmanage.co.il>
+odette-ftp 3305/udp # ODETTE-FTP
+odette-ftp 3305/tcp # ODETTE-FTP
+# David Nash <dnash@ford.com>
+mysql 3306/udp # MySQL
+mysql 3306/tcp # MySQL
+# Monty <monty@analytikerna.se>
+opsession-prxy 3307/udp # OP Session Proxy
+opsession-prxy 3307/tcp # OP Session Proxy
+# Amir Blich <amir@netmanage.co.il>
+tns-server 3308/udp # TNS Server
+tns-server 3308/tcp # TNS Server
+tns-adv 3309/udp # TNS ADV
+tns-adv 3309/tcp # TNS ADV
+# Jerome Albin <albin@taec.enet.dec.com>
+dyna-access 3310/udp # Dyna Access
+dyna-access 3310/tcp # Dyna Access
+# Dave Belliveau
+# <DaveBelliveau@cornerstonesoftware.com>
+mcns-tel-ret 3311/udp # MCNS Tel Ret
+mcns-tel-ret 3311/tcp # MCNS Tel Ret
+# Randall Atkinson <rja@home.net>
appman-server 3312/udp # Application Management Server
appman-server 3312/tcp # Application Management Server
uorb 3313/udp # Unify Object Broker
@@ -8033,225 +8033,225 @@ uorb 3313/tcp # Unify Object Broker
uohost 3314/udp # Unify Object Host
uohost 3314/tcp # Unify Object Host
# Duane Gibson <ianaportmaster@unify.com>
-cdid 3315/udp # CDID
-cdid 3315/tcp # CDID
-# Andrew Borisov <hdr@chat.ru>
-aicc-cmi 3316/udp # AICC/CMI
-aicc-cmi 3316/tcp # AICC/CMI
-# William McDonald <billmc@atc.boeing.com>
-vsaiport 3317/udp # VSAI PORT
-vsaiport 3317/tcp # VSAI PORT
-# Rieko Asai <asai@isl.mei.co.jp>
-ssrip 3318/udp # Swith to Swith Routing Information Protocol
-ssrip 3318/tcp # Swith to Swith Routing Information Protocol
-# Baba Hidekazu <baba@flare.nd.net.fujitsu.co.jp>
-sdt-lmd 3319/udp # SDT License Manager
-sdt-lmd 3319/tcp # SDT License Manager
-# Salvo Nassisi <sdtech@tin.it>
-officelink2000 3320/udp # Office Link 2000
-officelink2000 3320/tcp # Office Link 2000
-# Mike Balch <mbalch@teltone.com>
-vnsstr 3321/udp # VNSSTR
-vnsstr 3321/tcp # VNSSTR
-# Takeshi Ohmura <ohmura@isl.mei.co.jp>
-# Bob Braden <braden@isi.edu>
-sftu 3326/udp # SFTU
-sftu 3326/tcp # SFTU
-# Eduardo Rosenberg de Moura <eduardor@spacenet.com.br>
-bbars 3327/udp # BBARS
-bbars 3327/tcp # BBARS
-# Lou Harris <lharris@outlx.bandl.com>
-egptlm 3328/udp # Eaglepoint License Manager
-egptlm 3328/tcp # Eaglepoint License Manager
-# Dave Benton <dave.benton@eaglepoint.com>
+cdid 3315/udp # CDID
+cdid 3315/tcp # CDID
+# Andrew Borisov <hdr@chat.ru>
+aicc-cmi 3316/udp # AICC/CMI
+aicc-cmi 3316/tcp # AICC/CMI
+# William McDonald <billmc@atc.boeing.com>
+vsaiport 3317/udp # VSAI PORT
+vsaiport 3317/tcp # VSAI PORT
+# Rieko Asai <asai@isl.mei.co.jp>
+ssrip 3318/udp # Swith to Swith Routing Information Protocol
+ssrip 3318/tcp # Swith to Swith Routing Information Protocol
+# Baba Hidekazu <baba@flare.nd.net.fujitsu.co.jp>
+sdt-lmd 3319/udp # SDT License Manager
+sdt-lmd 3319/tcp # SDT License Manager
+# Salvo Nassisi <sdtech@tin.it>
+officelink2000 3320/udp # Office Link 2000
+officelink2000 3320/tcp # Office Link 2000
+# Mike Balch <mbalch@teltone.com>
+vnsstr 3321/udp # VNSSTR
+vnsstr 3321/tcp # VNSSTR
+# Takeshi Ohmura <ohmura@isl.mei.co.jp>
+# Bob Braden <braden@isi.edu>
+sftu 3326/udp # SFTU
+sftu 3326/tcp # SFTU
+# Eduardo Rosenberg de Moura <eduardor@spacenet.com.br>
+bbars 3327/udp # BBARS
+bbars 3327/tcp # BBARS
+# Lou Harris <lharris@outlx.bandl.com>
+egptlm 3328/udp # Eaglepoint License Manager
+egptlm 3328/tcp # Eaglepoint License Manager
+# Dave Benton <dave.benton@eaglepoint.com>
hp-device-disc 3329/udp # HP Device Disc
hp-device-disc 3329/tcp # HP Device Disc
-# Shivaun Albright <shivaun_albright@hp.com>
+# Shivaun Albright <shivaun_albright@hp.com>
mcs-calypsoicf 3330/udp # MCS Calypso ICF
mcs-calypsoicf 3330/tcp # MCS Calypso ICF
-mcs-messaging 3331/udp # MCS Messaging
-mcs-messaging 3331/tcp # MCS Messaging
-mcs-mailsvr 3332/udp # MCS Mail Server
-mcs-mailsvr 3332/tcp # MCS Mail Server
-# Patti Jo Newsom <pjn@mcsdallas.com>
+mcs-messaging 3331/udp # MCS Messaging
+mcs-messaging 3331/tcp # MCS Messaging
+mcs-mailsvr 3332/udp # MCS Mail Server
+mcs-mailsvr 3332/tcp # MCS Mail Server
+# Patti Jo Newsom <pjn@mcsdallas.com>
dec-notes 3333/udp # DEC Notes
dec-notes 3333/tcp # DEC Notes
# Kim Moraros <moraros@via.enet.dec.com>
-directv-web 3334/udp # Direct TV Webcasting
-directv-web 3334/tcp # Direct TV Webcasting
-directv-soft 3335/udp # Direct TV Software Updates
-directv-soft 3335/tcp # Direct TV Software Updates
-directv-tick 3336/udp # Direct TV Tickers
-directv-tick 3336/tcp # Direct TV Tickers
-directv-catlg 3337/udp # Direct TV Data Catalog
-directv-catlg 3337/tcp # Direct TV Data Catalog
-# Michael Friedman <mfr1@worldnet.att.net>
-anet-b 3338/udp # OMF data b
-anet-b 3338/tcp # OMF data b
-anet-l 3339/udp # OMF data l
-anet-l 3339/tcp # OMF data l
-anet-m 3340/udp # OMF data m
-anet-m 3340/tcp # OMF data m
-anet-h 3341/udp # OMF data h
-anet-h 3341/tcp # OMF data h
-# Per Sahlqvist <psahlqvi@sw.seisy.abb.se>
-webtie 3342/udp # WebTIE
-webtie 3342/tcp # WebTIE
-# Kevin Frender <kbf@ngdc.noaa.gov>
-ms-cluster-net 3343/udp # MS Cluster Net
-ms-cluster-net 3343/tcp # MS Cluster Net
-# Mike Massa <mikemas@microsoft.com>
+directv-web 3334/udp # Direct TV Webcasting
+directv-web 3334/tcp # Direct TV Webcasting
+directv-soft 3335/udp # Direct TV Software Updates
+directv-soft 3335/tcp # Direct TV Software Updates
+directv-tick 3336/udp # Direct TV Tickers
+directv-tick 3336/tcp # Direct TV Tickers
+directv-catlg 3337/udp # Direct TV Data Catalog
+directv-catlg 3337/tcp # Direct TV Data Catalog
+# Michael Friedman <mfr1@worldnet.att.net>
+anet-b 3338/udp # OMF data b
+anet-b 3338/tcp # OMF data b
+anet-l 3339/udp # OMF data l
+anet-l 3339/tcp # OMF data l
+anet-m 3340/udp # OMF data m
+anet-m 3340/tcp # OMF data m
+anet-h 3341/udp # OMF data h
+anet-h 3341/tcp # OMF data h
+# Per Sahlqvist <psahlqvi@sw.seisy.abb.se>
+webtie 3342/udp # WebTIE
+webtie 3342/tcp # WebTIE
+# Kevin Frender <kbf@ngdc.noaa.gov>
+ms-cluster-net 3343/udp # MS Cluster Net
+ms-cluster-net 3343/tcp # MS Cluster Net
+# Mike Massa <mikemas@microsoft.com>
bnt-manager 3344/udp # BNT Manager
bnt-manager 3344/tcp # BNT Manager
# Brian J. Ives <Brian.Ives@BadgerNT.com>
-influence 3345/udp # Influence
-influence 3345/tcp # Influence
-# Russ Ferriday <russf@topia.com>
+influence 3345/udp # Influence
+influence 3345/tcp # Influence
+# Russ Ferriday <russf@topia.com>
trnsprntproxy 3346/udp # Trnsprnt Proxy
-trnsprntproxy 3346/tcp # Trnsprnt Proxy
-# Grant Kirby <grant_kirby@ccm.al.intel.com>
-phoenix-rpc 3347/udp # Phoenix RPC
-phoenix-rpc 3347/tcp # Phoenix RPC
-# Ian Anderson <ian_anderson@phoenix.com>
-pangolin-laser 3348/udp # Pangolin Laser
-pangolin-laser 3348/tcp # Pangolin Laser
-# William Benner <William_Benner@msn.com>
+trnsprntproxy 3346/tcp # Trnsprnt Proxy
+# Grant Kirby <grant_kirby@ccm.al.intel.com>
+phoenix-rpc 3347/udp # Phoenix RPC
+phoenix-rpc 3347/tcp # Phoenix RPC
+# Ian Anderson <ian_anderson@phoenix.com>
+pangolin-laser 3348/udp # Pangolin Laser
+pangolin-laser 3348/tcp # Pangolin Laser
+# William Benner <William_Benner@msn.com>
chevinservices 3349/udp # Chevin Services
-chevinservices 3349/tcp # Chevin Services
-# Gus McNaughton <gus@chevin.com>
-findviatv 3350/udp # FINDVIATV
-findviatv 3350/tcp # FINDVIATV
-# Oran Davis <oran@8x8.com>
+chevinservices 3349/tcp # Chevin Services
+# Gus McNaughton <gus@chevin.com>
+findviatv 3350/udp # FINDVIATV
+findviatv 3350/tcp # FINDVIATV
+# Oran Davis <oran@8x8.com>
btrieve 3351/udp # Btrieve port
btrieve 3351/tcp # Btrieve port
ssql 3352/udp # Scalable SQL
ssql 3352/tcp # Scalable SQL
# Chuck Talk <ctalk@pervasive.com>
-fatpipe 3353/udp # FATPIPE
-fatpipe 3353/tcp # FATPIPE
-# Sanchaita Datta <sdatta@ragula.com>
-suitjd 3354/udp # SUITJD
-suitjd 3354/tcp # SUITJD
-# Todd Moyer <tsm@unx.dec.com>
-ordinox-dbase 3355/udp # Ordinox Dbase
-ordinox-dbase 3355/tcp # Ordinox Dbase
-# Guy Litourneau <gletourneau@ordinox.com>
-upnotifyps 3356/udp # UPNOTIFYPS
-upnotifyps 3356/tcp # UPNOTIFYPS
-# Mark Fox <markf@uplanet.com>
-adtech-test 3357/udp # Adtech Test IP
-adtech-test 3357/tcp # Adtech Test IP
-# Robin Uyeshiro <robin_u@adtech-inc.com>
-mpsysrmsvr 3358/udp # Mp Sys Rmsvr
-mpsysrmsvr 3358/tcp # Mp Sys Rmsvr
-# Hiroyuki Kawabuchi <buchi@ael.fujitsu.co.jp>
-wg-netforce 3359/udp # WG NetForce
-wg-netforce 3359/tcp # WG NetForce
-# Lee Wheat <wheat@wg.com>
-kv-server 3360/udp # KV Server
-kv-server 3360/tcp # KV Server
-kv-agent 3361/udp # KV Agent
-kv-agent 3361/tcp # KV Agent
-# Thomas Soranno <tom_soranno@cipartners.com>
-dj-ilm 3362/udp # DJ ILM
-dj-ilm 3362/tcp # DJ ILM
-# Don Tyson
-nati-vi-server 3363/udp # NATI Vi Server
-nati-vi-server 3363/tcp # NATI Vi Server
-# Robert Dye <rob@natinst.com>
-creativeserver 3364/udp # Creative Server
-creativeserver 3364/tcp # Creative Server
-contentserver 3365/udp # Content Server
-contentserver 3365/tcp # Content Server
-creativepartnr 3366/udp # Creative Partner
-creativepartnr 3366/tcp # Creative Partner
-# Jesus Ortiz <Jesus_A._Ortiz@notes.emotion.com>
-# Scott Engel <ScottX_Engel@ccm.jf.intel.com>
-tip2 3372/udp # TIP 2
-tip2 3372/tcp # TIP 2
-# Keith Evans <keith@loc252.tandem.com>
-lavenir-lm 3373/udp # Lavenir License Manager
-lavenir-lm 3373/tcp # Lavenir License Manager
-# Marius Matioc <marius@lavenir.com>
-cluster-disc 3374/udp # Cluster Disc
-cluster-disc 3374/tcp # Cluster Disc
-# Jeff Hughes <Jeff.Hughes@columbiasc.ncr.com>
+fatpipe 3353/udp # FATPIPE
+fatpipe 3353/tcp # FATPIPE
+# Sanchaita Datta <sdatta@ragula.com>
+suitjd 3354/udp # SUITJD
+suitjd 3354/tcp # SUITJD
+# Todd Moyer <tsm@unx.dec.com>
+ordinox-dbase 3355/udp # Ordinox Dbase
+ordinox-dbase 3355/tcp # Ordinox Dbase
+# Guy Litourneau <gletourneau@ordinox.com>
+upnotifyps 3356/udp # UPNOTIFYPS
+upnotifyps 3356/tcp # UPNOTIFYPS
+# Mark Fox <markf@uplanet.com>
+adtech-test 3357/udp # Adtech Test IP
+adtech-test 3357/tcp # Adtech Test IP
+# Robin Uyeshiro <robin_u@adtech-inc.com>
+mpsysrmsvr 3358/udp # Mp Sys Rmsvr
+mpsysrmsvr 3358/tcp # Mp Sys Rmsvr
+# Hiroyuki Kawabuchi <buchi@ael.fujitsu.co.jp>
+wg-netforce 3359/udp # WG NetForce
+wg-netforce 3359/tcp # WG NetForce
+# Lee Wheat <wheat@wg.com>
+kv-server 3360/udp # KV Server
+kv-server 3360/tcp # KV Server
+kv-agent 3361/udp # KV Agent
+kv-agent 3361/tcp # KV Agent
+# Thomas Soranno <tom_soranno@cipartners.com>
+dj-ilm 3362/udp # DJ ILM
+dj-ilm 3362/tcp # DJ ILM
+# Don Tyson
+nati-vi-server 3363/udp # NATI Vi Server
+nati-vi-server 3363/tcp # NATI Vi Server
+# Robert Dye <rob@natinst.com>
+creativeserver 3364/udp # Creative Server
+creativeserver 3364/tcp # Creative Server
+contentserver 3365/udp # Content Server
+contentserver 3365/tcp # Content Server
+creativepartnr 3366/udp # Creative Partner
+creativepartnr 3366/tcp # Creative Partner
+# Jesus Ortiz <Jesus_A._Ortiz@notes.emotion.com>
+# Scott Engel <ScottX_Engel@ccm.jf.intel.com>
+tip2 3372/udp # TIP 2
+tip2 3372/tcp # TIP 2
+# Keith Evans <keith@loc252.tandem.com>
+lavenir-lm 3373/udp # Lavenir License Manager
+lavenir-lm 3373/tcp # Lavenir License Manager
+# Marius Matioc <marius@lavenir.com>
+cluster-disc 3374/udp # Cluster Disc
+cluster-disc 3374/tcp # Cluster Disc
+# Jeff Hughes <Jeff.Hughes@columbiasc.ncr.com>
vsnm-agent 3375/udp # VSNM Agent
-vsnm-agent 3375/tcp # VSNM Agent
-# Venkat Rangan <venkatr@vitalsigns.com>
-cdbroker 3376/udp # CD Broker
-cdbroker 3376/tcp # CD Broker
-# Moon Ho Chung <mchung@esps.com>
-cogsys-lm 3377/udp # Cogsys Network License Manager
-cogsys-lm 3377/tcp # Cogsys Network License Manager
-# Simon Chinnick <support@cogsys.co.uk>
-wsicopy 3378/udp # WSICOPY
-wsicopy 3378/tcp # WSICOPY
-# James Overby
-socorfs 3379/udp # SOCORFS
-socorfs 3379/tcp # SOCORFS
-# Hugo Charbonneau
-sns-channels 3380/udp # SNS Channels
-sns-channels 3380/tcp # SNS Channels
-# Shekar Pasumarthi <shekarp@firstfloor.com>
-geneous 3381/udp # Geneous
-geneous 3381/tcp # Geneous
-# Nick de Smith <nick.desmith@histech.com>
-fujitsu-neat 3382/udp # Fujitsu Network Enhanced Antitheft function
-fujitsu-neat 3382/tcp # Fujitsu Network Enhanced Antitheft function
-# Markku Viima <markku.viima@team.icl.se>
-esp-lm 3383/udp # Enterprise Software Products License Manager
-esp-lm 3383/tcp # Enterprise Software Products License Manager
-# George Rudy <george@entsoft.com>
-hp-clic 3384/udp # Hardware Management
-hp-clic 3384/tcp # Cluster Management Services
-# Rajesh Srinivasaraghavan <srajesh@cup.hp.com>
-qnxnetman 3385/udp # qnxnetman
-qnxnetman 3385/tcp # qnxnetman
-# Michael Hunter <mphunter@qnx.com>
-gprs-sig 3386/udp # GPRS SIG
-gprs-data 3386/tcp # GPRS Data
-# Ansgar Bergmann <Ansgar.Bergmann@etsi.fr>
-backroomnet 3387/udp # Back Room Net
-backroomnet 3387/tcp # Back Room Net
-# Clayton Wilkinson <cwilkinson@carreker.com>
-cbserver 3388/udp # CB Server
-cbserver 3388/tcp # CB Server
-# Allen Wei <Allen_Wei@arborsoft.com>
-ms-wbt-server 3389/udp # MS WBT Server
-ms-wbt-server 3389/tcp # MS WBT Server
-# Ritu Bahl <ritub@microsoft.com>
-dsc 3390/udp # Distributed Service Coordinator
-dsc 3390/tcp # Distributed Service Coordinator
-# Chas Honton <chas@secant.com>
-savant 3391/udp # SAVANT
-savant 3391/tcp # SAVANT
-# Andy Bruce <franklin_yah@yahoo.com>
-efi-lm 3392/udp # EFI License Management
-efi-lm 3392/tcp # EFI License Management
-# Ross E. Greinke <greinker@execpc.com>
-d2k-tapestry1 3393/udp # D2K Tapestry Client to Server
-d2k-tapestry1 3393/tcp # D2K Tapestry Client to Server
-d2k-tapestry2 3394/udp # D2K Tapestry Server to Server
-d2k-tapestry2 3394/tcp # D2K Tapestry Server to Server
-# Eric Lan <elan@d2k.com>
-dyna-lm 3395/udp # Dyna License Manager (Elam)
-dyna-lm 3395/tcp # Dyna License Manager (Elam)
-# Anjana Iyer <anjana@dyna.com>
-printer_agent 3396/udp # Printer Agent
-printer_agent 3396/tcp # Printer Agent
-# Devon Taylor <dtaylor@novell.com>
-cloanto-lm 3397/udp # Cloanto License Manager
-cloanto-lm 3397/tcp # Cloanto License Manager
-# Takeo Sato <takeo_sato-iana@cloanto.com>
-mercantile 3398/udp # Mercantile
-mercantile 3398/tcp # Mercantile
-# Erik Kragh Jensen <kragh@inet.uni2.dk>
-csms 3399/udp # CSMS
-csms 3399/tcp # CSMS
-csms2 3400/udp # CSMS2
-csms2 3400/tcp # CSMS2
-# Markus Michels <mmi@cedros.com>
+vsnm-agent 3375/tcp # VSNM Agent
+# Venkat Rangan <venkatr@vitalsigns.com>
+cdbroker 3376/udp # CD Broker
+cdbroker 3376/tcp # CD Broker
+# Moon Ho Chung <mchung@esps.com>
+cogsys-lm 3377/udp # Cogsys Network License Manager
+cogsys-lm 3377/tcp # Cogsys Network License Manager
+# Simon Chinnick <support@cogsys.co.uk>
+wsicopy 3378/udp # WSICOPY
+wsicopy 3378/tcp # WSICOPY
+# James Overby
+socorfs 3379/udp # SOCORFS
+socorfs 3379/tcp # SOCORFS
+# Hugo Charbonneau
+sns-channels 3380/udp # SNS Channels
+sns-channels 3380/tcp # SNS Channels
+# Shekar Pasumarthi <shekarp@firstfloor.com>
+geneous 3381/udp # Geneous
+geneous 3381/tcp # Geneous
+# Nick de Smith <nick.desmith@histech.com>
+fujitsu-neat 3382/udp # Fujitsu Network Enhanced Antitheft function
+fujitsu-neat 3382/tcp # Fujitsu Network Enhanced Antitheft function
+# Markku Viima <markku.viima@team.icl.se>
+esp-lm 3383/udp # Enterprise Software Products License Manager
+esp-lm 3383/tcp # Enterprise Software Products License Manager
+# George Rudy <george@entsoft.com>
+hp-clic 3384/udp # Hardware Management
+hp-clic 3384/tcp # Cluster Management Services
+# Rajesh Srinivasaraghavan <srajesh@cup.hp.com>
+qnxnetman 3385/udp # qnxnetman
+qnxnetman 3385/tcp # qnxnetman
+# Michael Hunter <mphunter@qnx.com>
+gprs-sig 3386/udp # GPRS SIG
+gprs-data 3386/tcp # GPRS Data
+# Ansgar Bergmann <Ansgar.Bergmann@etsi.fr>
+backroomnet 3387/udp # Back Room Net
+backroomnet 3387/tcp # Back Room Net
+# Clayton Wilkinson <cwilkinson@carreker.com>
+cbserver 3388/udp # CB Server
+cbserver 3388/tcp # CB Server
+# Allen Wei <Allen_Wei@arborsoft.com>
+ms-wbt-server 3389/udp # MS WBT Server
+ms-wbt-server 3389/tcp # MS WBT Server
+# Ritu Bahl <ritub@microsoft.com>
+dsc 3390/udp # Distributed Service Coordinator
+dsc 3390/tcp # Distributed Service Coordinator
+# Chas Honton <chas@secant.com>
+savant 3391/udp # SAVANT
+savant 3391/tcp # SAVANT
+# Andy Bruce <franklin_yah@yahoo.com>
+efi-lm 3392/udp # EFI License Management
+efi-lm 3392/tcp # EFI License Management
+# Ross E. Greinke <greinker@execpc.com>
+d2k-tapestry1 3393/udp # D2K Tapestry Client to Server
+d2k-tapestry1 3393/tcp # D2K Tapestry Client to Server
+d2k-tapestry2 3394/udp # D2K Tapestry Server to Server
+d2k-tapestry2 3394/tcp # D2K Tapestry Server to Server
+# Eric Lan <elan@d2k.com>
+dyna-lm 3395/udp # Dyna License Manager (Elam)
+dyna-lm 3395/tcp # Dyna License Manager (Elam)
+# Anjana Iyer <anjana@dyna.com>
+printer_agent 3396/udp # Printer Agent
+printer_agent 3396/tcp # Printer Agent
+# Devon Taylor <dtaylor@novell.com>
+cloanto-lm 3397/udp # Cloanto License Manager
+cloanto-lm 3397/tcp # Cloanto License Manager
+# Takeo Sato <takeo_sato-iana@cloanto.com>
+mercantile 3398/udp # Mercantile
+mercantile 3398/tcp # Mercantile
+# Erik Kragh Jensen <kragh@inet.uni2.dk>
+csms 3399/udp # CSMS
+csms 3399/tcp # CSMS
+csms2 3400/udp # CSMS2
+csms2 3400/tcp # CSMS2
+# Markus Michels <mmi@cedros.com>
filecast 3401/udp # filecast
filecast 3401/tcp # filecast
# Eden Sherry <eden@pair.com>
@@ -9324,7 +9324,7 @@ ispmmgr 3775/tcp # ISPM Manager Port
# 3776 Unassigned
jibe-eb 3777/udp # Jibe EdgeBurst
jibe-eb 3777/tcp # Jibe EdgeBurst
-# Chap Tippin <chad.tippin@jibeinc.com> June 2003
+# Chap Tippin <chad.tippin@jibeinc.com> June 2003
c-h-it-port 3778/udp # Cutler-Hammer IT Port
c-h-it-port 3778/tcp # Cutler-Hammer IT Port
# Thomas Ruchti <thomasmruchti@eaton.com> June 2003
@@ -9383,63 +9383,63 @@ mapper-mapethd 3985/tcp # MAPPER TCP/IP server
mapper-ws_ethd 3986/udp # MAPPER workstation server
mapper-ws_ethd 3986/tcp # MAPPER workstation server
# John C. Horton <jch@unirsvl.rsvl.unisys.com>
-centerline 3987/udp # Centerline
-centerline 3987/tcp # Centerline
-# Mark Simpson <simpson@centerline.com>
-# 3988-3999 Unassigned
-terabase 4000/udp # Terabase
-terabase 4000/tcp # Terabase
-# Thor Olson <Thor@terabase.com>
+centerline 3987/udp # Centerline
+centerline 3987/tcp # Centerline
+# Mark Simpson <simpson@centerline.com>
+# 3988-3999 Unassigned
+terabase 4000/udp # Terabase
+terabase 4000/tcp # Terabase
+# Thor Olson <Thor@terabase.com>
####### Potential Conflict of ports ################################
####### PORT 4000 also used by ICQ <www.icq.com> ###################
-newoak 4001/udp # NewOak
-newoak 4001/tcp # NewOak
-# Jim Philippou <jphilippou@newoak.com>
-pxc-spvr-ft 4002/udp # pxc-spvr-ft
-pxc-spvr-ft 4002/tcp # pxc-spvr-ft
-pxc-splr-ft 4003/udp # pxc-splr-ft
-pxc-splr-ft 4003/tcp # pxc-splr-ft
-pxc-roid 4004/udp # pxc-roid
-pxc-roid 4004/tcp # pxc-roid
-pxc-pin 4005/udp # pxc-pin
-pxc-pin 4005/tcp # pxc-pin
-pxc-spvr 4006/udp # pxc-spvr
-pxc-spvr 4006/tcp # pxc-spvr
-pxc-splr 4007/udp # pxc-splr
-pxc-splr 4007/tcp # pxc-splr
-# Dave Nesbitt <nesbitt@cp10.es.xerox.com>
+newoak 4001/udp # NewOak
+newoak 4001/tcp # NewOak
+# Jim Philippou <jphilippou@newoak.com>
+pxc-spvr-ft 4002/udp # pxc-spvr-ft
+pxc-spvr-ft 4002/tcp # pxc-spvr-ft
+pxc-splr-ft 4003/udp # pxc-splr-ft
+pxc-splr-ft 4003/tcp # pxc-splr-ft
+pxc-roid 4004/udp # pxc-roid
+pxc-roid 4004/tcp # pxc-roid
+pxc-pin 4005/udp # pxc-pin
+pxc-pin 4005/tcp # pxc-pin
+pxc-spvr 4006/udp # pxc-spvr
+pxc-spvr 4006/tcp # pxc-spvr
+pxc-splr 4007/udp # pxc-splr
+pxc-splr 4007/tcp # pxc-splr
+# Dave Nesbitt <nesbitt@cp10.es.xerox.com>
netcheque 4008/udp # NetCheque accounting
netcheque 4008/tcp # NetCheque accounting
# B. Clifford Neuman <bcn@isi.edu>
-chimera-hwm 4009/udp # Chimera HWM
+chimera-hwm 4009/udp # Chimera HWM
chimera-hwm 4009/tcp # Chimera HWM
-# Ken Anderson <kanderso@kleber.ICS.UCI.EDU>
-samsung-unidex 4010/udp # Samsung Unidex
+# Ken Anderson <kanderso@kleber.ICS.UCI.EDU>
+samsung-unidex 4010/udp # Samsung Unidex
samsung-unidex 4010/tcp # Samsung Unidex
-# Konstantin V. Vyaznikov <kv@ssm6000.samsung.ru>
-altserviceboot 4011/udp # Alternate Service Boot
-altserviceboot 4011/tcp # Alternate Service Boot
-# Eric Dittert <Eric_Dittert@ccm.jf.intel.com>
-pda-gate 4012/udp # PDA Gate
-pda-gate 4012/tcp # PDA Gate
-# Masakuni Okada <masakuni@jp.ibm.com>
-acl-manager 4013/udp # ACL Manager
-acl-manager 4013/tcp # ACL Manager
-# Toru Murai <murai@saint.nm.fujitsu.co.jp>
-taiclock 4014/udp # TAICLOCK
-taiclock 4014/tcp # TAICLOCK
-# Dan Bernstein <djb@koobera.math.uic.edu>
-talarian-mcast1 4015/udp # Talarian Mcast
-talarian-mcast1 4015/tcp # Talarian Mcast
-talarian-mcast2 4016/udp # Talarian Mcast
-talarian-mcast2 4016/tcp # Talarian Mcast
-talarian-mcast3 4017/udp # Talarian Mcast
-talarian-mcast3 4017/tcp # Talarian Mcast
-talarian-mcast4 4018/udp # Talarian Mcast
-talarian-mcast4 4018/tcp # Talarian Mcast
-talarian-mcast5 4019/udp # Talarian Mcast
-talarian-mcast5 4019/tcp # Talarian Mcast
-# Geoff Mendal <mendal@talarian.com>
+# Konstantin V. Vyaznikov <kv@ssm6000.samsung.ru>
+altserviceboot 4011/udp # Alternate Service Boot
+altserviceboot 4011/tcp # Alternate Service Boot
+# Eric Dittert <Eric_Dittert@ccm.jf.intel.com>
+pda-gate 4012/udp # PDA Gate
+pda-gate 4012/tcp # PDA Gate
+# Masakuni Okada <masakuni@jp.ibm.com>
+acl-manager 4013/udp # ACL Manager
+acl-manager 4013/tcp # ACL Manager
+# Toru Murai <murai@saint.nm.fujitsu.co.jp>
+taiclock 4014/udp # TAICLOCK
+taiclock 4014/tcp # TAICLOCK
+# Dan Bernstein <djb@koobera.math.uic.edu>
+talarian-mcast1 4015/udp # Talarian Mcast
+talarian-mcast1 4015/tcp # Talarian Mcast
+talarian-mcast2 4016/udp # Talarian Mcast
+talarian-mcast2 4016/tcp # Talarian Mcast
+talarian-mcast3 4017/udp # Talarian Mcast
+talarian-mcast3 4017/tcp # Talarian Mcast
+talarian-mcast4 4018/udp # Talarian Mcast
+talarian-mcast4 4018/tcp # Talarian Mcast
+talarian-mcast5 4019/udp # Talarian Mcast
+talarian-mcast5 4019/tcp # Talarian Mcast
+# Geoff Mendal <mendal@talarian.com>
trap 4020/udp # TRAP Port
trap 4020/tcp # TRAP Port
# Jeffrey C. Byrd <admin@vspacegroup.com>
@@ -9501,19 +9501,19 @@ houston 4041/tcp # Rocketeer-Houston
ldxp 4042/udp # LDXP
ldxp 4042/tcp # LDXP
# Craig Calef <craig@katmango.com>
-# 4043-4095 Unassigned
-bre 4096/udp # BRE (Bridge Relay Element)
-bre 4096/tcp # BRE (Bridge Relay Element)
-# Stephen Egbert <egbert@ra.timeplex.com>
-patrolview 4097/udp # Patrol View
-patrolview 4097/tcp # Patrol View
-# Vincent Chin <vincent_chin@bmc.com>
-drmsfsd 4098/udp # drmsfsd
-drmsfsd 4098/tcp # drmsfsd
-# Masao Iwai <iwai@kel.fujitsu.co.jp>
-dpcp 4099/udp # DPCP
-dpcp 4099/tcp # DPCP
-# John Croft <john.croft@calista.demon.co.uk>
+# 4043-4095 Unassigned
+bre 4096/udp # BRE (Bridge Relay Element)
+bre 4096/tcp # BRE (Bridge Relay Element)
+# Stephen Egbert <egbert@ra.timeplex.com>
+patrolview 4097/udp # Patrol View
+patrolview 4097/tcp # Patrol View
+# Vincent Chin <vincent_chin@bmc.com>
+drmsfsd 4098/udp # drmsfsd
+drmsfsd 4098/tcp # drmsfsd
+# Masao Iwai <iwai@kel.fujitsu.co.jp>
+dpcp 4099/udp # DPCP
+dpcp 4099/tcp # DPCP
+# John Croft <john.croft@calista.demon.co.uk>
igo-incognito 4100/udp # IGo Incognito Data Port
igo-incognito 4100/tcp # IGo Incognito Data Port
# Paul Reddy <support@igo-incognito.com> February 2002
@@ -9556,50 +9556,50 @@ atlinks 4154/tcp # atlinks device discovery
# 4155-4159 Unassigned
jini-discovery 4160/udp # Jini Discovery
jini-discovery 4160/tcp # Jini Discovery
-# Mark Hodapp <mark.hodapp@sun.com>
-# 4161-4198 Unassigned
+# Mark Hodapp <mark.hodapp@sun.com>
+# 4161-4198 Unassigned
eims-admin 4199/udp # EIMS ADMIN
eims-admin 4199/tcp # EIMS ADMIN
# Glenn Anderson <glenn@qualcomm.co.nz>
-# Mitra <mitra@earth.path.net>
-corelccam 4300/udp # Corel CCam
-corelccam 4300/tcp # Corel CCam
-# Jason Aiken <jasona@corelcomputer.com>
-# 4301-4320 Unassigned
+# Mitra <mitra@earth.path.net>
+corelccam 4300/udp # Corel CCam
+corelccam 4300/tcp # Corel CCam
+# Jason Aiken <jasona@corelcomputer.com>
+# 4301-4320 Unassigned
rwhois 4321/udp # Remote Who Is
rwhois 4321/tcp # Remote Who Is
# Mark Kosters <markk@internic.net>
unicall 4343/udp # UNICALL
unicall 4343/tcp # UNICALL
# James Powell <james@enghp.unidata.comp>
-vinainstall 4344/udp # VinaInstall
-vinainstall 4344/tcp # VinaInstall
-# Jay Slupesky <js@vina-tech.com>
+vinainstall 4344/udp # VinaInstall
+vinainstall 4344/tcp # VinaInstall
+# Jay Slupesky <js@vina-tech.com>
m4-network-as 4345/udp # Macro 4 Network AS
-m4-network-as 4345/tcp # Macro 4 Network AS
-# Paul Wren <Paul.Wren@macro4.com>
-elanlm 4346/udp # ELAN LM
-elanlm 4346/tcp # ELAN LM
-# Paul Ballew <ballew@projtech.com>
-lansurveyor 4347/udp # LAN Surveyor
-lansurveyor 4347/tcp # LAN Surveyor
-# Michael Swan <swan@neon.com>
-itose 4348/udp # ITOSE
-itose 4348/tcp # ITOSE
-# Michael Haeuptle <Michael_Haeuptle@hp.com>
-fsportmap 4349/udp # File System Port Map
-fsportmap 4349/tcp # File System Port Map
-# Ron Minnich <rminnich@sarnoff.com>
-net-device 4350/udp # Net Device
-net-device 4350/tcp # Net Device
-# Glenn Peterson <glennp@microsoft.com>
-plcy-net-svcs 4351/udp # PLCY Net Services
-plcy-net-svcs 4351/tcp # PLCY Net Services
-# J.J. Ekstrom
-# 4352 Unassigned
-f5-iquery 4353/udp # F5 iQuery
-f5-iquery 4353/tcp # F5 iQuery
-# Tom Kee <t.kee@f5.com>
+m4-network-as 4345/tcp # Macro 4 Network AS
+# Paul Wren <Paul.Wren@macro4.com>
+elanlm 4346/udp # ELAN LM
+elanlm 4346/tcp # ELAN LM
+# Paul Ballew <ballew@projtech.com>
+lansurveyor 4347/udp # LAN Surveyor
+lansurveyor 4347/tcp # LAN Surveyor
+# Michael Swan <swan@neon.com>
+itose 4348/udp # ITOSE
+itose 4348/tcp # ITOSE
+# Michael Haeuptle <Michael_Haeuptle@hp.com>
+fsportmap 4349/udp # File System Port Map
+fsportmap 4349/tcp # File System Port Map
+# Ron Minnich <rminnich@sarnoff.com>
+net-device 4350/udp # Net Device
+net-device 4350/tcp # Net Device
+# Glenn Peterson <glennp@microsoft.com>
+plcy-net-svcs 4351/udp # PLCY Net Services
+plcy-net-svcs 4351/tcp # PLCY Net Services
+# J.J. Ekstrom
+# 4352 Unassigned
+f5-iquery 4353/udp # F5 iQuery
+f5-iquery 4353/tcp # F5 iQuery
+# Tom Kee <t.kee@f5.com>
qsnet-trans 4354/udp # QSNet Transmitter
qsnet-trans 4354/tcp # QSNet Transmitter
qsnet-workst 4355/udp # QSNet Workstation
@@ -9611,13 +9611,13 @@ qsnet-cond 4357/tcp # QSNet Conductor
qsnet-nucl 4358/udp # QSNet Nucleus
qsnet-nucl 4358/tcp # QSNet Nucleus
# Neer Kleinman <neer@qsr.co.il>
-# 4359-4441 Unassigned
-saris 4442/udp # Saris
-saris 4442/tcp # Saris
-pharos 4443/udp # Pharos
-pharos 4443/tcp # Pharos
-# TeleConsult GmbH, 76275 Ettlingen, Germany
-# <teleconsult@t-online.de>
+# 4359-4441 Unassigned
+saris 4442/udp # Saris
+saris 4442/tcp # Saris
+pharos 4443/udp # Pharos
+pharos 4443/tcp # Pharos
+# TeleConsult GmbH, 76275 Ettlingen, Germany
+# <teleconsult@t-online.de>
krb524 4444/udp # KRB524
krb524 4444/tcp # KRB524
# B. Clifford Neuman <bcn@isi.edu>
@@ -9626,55 +9626,55 @@ krb524 4444/tcp # KRB524
nv-video 4444/udp # NV Video default
nv-video 4444/tcp # NV Video default
# Ron Frederick <frederick@parc.xerox.com>
-upnotifyp 4445/udp # UPNOTIFYP
-upnotifyp 4445/tcp # UPNOTIFYP
-# Mark Fox <markf@uplanet.com>
-n1-fwp 4446/udp # N1-FWP
-n1-fwp 4446/tcp # N1-FWP
-n1-rmgmt 4447/udp # N1-RMGMT
-n1-rmgmt 4447/tcp # N1-RMGMT
-# Lori Tassin <Ramsey@network-1.com>
-asc-slmd 4448/udp # ASC Licence Manager
-asc-slmd 4448/tcp # ASC Licence Manager
-# Casper Stoel <cbs@ascinc.com>
+upnotifyp 4445/udp # UPNOTIFYP
+upnotifyp 4445/tcp # UPNOTIFYP
+# Mark Fox <markf@uplanet.com>
+n1-fwp 4446/udp # N1-FWP
+n1-fwp 4446/tcp # N1-FWP
+n1-rmgmt 4447/udp # N1-RMGMT
+n1-rmgmt 4447/tcp # N1-RMGMT
+# Lori Tassin <Ramsey@network-1.com>
+asc-slmd 4448/udp # ASC Licence Manager
+asc-slmd 4448/tcp # ASC Licence Manager
+# Casper Stoel <cbs@ascinc.com>
privatewire 4449/udp # PrivateWire
privatewire 4449/tcp # PrivateWire
-# Uri Resnitzky <uri@arx.com>
-camp 4450/udp # Camp
-camp 4450/tcp # Camp
+# Uri Resnitzky <uri@arx.com>
+camp 4450/udp # Camp
+camp 4450/tcp # Camp
ctisystemmsg 4451/udp # CTI System Msg
ctisystemmsg 4451/tcp # CTI System Msg
ctiprogramload 4452/udp # CTI Program Load
ctiprogramload 4452/tcp # CTI Program Load
-# Steven Cliff <sbcliff@controltechnology.com>
-nssalertmgr 4453/udp # NSS Alert Manager
-nssalertmgr 4453/tcp # NSS Alert Manager
-nssagentmgr 4454/udp # NSS Agent Manager
-nssagentmgr 4454/tcp # NSS Agent Manager
-# Jim Hill<jhill@symantec.com>
-prchat-user 4455/udp # PR Chat User
-prchat-user 4455/tcp # PR Chat User
-prchat-server 4456/udp # PR Chat Server
-prchat-server 4456/tcp # PR Chat Server
-prRegister 4457/udp # PR Register
-prRegister 4457/tcp # PR Register
-# Donny Gilor <dgilor@pop01.ny.us.ibm.net>
-# 4458-4499 Unassigned
+# Steven Cliff <sbcliff@controltechnology.com>
+nssalertmgr 4453/udp # NSS Alert Manager
+nssalertmgr 4453/tcp # NSS Alert Manager
+nssagentmgr 4454/udp # NSS Agent Manager
+nssagentmgr 4454/tcp # NSS Agent Manager
+# Jim Hill<jhill@symantec.com>
+prchat-user 4455/udp # PR Chat User
+prchat-user 4455/tcp # PR Chat User
+prchat-server 4456/udp # PR Chat Server
+prchat-server 4456/tcp # PR Chat Server
+prRegister 4457/udp # PR Register
+prRegister 4457/tcp # PR Register
+# Donny Gilor <dgilor@pop01.ny.us.ibm.net>
+# 4458-4499 Unassigned
ipsec-msft 4500/udp # Microsoft IPsec NAT-T
ipsec-msft 4500/tcp # Microsoft IPsec NAT-T
# Christian Huitema <Huitema@microsoft.com> March 2002
# 4501 De-registered (08 June 2001)
# IANA <iana@iana.org>
# 4502-4544 Unassigned
-worldscores 4545/udp # WorldScores
-worldscores 4545/tcp # WorldScores
+worldscores 4545/udp # WorldScores
+worldscores 4545/tcp # WorldScores
# Steve Davis <sdavis@optum-inc.com>
sf-lm 4546/udp # SF License Manager (Sentinel)
sf-lm 4546/tcp # SF License Manager (Sentinel)
# Thomas Koell <info@sf.com>
-lanner-lm 4547/udp # Lanner License Manager
-lanner-lm 4547/tcp # Lanner License Manager
-# Les Enstone <lenstone@lanner.co.uk>
+lanner-lm 4547/udp # Lanner License Manager
+lanner-lm 4547/tcp # Lanner License Manager
+# Les Enstone <lenstone@lanner.co.uk>
# 4548-4554 Unassigned
rsip 4555/udp # RSIP Port
rsip 4555/tcp # RSIP Port
@@ -9768,10 +9768,10 @@ parallel 4989/udp # Parallel for GAUSS (tm)
parallel 4989/tcp # Parallel for GAUSS (tm)
# Matthew Ford <Matthew.Ford@forward.com.au> March 2003
# 4990-4999 Unassigned
-commplex-main 5000/udp #
-commplex-main 5000/tcp #
-commplex-link 5001/udp #
-commplex-link 5001/tcp #
+commplex-main 5000/udp #
+commplex-main 5000/tcp #
+commplex-link 5001/udp #
+commplex-link 5001/tcp #
rfe 5002/udp # radio free ethernet
rfe 5002/tcp # radio free ethernet
fmpro-internal 5003/udp # FileMaker, Inc. - Proprietary name binding
@@ -9881,8 +9881,8 @@ ctsd 5137/udp # MyCTS server port
ctsd 5137/tcp # MyCTS server port
# Jilles Oldenbeuving <ojilles@hotmail.com> June 2002
# 5138-5144 Unassigned
-rmonitor_secure 5145/udp # RMONITOR SECURE
-rmonitor_secure 5145/tcp # RMONITOR SECURE
+rmonitor_secure 5145/udp # RMONITOR SECURE
+rmonitor_secure 5145/tcp # RMONITOR SECURE
# Kory Hamzeh <kory@ascend.com>
# 5146-5149 Unassigned
atmp 5150/udp # Ascend Tunnel Management Protocol
@@ -9917,7 +9917,7 @@ targus-getdata2 5202/udp # TARGUS GetData 2
targus-getdata2 5202/tcp # TARGUS GetData 2
targus-getdata3 5203/udp # TARGUS GetData 3
targus-getdata3 5203/tcp # TARGUS GetData 3
-# John Keaveney <johnkeaveney@targusinfo.com>
+# John Keaveney <johnkeaveney@targusinfo.com>
# 5204-5221 Unassigned
jabber-client 5222/udp # Jabber Client Connection
jabber-client 5222/tcp # Jabber Client Connection
@@ -9929,8 +9929,8 @@ hp-status 5226/udp # HP Status
hp-status 5226/tcp # HP Status
# Brett Green <Brett_Green@HP.Com>
# 5227-5235 Unassigned
-padl2sim 5236/udp #
-padl2sim 5236/tcp #
+padl2sim 5236/udp #
+padl2sim 5236/tcp #
# 5237-5249 Unassigned
igateway 5250/udp # iGateway
igateway 5250/tcp # iGateway
@@ -9946,46 +9946,46 @@ jabber-server 5269/udp # Jabber Server Connection
jabber-server 5269/tcp # Jabber Server Connection
# David Waite <mass@akuma.org> February 2002
# 5270-5271 Unassigned
-pk 5272/udp # PK
-pk 5272/tcp # PK
-# Patrick Kara <Patrick@EBA.NET>
+pk 5272/udp # PK
+pk 5272/tcp # PK
+# Patrick Kara <Patrick@EBA.NET>
# 5273-5281 Unassigned
transmit-port 5282/udp # Marimba Transmitter Port
transmit-port 5282/tcp # Marimba Transmitter Port
# Johan Eriksson <johan@marimba.com> April 2002
# 5283-5299 Unassigned
-hacl-hb 5300/udp # # HA cluster heartbeat
-hacl-hb 5300/tcp # # HA cluster heartbeat
-hacl-gs 5301/udp # # HA cluster general services
-hacl-gs 5301/tcp # # HA cluster general services
-hacl-cfg 5302/udp # # HA cluster configuration
-hacl-cfg 5302/tcp # # HA cluster configuration
-hacl-probe 5303/udp # # HA cluster probing
-hacl-probe 5303/tcp # # HA cluster probing
+hacl-hb 5300/udp # # HA cluster heartbeat
+hacl-hb 5300/tcp # # HA cluster heartbeat
+hacl-gs 5301/udp # # HA cluster general services
+hacl-gs 5301/tcp # # HA cluster general services
+hacl-cfg 5302/udp # # HA cluster configuration
+hacl-cfg 5302/tcp # # HA cluster configuration
+hacl-probe 5303/udp # # HA cluster probing
+hacl-probe 5303/tcp # # HA cluster probing
hacl-local 5304/udp #
hacl-local 5304/tcp # # HA Cluster Commands
hacl-test 5305/udp #
hacl-test 5305/tcp # # HA Cluster Test
# Eric Soderberg <seric@hposl102.cup.hp>
# Edward Yim <eyim@hpmfas4.cup.hp.com>
-sun-mc-grp 5306/udp # Sun MC Group
-sun-mc-grp 5306/tcp # Sun MC Group
-# Michael DeMoney <demoney@eng.sun.com>
-sco-aip 5307/udp # SCO AIP
-sco-aip 5307/tcp # SCO AIP
-# Barrie Cooper <barrie@sco.com>
-cfengine 5308/udp # CFengine
-cfengine 5308/tcp # CFengine
-# Mark Burgess <mark.burgess@iu.hioslo.no>
-jprinter 5309/udp # J Printer
-jprinter 5309/tcp # J Printer
-# Ken Blackwell <kenb@bristol.com>
-outlaws 5310/udp # Outlaws
-outlaws 5310/tcp # Outlaws
-# Richard Fife <richardf@lucasarts.com>
-tmlogin 5311/udp # TM Login
-tmlogin 5311/tcp # TM Login
-# Eric Sharakan <eric.sharakan@east.sun.com>
+sun-mc-grp 5306/udp # Sun MC Group
+sun-mc-grp 5306/tcp # Sun MC Group
+# Michael DeMoney <demoney@eng.sun.com>
+sco-aip 5307/udp # SCO AIP
+sco-aip 5307/tcp # SCO AIP
+# Barrie Cooper <barrie@sco.com>
+cfengine 5308/udp # CFengine
+cfengine 5308/tcp # CFengine
+# Mark Burgess <mark.burgess@iu.hioslo.no>
+jprinter 5309/udp # J Printer
+jprinter 5309/tcp # J Printer
+# Ken Blackwell <kenb@bristol.com>
+outlaws 5310/udp # Outlaws
+outlaws 5310/tcp # Outlaws
+# Richard Fife <richardf@lucasarts.com>
+tmlogin 5311/udp # TM Login
+tmlogin 5311/tcp # TM Login
+# Eric Sharakan <eric.sharakan@east.sun.com>
# 5312-5313 Unassigned
opalis-rbt-ipc 5314/udp # opalis-rbt-ipc
opalis-rbt-ipc 5314/tcp # opalis-rbt-ipc
@@ -9997,68 +9997,68 @@ hacl-poll 5315/tcp # HA Cluster UDP Polling
mdns 5353/udp # Multicast DNS
mdns 5353/tcp # Multicast DNS
# Stuart Cheshire <cheshire@multicastdns.org>
-# 5354-5399 Unassigned
-excerpt 5400/udp # Excerpt Search
-excerpt 5400/tcp # Excerpt Search
-excerpts 5401/udp # Excerpt Search Secure
-excerpts 5401/tcp # Excerpt Search Secure
-# John Hinsdale <hin@alma.com>
-mftp 5402/udp # MFTP
-mftp 5402/tcp # MFTP
-# Alan Rosenberg <arosen@starburstcom.com>
-hpoms-ci-lstn 5403/udp # HPOMS-CI-LSTN
+# 5354-5399 Unassigned
+excerpt 5400/udp # Excerpt Search
+excerpt 5400/tcp # Excerpt Search
+excerpts 5401/udp # Excerpt Search Secure
+excerpts 5401/tcp # Excerpt Search Secure
+# John Hinsdale <hin@alma.com>
+mftp 5402/udp # MFTP
+mftp 5402/tcp # MFTP
+# Alan Rosenberg <arosen@starburstcom.com>
+hpoms-ci-lstn 5403/udp # HPOMS-CI-LSTN
hpoms-ci-lstn 5403/tcp # HPOMS-CI-LSTN
hpoms-dps-lstn 5404/udp # HPOMS-DPS-LSTN
hpoms-dps-lstn 5404/tcp # HPOMS-DPS-LSTN
-# Harold Froehling <hrf@cup.hp.com>
-netsupport 5405/udp # NetSupport
-netsupport 5405/tcp # NetSupport
-# Paul Sanders <pe77@dial.pipex.com>
-systemics-sox 5406/udp # Systemics Sox
-systemics-sox 5406/tcp # Systemics Sox
-# Gary Howland <gary@systemics.com>
+# Harold Froehling <hrf@cup.hp.com>
+netsupport 5405/udp # NetSupport
+netsupport 5405/tcp # NetSupport
+# Paul Sanders <pe77@dial.pipex.com>
+systemics-sox 5406/udp # Systemics Sox
+systemics-sox 5406/tcp # Systemics Sox
+# Gary Howland <gary@systemics.com>
foresyte-clear 5407/udp # Foresyte-Clear
foresyte-clear 5407/tcp # Foresyte-Clear
-foresyte-sec 5408/udp # Foresyte-Sec
+foresyte-sec 5408/udp # Foresyte-Sec
foresyte-sec 5408/tcp # Foresyte-Sec
-# Jorge Aldana <operator@foresyte.com>
+# Jorge Aldana <operator@foresyte.com>
salient-dtasrv 5409/udp # Salient Data Server
salient-dtasrv 5409/tcp # Salient Data Server
salient-usrmgr 5410/udp # Salient User Manager
salient-usrmgr 5410/tcp # Salient User Manager
# Richard Farnham <rfarnham@salient.com>
-actnet 5411/udp # ActNet
-actnet 5411/tcp # ActNet
-# Simon Robillard <RobillardS@actresearch.com>
-continuus 5412/udp # Continuus
-continuus 5412/tcp # Continuus
-# Steven Holtsberg <steveh@continuus.com>
-wwiotalk 5413/udp # WWIOTALK
-wwiotalk 5413/tcp # WWIOTALK
-# Roger Knobbe <RogerK@Wonderware.COM>
-statusd 5414/udp # StatusD
-statusd 5414/tcp # StatusD
-# Stephen Misel <steve@satelnet.org>
-ns-server 5415/udp # NS Server
-ns-server 5415/tcp # NS Server
-# Jeffrey Chiao <chiaoj@netsoft.com>
-sns-gateway 5416/udp # SNS Gateway
-sns-gateway 5416/tcp # SNS Gateway
-sns-agent 5417/udp # SNS Agent
-sns-agent 5417/tcp # SNS Agent
-# Mary Holstage <holstege@firstfloor.com>
-mcntp 5418/udp # MCNTP
-mcntp 5418/tcp # MCNTP
-# Heiko Rupp <hwr@pilhuhn.de>
-dj-ice 5419/udp # DJ-ICE
-dj-ice 5419/tcp # DJ-ICE
-# Don Tyson <don.tyson@cor.dowjones.com>
-cylink-c 5420/udp # Cylink-C
-cylink-c 5420/tcp # Cylink-C
-# John Jobe <jjobe@cylink.com>
-netsupport2 5421/udp # Net Support 2
-netsupport2 5421/tcp # Net Support 2
-# Paul Sanders <p.sanders@dial.pipex.com>
+actnet 5411/udp # ActNet
+actnet 5411/tcp # ActNet
+# Simon Robillard <RobillardS@actresearch.com>
+continuus 5412/udp # Continuus
+continuus 5412/tcp # Continuus
+# Steven Holtsberg <steveh@continuus.com>
+wwiotalk 5413/udp # WWIOTALK
+wwiotalk 5413/tcp # WWIOTALK
+# Roger Knobbe <RogerK@Wonderware.COM>
+statusd 5414/udp # StatusD
+statusd 5414/tcp # StatusD
+# Stephen Misel <steve@satelnet.org>
+ns-server 5415/udp # NS Server
+ns-server 5415/tcp # NS Server
+# Jeffrey Chiao <chiaoj@netsoft.com>
+sns-gateway 5416/udp # SNS Gateway
+sns-gateway 5416/tcp # SNS Gateway
+sns-agent 5417/udp # SNS Agent
+sns-agent 5417/tcp # SNS Agent
+# Mary Holstage <holstege@firstfloor.com>
+mcntp 5418/udp # MCNTP
+mcntp 5418/tcp # MCNTP
+# Heiko Rupp <hwr@pilhuhn.de>
+dj-ice 5419/udp # DJ-ICE
+dj-ice 5419/tcp # DJ-ICE
+# Don Tyson <don.tyson@cor.dowjones.com>
+cylink-c 5420/udp # Cylink-C
+cylink-c 5420/tcp # Cylink-C
+# John Jobe <jjobe@cylink.com>
+netsupport2 5421/udp # Net Support 2
+netsupport2 5421/tcp # Net Support 2
+# Paul Sanders <p.sanders@dial.pipex.com>
salient-mux 5422/udp # Salient MUX
salient-mux 5422/tcp # Salient MUX
# Richard Farnham <rfarnham@salient.com>
@@ -10087,7 +10087,7 @@ park-agent 5431/tcp # PARK AGENT
postgresql 5432/udp # PostgreSQL Database
postgresql 5432/tcp # PostgreSQL Database
# Tom Lane <tgl@sss.pgh.pa.us>
-# 5433-5434 Unassigned
+# 5433-5434 Unassigned
dttl 5435/udp # Data Tunneling Transceiver Linking (DTTL)
dttl 5435/tcp # Data Tunneling Transceiver Linking (DTTL)
# Richard Olsen <Olsen7@liquefaction.com>
@@ -10113,7 +10113,7 @@ ttlpriceproxy 5463/tcp # TTL Price Proxy
netops-broker 5465/udp # NETOPS-BROKER
netops-broker 5465/tcp # NETOPS-BROKER
# John R. Deuel <kink@netops.com>
-# 5466-5499 Unassigned
+# 5466-5499 Unassigned
fcp-addr-srvr1 5500/udp # fcp-addr-srvr1
fcp-addr-srvr1 5500/tcp # fcp-addr-srvr1
fcp-addr-srvr2 5501/udp # fcp-addr-srvr2
@@ -10124,7 +10124,7 @@ fcp-srvr-inst2 5503/udp # fcp-srvr-inst2
fcp-srvr-inst2 5503/tcp # fcp-srvr-inst2
fcp-cics-gw1 5504/udp # fcp-cics-gw1
fcp-cics-gw1 5504/tcp # fcp-cics-gw1
-# Mark Zeiss <mark.r.zeiss@ac.com>
+# Mark Zeiss <mark.r.zeiss@ac.com>
# 5505-5552 Unassigned
sgi-eventmond 5553/udp # SGI Eventmond Port
sgi-eventmond 5553/tcp # SGI Eventmond Port
@@ -10135,29 +10135,29 @@ sgi-esphttp 5554/tcp # SGI ESP HTTP
############Port 5555 also used by HP Omniback#####################
personal-agent 5555/udp # Personal Agent
personal-agent 5555/tcp # Personal Agent
-# Jackie Wu <jackiew@infoseek.com>
+# Jackie Wu <jackiew@infoseek.com>
###################################################################
-# 5556-5565 Unassigned
+# 5556-5565 Unassigned
udpplus 5566/udp # UDPPlus
udpplus 5566/tcp # UDPPlus
# Cody Gibson <cody.gibson@intermec.com>
# 5567-5598 Unassigned
-esinstall 5599/udp # Enterprise Security Remote Install
-esinstall 5599/tcp # Enterprise Security Remote Install
-esmmanager 5600/udp # Enterprise Security Manager
-esmmanager 5600/tcp # Enterprise Security Manager
-esmagent 5601/udp # Enterprise Security Agent
-esmagent 5601/tcp # Enterprise Security Agent
-# Kimberly Gibbs <kimgib@CCGATE-UT.AXENT.COM>
-a1-msc 5602/udp # A1-MSC
-a1-msc 5602/tcp # A1-MSC
-a1-bs 5603/udp # A1-BS
-a1-bs 5603/tcp # A1-BS
-a3-sdunode 5604/udp # A3-SDUNode
-a3-sdunode 5604/tcp # A3-SDUNode
-a4-sdunode 5605/udp # A4-SDUNode
-a4-sdunode 5605/tcp # A4-SDUNode
-# Mike Dolan <MDolan@ihcmail.ih.lucent.com>
+esinstall 5599/udp # Enterprise Security Remote Install
+esinstall 5599/tcp # Enterprise Security Remote Install
+esmmanager 5600/udp # Enterprise Security Manager
+esmmanager 5600/tcp # Enterprise Security Manager
+esmagent 5601/udp # Enterprise Security Agent
+esmagent 5601/tcp # Enterprise Security Agent
+# Kimberly Gibbs <kimgib@CCGATE-UT.AXENT.COM>
+a1-msc 5602/udp # A1-MSC
+a1-msc 5602/tcp # A1-MSC
+a1-bs 5603/udp # A1-BS
+a1-bs 5603/tcp # A1-BS
+a3-sdunode 5604/udp # A3-SDUNode
+a3-sdunode 5604/tcp # A3-SDUNode
+a4-sdunode 5605/udp # A4-SDUNode
+a4-sdunode 5605/tcp # A4-SDUNode
+# Mike Dolan <MDolan@ihcmail.ih.lucent.com>
# 5606-5630 Unassigned
pcanywheredata 5631/udp # pcANYWHEREdata
pcanywheredata 5631/tcp # pcANYWHEREdata
@@ -10235,14 +10235,14 @@ openmailns 5766/udp # OpenMail NewMail Server
openmailns 5766/tcp # OpenMail NewMail Server
s-openmail 5767/udp # OpenMail Suer Agent Layer (Secure)
s-openmail 5767/tcp # OpenMail Suer Agent Layer (Secure)
-openmailpxy 5768/udp # OpenMail CMTS Server
-openmailpxy 5768/tcp # OpenMail CMTS Server
+openmailpxy 5768/udp # OpenMail CMTS Server
+openmailpxy 5768/tcp # OpenMail CMTS Server
# OpenMail Encyclopedia >opencyc@hpopd.pwd.hp.com>
# Don Loughry <DON_LOUGHRY@hp-cupertino-om4.om.hp.com>
# 5769-5770 Unassigned
-netagent 5771/udp # NetAgent
-netagent 5771/tcp # NetAgent
-# Bradley Birnbaum <bradley.birnbaum@eshare.com>
+netagent 5771/udp # NetAgent
+netagent 5771/tcp # NetAgent
+# Bradley Birnbaum <bradley.birnbaum@eshare.com>
# 5772-5812 Unassigned
icmpd 5813/udp # ICMPD
icmpd 5813/tcp # ICMPD
@@ -10252,11 +10252,11 @@ wherehoo 5859/udp # WHEREHOO
wherehoo 5859/tcp # WHEREHOO
# Jim Youll <jim@media.mit.edu>
# 5860-5967 Unassigned
-mppolicy-v5 5968/udp # mppolicy-v5
-mppolicy-v5 5968/tcp # mppolicy-v5
-mppolicy-mgr 5969/udp # mppolicy-mgr
-mppolicy-mgr 5969/tcp # mppolicy-mgr
-# Yutaka Ono <ono@saint.nm.fujitsu.co.jp>
+mppolicy-v5 5968/udp # mppolicy-v5
+mppolicy-v5 5968/tcp # mppolicy-v5
+mppolicy-mgr 5969/udp # mppolicy-mgr
+mppolicy-mgr 5969/tcp # mppolicy-mgr
+# Yutaka Ono <ono@saint.nm.fujitsu.co.jp>
# 5970-5986 Unassigned
wbem-rmi 5987/udp # WBEM RMI
wbem-rmi 5987/tcp # WBEM RMI
@@ -10280,7 +10280,7 @@ ndl-ahp-svc 6064/tcp # NDL-AHP-SVC
# John Richmond <john@ndl.co.uk>
winpharaoh 6065/udp # WinPharaoh
winpharaoh 6065/tcp # WinPharaoh
-# Basil Lee <basil.lee@gnnettest.com>
+# Basil Lee <basil.lee@gnnettest.com>
ewctsp 6066/udp # EWCTSP
ewctsp 6066/tcp # EWCTSP
# Mark Bailon <mark.bailon@ericsson.com>
@@ -10348,7 +10348,7 @@ dtspcd 6112/tcp # dtspcd
# 6113-6122 Unassigned
backup-express 6123/udp # Backup Express
backup-express 6123/tcp # Backup Express
-# Chi Shih Chang <cchang@syncsort.com>
+# Chi Shih Chang <cchang@syncsort.com>
# 6124-6140 Unassigned
meta-corp 6141/udp # Meta Corporation License Manager
meta-corp 6141/tcp # Meta Corporation License Manager
@@ -10417,29 +10417,29 @@ skip-cert-recv 6455/tcp # SKIP Certificate Receive
skip-cert-send 6456/tcp # SKIP Certificate Send
# Tom Markson <markson@osmosys.incog.com>
# 6457-6470 Unassigned
-lvision-lm 6471/udp # LVision License Manager
-lvision-lm 6471/tcp # LVision License Manager
-# Brian McKinnon <bmk@lvision.com>
-# 6472-6499 Unassigned
-boks 6500/udp # BoKS Master
-boks 6500/tcp # BoKS Master
-boks_servc 6501/udp # BoKS Servc
-boks_servc 6501/tcp # BoKS Servc
-boks_servm 6502/udp # BoKS Servm
-boks_servm 6502/tcp # BoKS Servm
-boks_clntd 6503/udp # BoKS Clntd
-boks_clntd 6503/tcp # BoKS Clntd
+lvision-lm 6471/udp # LVision License Manager
+lvision-lm 6471/tcp # LVision License Manager
+# Brian McKinnon <bmk@lvision.com>
+# 6472-6499 Unassigned
+boks 6500/udp # BoKS Master
+boks 6500/tcp # BoKS Master
+boks_servc 6501/udp # BoKS Servc
+boks_servc 6501/tcp # BoKS Servc
+boks_servm 6502/udp # BoKS Servm
+boks_servm 6502/tcp # BoKS Servm
+boks_clntd 6503/udp # BoKS Clntd
+boks_clntd 6503/tcp # BoKS Clntd
# Magnus Nystrom <magnus@dynas.se>
-# 6504 Unassigned
-badm_priv 6505/udp # BoKS Admin Private Port
-badm_priv 6505/tcp # BoKS Admin Private Port
-badm_pub 6506/udp # BoKS Admin Public Port
-badm_pub 6506/tcp # BoKS Admin Public Port
-bdir_priv 6507/udp # BoKS Dir Server, Private Port
-bdir_priv 6507/tcp # BoKS Dir Server, Private Port
-bdir_pub 6508/udp # BoKS Dir Server, Public Port
-bdir_pub 6508/tcp # BoKS Dir Server, Public Port
-# Magnus Nystrom <magnus@dynas.se>
+# 6504 Unassigned
+badm_priv 6505/udp # BoKS Admin Private Port
+badm_priv 6505/tcp # BoKS Admin Private Port
+badm_pub 6506/udp # BoKS Admin Public Port
+badm_pub 6506/tcp # BoKS Admin Public Port
+bdir_priv 6507/udp # BoKS Dir Server, Private Port
+bdir_priv 6507/tcp # BoKS Dir Server, Private Port
+bdir_pub 6508/udp # BoKS Dir Server, Public Port
+bdir_pub 6508/tcp # BoKS Dir Server, Public Port
+# Magnus Nystrom <magnus@dynas.se>
mgcs-mfp-port 6509/udp # MGCS-MFP Port
mgcs-mfp-port 6509/tcp # MGCS-MFP Port
# Minoru Ozaki <Minoru.Ozaki@rdmg.mgcs.mei.co.jp>
@@ -10458,12 +10458,12 @@ apc-6548 6548/tcp # APC 6548
apc-6549 6549/udp # APC 6549
apc-6549 6549/tcp # APC 6549
# American Power Conversion <ports@apcc.com>
-fg-sysupdate 6550/udp # fg-sysupdate
-fg-sysupdate 6550/tcp # fg-sysupdate
-# Mark Beyer <mbeyer@freegate.com>
+fg-sysupdate 6550/udp # fg-sysupdate
+fg-sysupdate 6550/tcp # fg-sysupdate
+# Mark Beyer <mbeyer@freegate.com>
# 6551-6557 Unassigned
-xdsxdm 6558/udp #
-xdsxdm 6558/tcp #
+xdsxdm 6558/udp #
+xdsxdm 6558/tcp #
# Brian Tackett <cym@acrux.net> possible contact
# 6559-6565 Unassigned
sane-port 6566/udp # SANE Control Port
@@ -10489,7 +10489,7 @@ mach 6631/udp # Mitchell telecom host
mach 6631/tcp # Mitchell telecom host
# Mark Derail <mderail@dmib.com> March 2003
# 6632-6664 Unassigned
-# Brian Tackett <cym@acrux.net>
+# Brian Tackett <cym@acrux.net>
vocaltec-gold 6670/udp # Vocaltec Global Online Directory
vocaltec-gold 6670/tcp # Vocaltec Global Online Directory
# Scott Petrack <Scott_Petrack@vocaltec.com>
@@ -10500,9 +10500,9 @@ vision_elmd 6673/udp # vision_elmd
vision_elmd 6673/tcp # vision_elmd
# Chris Kramer <CKramer@gis.shl.com>
# 6674-6700 Unassigned
-kti-icad-srvr 6701/udp # KTI/ICAD Nameserver
-kti-icad-srvr 6701/tcp # KTI/ICAD Nameserver
-# Stanley Knutson <Stanley.Knutson@KTIworld.com>
+kti-icad-srvr 6701/udp # KTI/ICAD Nameserver
+kti-icad-srvr 6701/tcp # KTI/ICAD Nameserver
+# Stanley Knutson <Stanley.Knutson@KTIworld.com>
# 6702-6713 Unassigned
ibprotocol 6714/udp # Internet Backplane Protocol
ibprotocol 6714/tcp # Internet Backplane Protocol
@@ -10528,11 +10528,11 @@ ambit-lm 6831/udp # ambit-lm
ambit-lm 6831/tcp # ambit-lm
# Don Hejna <djhejna@ambit.com>
# 6832-6840 Unassigned
-netmo-default 6841/udp # Netmo Default
-netmo-default 6841/tcp # Netmo Default
-netmo-http 6842/udp # Netmo HTTP
-netmo-http 6842/tcp # Netmo HTTP
-# Urs Bertschinger <urs@netmosphere.com>
+netmo-default 6841/udp # Netmo Default
+netmo-default 6841/tcp # Netmo Default
+netmo-http 6842/udp # Netmo HTTP
+netmo-http 6842/tcp # Netmo HTTP
+# Urs Bertschinger <urs@netmosphere.com>
# 6843-6849 Unassigned
iccrushmore 6850/udp # ICCRUSHMORE
iccrushmore 6850/tcp # ICCRUSHMORE
@@ -10543,29 +10543,29 @@ muse 6888/tcp # MUSE
# Muse Communications Corporation
# <howard@muse3d.com>
# 6889-6960 Unassigned
-jmact3 6961/udp # JMACT3
-jmact3 6961/tcp # JMACT3
-jmevt2 6962/udp # jmevt2
-jmevt2 6962/tcp # jmevt2
-swismgr1 6963/udp # swismgr1
-swismgr1 6963/tcp # swismgr1
-swismgr2 6964/udp # swismgr2
-swismgr2 6964/tcp # swismgr2
-swistrap 6965/udp # swistrap
-swistrap 6965/tcp # swistrap
-swispol 6966/udp # swispol
-swispol 6966/tcp # swispol
-# Yutaka Ono <ono@saint.nm.fujitsu.co.jp>
+jmact3 6961/udp # JMACT3
+jmact3 6961/tcp # JMACT3
+jmevt2 6962/udp # jmevt2
+jmevt2 6962/tcp # jmevt2
+swismgr1 6963/udp # swismgr1
+swismgr1 6963/tcp # swismgr1
+swismgr2 6964/udp # swismgr2
+swismgr2 6964/tcp # swismgr2
+swistrap 6965/udp # swistrap
+swistrap 6965/tcp # swistrap
+swispol 6966/udp # swispol
+swispol 6966/tcp # swispol
+# Yutaka Ono <ono@saint.nm.fujitsu.co.jp>
# 6967-6968 Unassigned
acmsoda 6969/udp # acmsoda
acmsoda 6969/tcp # acmsoda
# Daniel Simms <dsimms@acm.uiuc.edu>
# 6970-6997 Unassigned
-iatp-highpri 6998/udp # IATP-highPri
-iatp-highpri 6998/tcp # IATP-highPri
-iatp-normalpri 6999/udp # IATP-normalPri
-iatp-normalpri 6999/tcp # IATP-normalPri
-# John Murphy <john.m.murphy@mci.com>
+iatp-highpri 6998/udp # IATP-highPri
+iatp-highpri 6998/tcp # IATP-highPri
+iatp-normalpri 6999/udp # IATP-normalPri
+iatp-normalpri 6999/tcp # IATP-normalPri
+# John Murphy <john.m.murphy@mci.com>
afs3-fileserver 7000/udp # file server itself
afs3-fileserver 7000/tcp # file server itself
afs3-callback 7001/udp # callbacks to cache managers
@@ -10695,7 +10695,7 @@ nta-us 7545/tcp # FlowAnalyzer UtilityServer
# Fred Messinger <fredm@cisco.com>
# 7546-7565 Unassigned
vsi-omega 7566/udp # VSI Omega
-vsi-omega 7566/tcp # VSI Omega
+vsi-omega 7566/tcp # VSI Omega
# Curtis Smith <curtis.smith@vsin.com>
# 7567-7569 Unassigned
aries-kfinder 7570/udp # Aries Kfinder
@@ -10783,30 +10783,30 @@ irdmi2 7999/tcp # iRDMI2
irdmi 8000/udp # iRDMI
irdmi 8000/tcp # iRDMI
# Gil Shafriri <shafriri@ilccm1.iil.intel.com>
-vcom-tunnel 8001/udp # VCOM Tunnel
-vcom-tunnel 8001/tcp # VCOM Tunnel
-# Mark Lewandowski <mlewan0@us.ibm.com>
-teradataordbms 8002/udp # Teradata ORDBMS
-teradataordbms 8002/tcp # Teradata ORDBMS
-# Curt Ellmann <curt.ellmann@ncr.com>
+vcom-tunnel 8001/udp # VCOM Tunnel
+vcom-tunnel 8001/tcp # VCOM Tunnel
+# Mark Lewandowski <mlewan0@us.ibm.com>
+teradataordbms 8002/udp # Teradata ORDBMS
+teradataordbms 8002/tcp # Teradata ORDBMS
+# Curt Ellmann <curt.ellmann@ncr.com>
# 8003-8007 Unassigned
-http-alt 8008/udp # HTTP Alternate
-http-alt 8008/tcp # HTTP Alternate
-# James Gettys <jg@w3.org>
+http-alt 8008/udp # HTTP Alternate
+http-alt 8008/tcp # HTTP Alternate
+# James Gettys <jg@w3.org>
# 8009-8021 Unassigned
oa-system 8022/udp # oa-system
oa-system 8022/tcp # oa-system
# Denis Girault <Denis.Girault@evidian.com>
# 8023-8031 Unassigned
-pro-ed 8032/udp # ProEd
-pro-ed 8032/tcp # ProEd
-mindprint 8033/udp # MindPrint
-mindprint 8033/tcp # MindPrint
-# Larry Tusoni <larry@goldrush.com>
+pro-ed 8032/udp # ProEd
+pro-ed 8032/tcp # ProEd
+mindprint 8033/udp # MindPrint
+mindprint 8033/tcp # MindPrint
+# Larry Tusoni <larry@goldrush.com>
# 8034-8079 Unassigned
-http-alt 8080/udp # HTTP Alternate (see port 80)
-http-alt 8080/tcp # HTTP Alternate (see port 80)
-# Stephen Casner <casner@precpt.com>
+http-alt 8080/udp # HTTP Alternate (see port 80)
+http-alt 8080/tcp # HTTP Alternate (see port 80)
+# Stephen Casner <casner@precpt.com>
# 8081-8087 Unassigned
radan-http 8088/udp # Radan HTTP
radan-http 8088/tcp # Radan HTTP
@@ -10832,62 +10832,62 @@ indigo-vrmi 8130/tcp # INDIGO-VRMI
indigo-vbcp 8131/udp # INDIGO-VBCP
indigo-vbcp 8131/tcp # INDIGO-VBCP
# Colin Caughie <cfc@indigo-avs.com>
-dbabble 8132/udp # dbabble
+dbabble 8132/udp # dbabble
dbabble 8132/tcp # dbabble
# Chris Pugmire <chrisp@netwinsite.com>
# 8133-8159 Unassigned
-patrol 8160/udp # Patrol
-patrol 8160/tcp # Patrol
-patrol-snmp 8161/udp # Patrol SNMP
-patrol-snmp 8161/tcp # Patrol SNMP
-# Daisy Tam <Daisy_Tam@bmc.com>
+patrol 8160/udp # Patrol
+patrol 8160/tcp # Patrol
+patrol-snmp 8161/udp # Patrol SNMP
+patrol-snmp 8161/tcp # Patrol SNMP
+# Daisy Tam <Daisy_Tam@bmc.com>
# 8162-8198 Unassigned
vvr-data 8199/udp # VVR DATA
vvr-data 8199/tcp # VVR DATA
# Ming Xu <ming@veritas.com>
-trivnet1 8200/udp # TRIVNET
-trivnet1 8200/tcp # TRIVNET
-trivnet2 8201/udp # TRIVNET
-trivnet2 8201/tcp # TRIVNET
-# Saar Wilf <saar@trivnet.com>
+trivnet1 8200/udp # TRIVNET
+trivnet1 8200/tcp # TRIVNET
+trivnet2 8201/udp # TRIVNET
+trivnet2 8201/tcp # TRIVNET
+# Saar Wilf <saar@trivnet.com>
# 8202-8203 Unassigned
-lm-perfworks 8204/udp # LM Perfworks
-lm-perfworks 8204/tcp # LM Perfworks
-lm-instmgr 8205/udp # LM Instmgr
-lm-instmgr 8205/tcp # LM Instmgr
-lm-dta 8206/udp # LM Dta
-lm-dta 8206/tcp # LM Dta
-lm-sserver 8207/udp # LM SServer
-lm-sserver 8207/tcp # LM SServer
-lm-webwatcher 8208/udp # LM Webwatcher
-lm-webwatcher 8208/tcp # LM Webwatcher
-# Chris Flynn <cflynn@landmark.com>
+lm-perfworks 8204/udp # LM Perfworks
+lm-perfworks 8204/tcp # LM Perfworks
+lm-instmgr 8205/udp # LM Instmgr
+lm-instmgr 8205/tcp # LM Instmgr
+lm-dta 8206/udp # LM Dta
+lm-dta 8206/tcp # LM Dta
+lm-sserver 8207/udp # LM SServer
+lm-sserver 8207/tcp # LM SServer
+lm-webwatcher 8208/udp # LM Webwatcher
+lm-webwatcher 8208/tcp # LM Webwatcher
+# Chris Flynn <cflynn@landmark.com>
# 8209-8350 Unassigned
-server-find 8351/udp # Server Find
-server-find 8351/tcp # Server Find
-# Chris Brown <chrisb@chancery.com>
+server-find 8351/udp # Server Find
+server-find 8351/tcp # Server Find
+# Chris Brown <chrisb@chancery.com>
# 8352-8375 Unassigned
-cruise-enum 8376/udp # Cruise ENUM
-cruise-enum 8376/tcp # Cruise ENUM
-cruise-swroute 8377/udp # Cruise SWROUTE
-cruise-swroute 8377/tcp # Cruise SWROUTE
-cruise-config 8378/udp # Cruise CONFIG
-cruise-config 8378/tcp # Cruise CONFIG
-cruise-diags 8379/udp # Cruise DIAGS
-cruise-diags 8379/tcp # Cruise DIAGS
-cruise-update 8380/udp # Cruise UPDATE
-cruise-update 8380/tcp # Cruise UPDATE
-# Steve Husak <portmaster@cruisetech.com>
+cruise-enum 8376/udp # Cruise ENUM
+cruise-enum 8376/tcp # Cruise ENUM
+cruise-swroute 8377/udp # Cruise SWROUTE
+cruise-swroute 8377/tcp # Cruise SWROUTE
+cruise-config 8378/udp # Cruise CONFIG
+cruise-config 8378/tcp # Cruise CONFIG
+cruise-diags 8379/udp # Cruise DIAGS
+cruise-diags 8379/tcp # Cruise DIAGS
+cruise-update 8380/udp # Cruise UPDATE
+cruise-update 8380/tcp # Cruise UPDATE
+# Steve Husak <portmaster@cruisetech.com>
# 8381-8399 Unassigned
-cvd 8400/udp # cvd
-cvd 8400/tcp # cvd
-sabarsd 8401/udp # sabarsd
-sabarsd 8401/tcp # sabarsd
-abarsd 8402/udp # abarsd
-abarsd 8402/tcp # abarsd
-admind 8403/udp # admind
-admind 8403/tcp # admind
-# Aaron Bilbrey <abilbrey@commvault.com>
+cvd 8400/udp # cvd
+cvd 8400/tcp # cvd
+sabarsd 8401/udp # sabarsd
+sabarsd 8401/tcp # sabarsd
+abarsd 8402/udp # abarsd
+abarsd 8402/tcp # abarsd
+admind 8403/udp # admind
+admind 8403/tcp # admind
+# Aaron Bilbrey <abilbrey@commvault.com>
# 8404-8415 Unassigned
espeech 8416/udp # eSpeech Session Protocol
espeech 8416/tcp # eSpeech Session Protocol
@@ -10919,9 +10919,9 @@ d-fence 8555/tcp # SYMAX D-FENCE
# 8556-8667 Unassigned
natd 8668/divert # Network Address Translation
# 8669-8732 Unassigned
-ibus 8733/udp # iBus
-ibus 8733/tcp # iBus
-# Silvano Maffeis <maffeis@softwired.ch>
+ibus 8733/udp # iBus
+ibus 8733/tcp # iBus
+# Silvano Maffeis <maffeis@softwired.ch>
# 8734-8762 Unassigned
mc-appserver 8763/udp # MC-APPSERVER
mc-appserver 8763/tcp # MC-APPSERVER
@@ -10929,9 +10929,9 @@ mc-appserver 8763/tcp # MC-APPSERVER
openqueue 8764/udp # OPENQUEUE
openqueue 8764/tcp # OPENQUEUE
# Matt Jensen <mattj@newsblip.com>
-ultraseek-http 8765/udp # Ultraseek HTTP
-ultraseek-http 8765/tcp # Ultraseek HTTP
-# Walter Underwood <wunder@infoseek.com>
+ultraseek-http 8765/udp # Ultraseek HTTP
+ultraseek-http 8765/tcp # Ultraseek HTTP
+# Walter Underwood <wunder@infoseek.com>
# 8766-8785 Unassigned
msgclnt 8786/udp # Message Client
msgclnt 8786/tcp # Message Client
@@ -10943,9 +10943,9 @@ truecm 8804/udp # truecm
truecm 8804/tcp # truecm
# Scott Kramer <scottk@truebluesoftware.com>
# 8805-8879
-cddbp-alt 8880/udp # CDDBP
-cddbp-alt 8880/tcp # CDDBP
-# Steve Scherf <steve@moonsoft.com>
+cddbp-alt 8880/udp # CDDBP
+cddbp-alt 8880/tcp # CDDBP
+# Steve Scherf <steve@moonsoft.com>
# 8881-8887 Unassigned
ddi-udp-1 8888/udp # NewsEDGE server UDP (UDP 1)
ddi-tcp-1 8888/tcp # NewsEDGE server TCP (TCP 1)
@@ -10967,7 +10967,7 @@ jmb-cds1 8900/udp # JMB-CDS 1
jmb-cds1 8900/tcp # JMB-CDS 1
jmb-cds2 8901/udp # JMB-CDS 2
jmb-cds2 8901/tcp # JMB-CDS 2
-# Curtis Bray <CurtisB@creativedesign.com>
+# Curtis Bray <CurtisB@creativedesign.com>
# 8902-8909 Unassigned
manyone-http 8910/udp # manyone-http
manyone-http 8910/tcp # manyone-http
@@ -11040,35 +11040,35 @@ bacula-sd 9103/udp # Bacula Storage Daemon
bacula-sd 9103/tcp # Bacula Storage Daemon
# Kern Sibbald <kern@sibbald.com> January 2002
# 9104-9159 Unassigned
-netlock1 9160/udp # NetLOCK1
-netlock1 9160/tcp # NetLOCK1
-netlock2 9161/udp # NetLOCK2
-netlock2 9161/tcp # NetLOCK2
-netlock3 9162/udp # NetLOCK3
-netlock3 9162/tcp # NetLOCK3
-netlock4 9163/udp # NetLOCK4
-netlock4 9163/tcp # NetLOCK4
-netlock5 9164/udp # NetLOCK5
-netlock5 9164/tcp # NetLOCK5
-# Steven Sawkins <ssawkins@netlock.com>
+netlock1 9160/udp # NetLOCK1
+netlock1 9160/tcp # NetLOCK1
+netlock2 9161/udp # NetLOCK2
+netlock2 9161/tcp # NetLOCK2
+netlock3 9162/udp # NetLOCK3
+netlock3 9162/tcp # NetLOCK3
+netlock4 9163/udp # NetLOCK4
+netlock4 9163/tcp # NetLOCK4
+netlock5 9164/udp # NetLOCK5
+netlock5 9164/tcp # NetLOCK5
+# Steven Sawkins <ssawkins@netlock.com>
# 9165-9199 Unassigned
-wap-wsp 9200/udp # WAP connectionless session service
-wap-wsp 9200/tcp # WAP connectionless session service
-wap-wsp-wtp 9201/udp # WAP session service
-wap-wsp-wtp 9201/tcp # WAP session service
-wap-wsp-s 9202/udp # WAP secure connectionless session service
-wap-wsp-s 9202/tcp # WAP secure connectionless session service
-wap-wsp-wtp-s 9203/udp # WAP secure session service
-wap-wsp-wtp-s 9203/tcp # WAP secure session service
-wap-vcard 9204/udp # WAP vCard
-wap-vcard 9204/tcp # WAP vCard
-wap-vcal 9205/udp # WAP vCal
-wap-vcal 9205/tcp # WAP vCal
-wap-vcard-s 9206/udp # WAP vCard Secure
-wap-vcard-s 9206/tcp # WAP vCard Secure
-wap-vcal-s 9207/udp # WAP vCal Secure
-wap-vcal-s 9207/tcp # WAP vCal Secure
-# WAP Forum <wap-feedback@mail.wapforum.org>
+wap-wsp 9200/udp # WAP connectionless session service
+wap-wsp 9200/tcp # WAP connectionless session service
+wap-wsp-wtp 9201/udp # WAP session service
+wap-wsp-wtp 9201/tcp # WAP session service
+wap-wsp-s 9202/udp # WAP secure connectionless session service
+wap-wsp-s 9202/tcp # WAP secure connectionless session service
+wap-wsp-wtp-s 9203/udp # WAP secure session service
+wap-wsp-wtp-s 9203/tcp # WAP secure session service
+wap-vcard 9204/udp # WAP vCard
+wap-vcard 9204/tcp # WAP vCard
+wap-vcal 9205/udp # WAP vCal
+wap-vcal 9205/tcp # WAP vCal
+wap-vcard-s 9206/udp # WAP vCard Secure
+wap-vcard-s 9206/tcp # WAP vCard Secure
+wap-vcal-s 9207/udp # WAP vCal Secure
+wap-vcal-s 9207/tcp # WAP vCal Secure
+# WAP Forum <wap-feedback@mail.wapforum.org>
# WAP Forum <pg@uplanet.com>
# 9208-9209 Unassigned
lif-mlp 9210/udp # LIF Mobile Locn Protocol
@@ -11097,7 +11097,7 @@ n2h2server 9285/udp # N2H2 Filter Service Port
n2h2server 9285/tcp # N2H2 Filter Service Port
# Jim Irwin <jirwin@n2h2.com> February 2002
# 9286 Unassigned
-cumulus 9287/udp # Cumulus
+cumulus 9287/udp # Cumulus
cumulus 9287/tcp # Cumulus
# Thomas Schleu <tschleu@canto.de>
# 9288-9291 Unassigned
@@ -11105,33 +11105,33 @@ armtechdaemon 9292/udp # ArmTech Daemon
armtechdaemon 9292/tcp # ArmTech Daemon
# Rohan Story <rohan@aurema.com>
# 9293-9320 Unassigned
-guibase 9321/udp # guibase
-guibase 9321/tcp # guibase
-# Yutaka Ono <ono@saint.nm.fujitsu.co.jp>
+guibase 9321/udp # guibase
+guibase 9321/tcp # guibase
+# Yutaka Ono <ono@saint.nm.fujitsu.co.jp>
# 9322-9342 Unassigned
-mpidcmgr 9343/udp # MpIdcMgr
-mpidcmgr 9343/tcp # MpIdcMgr
-mphlpdmc 9344/udp # Mphlpdmc
-mphlpdmc 9344/tcp # Mphlpdmc
-# Yutaka Ono <ono@saint.nm.fujitsu.co.jp>
+mpidcmgr 9343/udp # MpIdcMgr
+mpidcmgr 9343/tcp # MpIdcMgr
+mphlpdmc 9344/udp # Mphlpdmc
+mphlpdmc 9344/tcp # Mphlpdmc
+# Yutaka Ono <ono@saint.nm.fujitsu.co.jp>
# 9345 Unassigned
ctechlicensing 9346/udp # C Tech Licensing
ctechlicensing 9346/tcp # C Tech Licensing
# Reed Copsey, Jr. <reedc@ctech.com>
# 9347-9373 Unassigned
-fjdmimgr 9374/udp # fjdmimgr
-fjdmimgr 9374/tcp # fjdmimgr
-# Yutaka Ono <ono@saint.nm.fujitsu.co.jp>
+fjdmimgr 9374/udp # fjdmimgr
+fjdmimgr 9374/tcp # fjdmimgr
+# Yutaka Ono <ono@saint.nm.fujitsu.co.jp>
# 9375-9395 Unassigned
-fjinvmgr 9396/udp # fjinvmgr
-fjinvmgr 9396/tcp # fjinvmgr
-mpidcagt 9397/udp # MpIdcAgt
-mpidcagt 9397/tcp # MpIdcAgt
-# Yutaka Ono <ono@saint.nm.fujitsu.co.jp>
+fjinvmgr 9396/udp # fjinvmgr
+fjinvmgr 9396/tcp # fjinvmgr
+mpidcagt 9397/udp # MpIdcAgt
+mpidcagt 9397/tcp # MpIdcAgt
+# Yutaka Ono <ono@saint.nm.fujitsu.co.jp>
# 9398-9499 Unassigned
-ismserver 9500/udp # ismserver
-ismserver 9500/tcp # ismserver
-# Ian Gordon <iang@micromuse.co.uk>
+ismserver 9500/udp # ismserver
+ismserver 9500/tcp # ismserver
+# Ian Gordon <iang@micromuse.co.uk>
# 9501-9534 Unassigned
mngsuite 9535/udp # Management Suite Remote Control
mngsuite 9535/tcp # Management Suite Remote Control
@@ -11147,7 +11147,7 @@ micromuse-ncpw 9600/udp # MICROMUSE-NCPW
micromuse-ncpw 9600/tcp # MICROMUSE-NCPW
# Hing Wing To <wing.to@micromuse.com>
# 9601-9611 Unassigned
-streamcomm-ds 9612/udp # StreamComm User Directory
+streamcomm-ds 9612/udp # StreamComm User Directory
streamcomm-ds 9612/tcp # StreamComm User Directory
# Brian C. Wiles <brian@streamcomm.com>
# 9613-9746 Unassigned
@@ -11156,9 +11156,9 @@ l5nas-parchan 9747/tcp # L5NAS Parallel Channel
# Lawrence J. Dickson - Land-5 Corporation
# <ldickson@land-5.com> March 2002
# 9748-9752 Unassigned
-rasadv 9753/udp # rasadv
-rasadv 9753/tcp # rasadv
-# Dave Thaler <dthaler@microsoft.com>
+rasadv 9753/udp # rasadv
+rasadv 9753/tcp # rasadv
+# Dave Thaler <dthaler@microsoft.com>
# 9754-9799 Unassigned
davsrc 9800/udp # WebDav Source Port
davsrc 9800/tcp # WebDav Source Port
@@ -11173,19 +11173,19 @@ sapv1 9875/tcp # Session Announcement v1
sd 9876/udp # Session Director
sd 9876/tcp # Session Director
# Van Jacobson <van@ee.lbl.gov>
-cyborg-systems 9888/udp # CYBORG Systems
-cyborg-systems 9888/tcp # CYBORG Systems
-# Malcolm Graham <Malcolm_Graham@CYBORG.COM>
-monkeycom 9898/udp # MonkeyCom
-monkeycom 9898/tcp # MonkeyCom
-# Yuji Kuwabara <HHG01200@niftyserve.or.jp>
+cyborg-systems 9888/udp # CYBORG Systems
+cyborg-systems 9888/tcp # CYBORG Systems
+# Malcolm Graham <Malcolm_Graham@CYBORG.COM>
+monkeycom 9898/udp # MonkeyCom
+monkeycom 9898/tcp # MonkeyCom
+# Yuji Kuwabara <HHG01200@niftyserve.or.jp>
sctp-tunneling 9899/udp # SCTP TUNNELING
sctp-tunneling 9899/tcp # SCTP TUNNELING
iua 9900/sctp # IUA
iua 9900/udp # IUA
iua 9900/tcp # IUA
# Lyndon Ong <LyOng@ciena.com>
-# 9901-9908 Unassigned
+# 9901-9908 Unassigned
domaintime 9909/udp # domaintime
domaintime 9909/tcp # domaintime
# Jeffry Dwight <jeffryd@greyware.com>
@@ -11201,7 +11201,7 @@ apc-9951 9951/tcp # APC 9951
apc-9952 9952/udp # APC 9952
apc-9952 9952/tcp # APC 9952
# American Power Conversion <ports@apcc.com>
-# 9953-9991 Unassigned
+# 9953-9991 Unassigned
palace-1 9992/udp # OnLive-1
palace-1 9992/tcp # OnLive-1
palace-2 9993/udp # OnLive-2
@@ -11212,9 +11212,9 @@ palace-4 9995/udp # Palace-4
palace-4 9995/tcp # Palace-4
palace-5 9996/udp # Palace-5
palace-5 9996/tcp # Palace-5
-palace-6 9997/udp # Palace-6
-palace-6 9997/tcp # Palace-6
-# Douglas Crockford <crock@communities.com>
+palace-6 9997/udp # Palace-6
+palace-6 9997/tcp # Palace-6
+# Douglas Crockford <crock@communities.com>
distinct32 9998/udp # Distinct32
distinct32 9998/tcp # Distinct32
distinct 9999/udp # distinct
@@ -11226,9 +11226,9 @@ ndmp 10000/tcp # Network Data Management Protocol
scp-config 10001/udp # SCP Configuration Port
scp-config 10001/tcp # SCP Configuration Port
# Brad Strand <brad.strand@3ware.com>
-# 10002-10006 Unassigned
-mvs-capacity 10007/udp # MVS Capacity
-mvs-capacity 10007/tcp # MVS Capacity
+# 10002-10006 Unassigned
+mvs-capacity 10007/udp # MVS Capacity
+mvs-capacity 10007/tcp # MVS Capacity
# Donna Dillenberger <engd@us.ibm.com>
octopus 10008/udp # Octopus Multiplexer
octopus 10008/tcp # Octopus Multiplexer
@@ -11252,13 +11252,13 @@ netiq-endpoint 10113/tcp # NetIQ Endpoint
netiq-qcheck 10114/udp # NetIQ Qcheck
netiq-qcheck 10114/tcp # NetIQ Qcheck
# John Wood <John.Wood@netiq.com>
-netiq-endpt 10115/udp # NetIQ Endpoint
+netiq-endpt 10115/udp # NetIQ Endpoint
netiq-endpt 10115/tcp # NetIQ Endpoint
-# Gary Weichinger <gary.weichinger@netiq.com>
+# Gary Weichinger <gary.weichinger@netiq.com>
netiq-voipa 10116/udp # NetIQ VoIP Assessor
netiq-voipa 10116/tcp # NetIQ VoIP Assessor
# Gary Weichinger <gary.weichinger@netiq.com>
-# 10117-10127 Unassigned
+# 10117-10127 Unassigned
bmc-perf-sd 10128/udp # BMC-PERFORM-SERVICE DAEMON
bmc-perf-sd 10128/tcp # BMC-PERFORM-SERVICE DAEMON
# Dima Seliverstov <Dima_Seliverstov@bmc.com>
@@ -11267,24 +11267,24 @@ axis-wimp-port 10260/udp # Axis WIMP Port
axis-wimp-port 10260/tcp # Axis WIMP Port
# Stefan Eriksson <contact-iana@axis.com>
# 10261-10287 Unassigned
-blocks 10288/udp # Blocks
-blocks 10288/tcp # Blocks
-# Carl Malamud
-# 10289-10989 Unassigned
+blocks 10288/udp # Blocks
+blocks 10288/tcp # Blocks
+# Carl Malamud
+# 10289-10989 Unassigned
rmiaux 10990/udp # Auxiliary RMI Port
rmiaux 10990/tcp # Auxiliary RMI Port
# Eugen Bacic <eugen@texar.com>
# 10991-10999 Unassigned
-irisa 11000/udp # IRISA
-irisa 11000/tcp # IRISA
-# Vladimir Brauner <vbrauner@datamedia.fr>
-metasys 11001/udp # Metasys
-metasys 11001/tcp # Metasys
-# Tobin Schuster <tobin.j.schuster@jci.com>
+irisa 11000/udp # IRISA
+irisa 11000/tcp # IRISA
+# Vladimir Brauner <vbrauner@datamedia.fr>
+metasys 11001/udp # Metasys
+metasys 11001/tcp # Metasys
+# Tobin Schuster <tobin.j.schuster@jci.com>
# 11002-11110 Unassigned
-vce 11111/udp # Viral Computing Environment (VCE)
-vce 11111/tcp # Viral Computing Environment (VCE)
-# Fred Cohen <fc@all.net>
+vce 11111/udp # Viral Computing Environment (VCE)
+vce 11111/tcp # Viral Computing Environment (VCE)
+# Fred Cohen <fc@all.net>
# 11112-11200 Unassigned
smsqp 11201/udp # smsqp
smsqp 11201/tcp # smsqp
@@ -11325,17 +11325,17 @@ sysinfo-sp 11967/udp # SysInfo Sercice Protocol
sysinfo-sp 11967/tcp # SysInfo Service Protocol
# Mike Cooper <mcooper@magnicomp.com> March 2003
# 11968-11999 Unassiged
-entextxid 12000/udp # IBM Enterprise Extender SNA XID Exchange
-entextxid 12000/tcp # IBM Enterprise Extender SNA XID Exchange
-entextnetwk 12001/udp # IBM Enterprise Extender SNA COS Network Priority
-entextnetwk 12001/tcp # IBM Enterprise Extender SNA COS Network Priority
-entexthigh 12002/udp # IBM Enterprise Extender SNA COS High Priority
-entexthigh 12002/tcp # IBM Enterprise Extender SNA COS High Priority
-entextmed 12003/udp # IBM Enterprise Extender SNA COS Medium Priority
-entextmed 12003/tcp # IBM Enterprise Extender SNA COS Medium Priority
-entextlow 12004/udp # IBM Enterprise Extender SNA COS Low Priority
-entextlow 12004/tcp # IBM Enterprise Extender SNA COS Low Priority
-# Eugene Cox <genecox@raleigh.ibm.com>
+entextxid 12000/udp # IBM Enterprise Extender SNA XID Exchange
+entextxid 12000/tcp # IBM Enterprise Extender SNA XID Exchange
+entextnetwk 12001/udp # IBM Enterprise Extender SNA COS Network Priority
+entextnetwk 12001/tcp # IBM Enterprise Extender SNA COS Network Priority
+entexthigh 12002/udp # IBM Enterprise Extender SNA COS High Priority
+entexthigh 12002/tcp # IBM Enterprise Extender SNA COS High Priority
+entextmed 12003/udp # IBM Enterprise Extender SNA COS Medium Priority
+entextmed 12003/tcp # IBM Enterprise Extender SNA COS Medium Priority
+entextlow 12004/udp # IBM Enterprise Extender SNA COS Low Priority
+entextlow 12004/tcp # IBM Enterprise Extender SNA COS Low Priority
+# Eugene Cox <genecox@raleigh.ibm.com>
dbisamserver1 12005/udp # DBISAM Database Server - Regular
dbisamserver1 12005/tcp # DBISAM Database Server - Regular
dbisamserver2 12006/udp # DBISAM Database Server - Admin
@@ -11346,9 +11346,9 @@ rets-ssl 12109/udp # RETS over SSL
rets-ssl 12109/tcp # RETS over SSL
# Bruce Toback <btoback@optc.com> February 2003
# 12110-12171 Unassigned
-hivep 12172/udp # HiveP
-hivep 12172/tcp # HiveP
-# Dick Augustsson <dick@skenbe.net>
+hivep 12172/udp # HiveP
+hivep 12172/tcp # HiveP
+# Dick Augustsson <dick@skenbe.net>
# 12173-12344 Unassigned
italk 12345/udp # Italk Chat System
italk 12345/tcp # Italk Chat System
@@ -11358,9 +11358,9 @@ tsaf 12753/udp # tsaf port
tsaf 12753/tcp # tsaf port
# Andreas Fehr <100042.2070@CompuServe.COM>
# 12754-13159 Unassigned
-i-zipqd 13160/udp # I-ZIPQD
-i-zipqd 13160/tcp # I-ZIPQD
-# Chuck Runquist <crunquist@quarterdeck.com>
+i-zipqd 13160/udp # I-ZIPQD
+i-zipqd 13160/tcp # I-ZIPQD
+# Chuck Runquist <crunquist@quarterdeck.com>
# 13161-13222 Unassigned
powwow-client 13223/udp # PowWow Client
powwow-client 13223/tcp # PowWow Client
@@ -11368,42 +11368,42 @@ powwow-server 13224/udp # PowWow Server
powwow-server 13224/tcp # PowWow Server
# Paul K. Peterson <paul@tribal.com>
# 13225-13719 Unassigned
-bprd 13720/udp # BPRD Protocol (VERITAS NetBackup)
-bprd 13720/tcp # BPRD Protocol (VERITAS NetBackup)
-bpdbm 13721/udp # BPDBM Protocol (VERITAS NetBackup)
-bpdbm 13721/tcp # BPDBM Protocol (VERITAS NetBackup)
-# Jeff Holmbeck <Jeff.Holmbeck@veritas.com>
-bpjava-msvc 13722/udp # BP Java MSVC Protocol
-bpjava-msvc 13722/tcp # BP Java MSVC Protocol
-# Tim Schmidt <Tim.Schmidt@veritas.com>
+bprd 13720/udp # BPRD Protocol (VERITAS NetBackup)
+bprd 13720/tcp # BPRD Protocol (VERITAS NetBackup)
+bpdbm 13721/udp # BPDBM Protocol (VERITAS NetBackup)
+bpdbm 13721/tcp # BPDBM Protocol (VERITAS NetBackup)
+# Jeff Holmbeck <Jeff.Holmbeck@veritas.com>
+bpjava-msvc 13722/udp # BP Java MSVC Protocol
+bpjava-msvc 13722/tcp # BP Java MSVC Protocol
+# Tim Schmidt <Tim.Schmidt@veritas.com>
# 13723 Unassigned
vnetd 13724/udp # Veritas Network Utility
vnetd 13724/tcp # Veritas Network Utility
# Jeff Holmbeck <Jeff.Holmbeck@veritas.com>
# 13725-13781 Unassigned
-bpcd 13782/udp # VERITAS NetBackup
-bpcd 13782/tcp # VERITAS NetBackup
-vopied 13783/udp # VOPIED Protocol
-vopied 13783/tcp # VOPIED Protocol
-# Jeff Holmbeck <Jeff.Holmbeck@veritas.com>
+bpcd 13782/udp # VERITAS NetBackup
+bpcd 13782/tcp # VERITAS NetBackup
+vopied 13783/udp # VOPIED Protocol
+vopied 13783/tcp # VOPIED Protocol
+# Jeff Holmbeck <Jeff.Holmbeck@veritas.com>
# 13784-13817 Unassigned
-dsmcc-config 13818/udp # DSMCC Config
+dsmcc-config 13818/udp # DSMCC Config
dsmcc-config 13818/tcp # DSMCC Config
-dsmcc-session 13819/udp # DSMCC Session Messages
-dsmcc-session 13819/tcp # DSMCC Session Messages
-dsmcc-passthru 13820/udp # DSMCC Pass-Thru Messages
-dsmcc-passthru 13820/tcp # DSMCC Pass-Thru Messages
-dsmcc-download 13821/udp # DSMCC Download Protocol
-dsmcc-download 13821/tcp # DSMCC Download Protocol
-dsmcc-ccp 13822/udp # DSMCC Channel Change Protocol
-dsmcc-ccp 13822/tcp # DSMCC Channel Change Protocol
-# Tim Addington <Tim.Addington@sciatl.com>
-# ISO/IEC 13818-6 MPEG-2 DSM-CC
+dsmcc-session 13819/udp # DSMCC Session Messages
+dsmcc-session 13819/tcp # DSMCC Session Messages
+dsmcc-passthru 13820/udp # DSMCC Pass-Thru Messages
+dsmcc-passthru 13820/tcp # DSMCC Pass-Thru Messages
+dsmcc-download 13821/udp # DSMCC Download Protocol
+dsmcc-download 13821/tcp # DSMCC Download Protocol
+dsmcc-ccp 13822/udp # DSMCC Channel Change Protocol
+dsmcc-ccp 13822/tcp # DSMCC Channel Change Protocol
+# Tim Addington <Tim.Addington@sciatl.com>
+# ISO/IEC 13818-6 MPEG-2 DSM-CC
# 13823-14000 Unassigned
sua 14001/sctp # SUA
-sua 14001/udp # De-Registered (2001 June 06)
-sua 14001/tcp # SUA
-# Miguel Angel Garcia <Miguel.A.Garcia@ericsson.com>
+sua 14001/udp # De-Registered (2001 June 06)
+sua 14001/tcp # SUA
+# Miguel Angel Garcia <Miguel.A.Garcia@ericsson.com>
# 14002-14032 Unassigned
sage-best-com1 14033/udp # sage Best! Config Server 1
sage-best-com1 14033/tcp # sage Best! Config Server 1
@@ -11441,42 +11441,42 @@ xpilot 15345/tcp # XPilot Contact Port
3link 15363/tcp # 3Link Negotiation
# Brant Thomsen <brant_thomsen@3com.com> January 2003
# 15364-16359 Unassigned
-netserialext1 16360/udp # netserialext1
-netserialext1 16360/tcp # netserialext1
-netserialext2 16361/udp # netserialext2
-netserialext2 16361/tcp # netserialext2
+netserialext1 16360/udp # netserialext1
+netserialext1 16360/tcp # netserialext1
+netserialext2 16361/udp # netserialext2
+netserialext2 16361/tcp # netserialext2
# Mike Hoy <mhoy@aquilagroup.com>
# 16362-16366 Unassigned
-netserialext3 16367/udp # netserialext3
-netserialext3 16367/tcp # netserialext3
+netserialext3 16367/udp # netserialext3
+netserialext3 16367/tcp # netserialext3
netserialext4 16368/udp # netserialext4
-netserialext4 16368/tcp # netserialext4
-# Mike Hoy <mhoy@aquilagroup.com>
+netserialext4 16368/tcp # netserialext4
+# Mike Hoy <mhoy@aquilagroup.com>
# 16369-16990 Unassigned
intel-rci-mp 16991/udp # INTEL-RCI-MP
intel-rci-mp 16991/tcp # INTEL-RCI-MP
# Jane Dashevsky <jane.dashevsky@intel.com>
# 16992-17006 Unassigned
-isode-dua 17007/udp #
-isode-dua 17007/tcp #
+isode-dua 17007/udp #
+isode-dua 17007/tcp #
# 17008-17184 Unassigned
soundsvirtual 17185/udp # Sounds Virtual
soundsvirtual 17185/tcp # Sounds Virtual
# Richard Snider <rsnider@sounds.com>
# 17186-17218 Unassigned
-chipper 17219/udp # Chipper
-chipper 17219/tcp # Chipper
-# Ronald Jimmink <Ronald.Jimmink@chipper.nl>
+chipper 17219/udp # Chipper
+chipper 17219/tcp # Chipper
+# Ronald Jimmink <Ronald.Jimmink@chipper.nl>
# 17220-17999 Unassigned
biimenu 18000/udp # Beckman Instruments, Inc.
biimenu 18000/tcp # Beckman Instruments, Inc.
# R. L. Meyering <RLMEYERING@BIIVAX.DP.BECKMAN.COM>
# 18001-18180 Unassigned
-opsec-cvp 18181/udp # OPSEC CVP
-opsec-cvp 18181/tcp # OPSEC CVP
-opsec-ufp 18182/udp # OPSEC UFP
-opsec-ufp 18182/tcp # OPSEC UFP
-# Alon Kantor <alonk@checkpoint.com>
+opsec-cvp 18181/udp # OPSEC CVP
+opsec-cvp 18181/tcp # OPSEC CVP
+opsec-ufp 18182/udp # OPSEC UFP
+opsec-ufp 18182/tcp # OPSEC UFP
+# Alon Kantor <alonk@checkpoint.com>
opsec-sam 18183/udp # OPSEC SAM
opsec-sam 18183/tcp # OPSEC SAM
opsec-lea 18184/udp # OPSEC LEA
@@ -11493,9 +11493,9 @@ checkpoint-rtm 18241/udp # Check Point RTM
checkpoint-rtm 18241/tcp # Check Point RTM
# Dudi Hazan <dudi@checkpoint.com>
# 18242-18462 Unassigned
-ac-cluster 18463/udp # AC Cluster
-ac-cluster 18463/tcp # AC Cluster
-# Lisa Zhong <lzhong@cup.hp.com>
+ac-cluster 18463/udp # AC Cluster
+ac-cluster 18463/tcp # AC Cluster
+# Lisa Zhong <lzhong@cup.hp.com>
# 18464-18768 Unassigned
ique 18769/udp # IQue Protocol
ique 18769/tcp # IQue Protocol
@@ -11525,11 +11525,11 @@ mtrgtrans 19398/udp # mtrgtrans
mtrgtrans 19398/tcp # mtrgtrans
# Katsuhito Muroi <muroi@pfu.co.jp>
# 19399-19409 Unassigned
-hp-sco 19410/udp # hp-sco
-hp-sco 19410/tcp # hp-sco
-hp-sca 19411/udp # hp-sca
-hp-sca 19411/tcp # hp-sca
-# Larry Schwartz <lrs@cup.hp.com>
+hp-sco 19410/udp # hp-sco
+hp-sco 19410/tcp # hp-sco
+hp-sca 19411/udp # hp-sca
+hp-sca 19411/tcp # hp-sca
+# Larry Schwartz <lrs@cup.hp.com>
hp-sessmon 19412/udp # HP-SESSMON
hp-sessmon 19412/tcp # HP-SESSMON
# Gita Murthy <gita@cup.hp.com>
@@ -11553,17 +11553,17 @@ ipulse-ics 20222/udp # iPulse-ICS
ipulse-ics 20222/tcp # iPulse-ICS
# Meggie Garica-Woodruff <ipulse@ericsson.com>
# 20223-20669 Unassigned
-track 20670/udp # Track
-track 20670/tcp # Track
-# Michael Sweet <msweet@ctr.nawcad.navy.mil>
+track 20670/udp # Track
+track 20670/tcp # Track
+# Michael Sweet <msweet@ctr.nawcad.navy.mil>
# 20671-20998 Unassigned
athand-mmp 20999/udp # AT Hand MMP
athand-mmp 20999/tcp # At Hand MMP
# Stepan Riha <stepan.riha@hand.com>
# 20300-21589 Unassigned
-vofr-gateway 21590/udp # VoFR Gateway
-vofr-gateway 21590/tcp # VoFR Gateway
-# Marty Borden <mborden@tollbridgetech.com>
+vofr-gateway 21590/udp # VoFR Gateway
+vofr-gateway 21590/tcp # VoFR Gateway
+# Marty Borden <mborden@tollbridgetech.com>
# 21591-21799 Unassigned
tvpm 21800/udp # TVNC Pro Multiplexing
tvpm 21800/tcp # TVNC Pro Multiplexing
@@ -11581,11 +11581,11 @@ netspeak-cps 21849/udp # NetSpeak Corp. Credit Processing System
netspeak-cps 21849/tcp # NetSpeak Corp. Credit Processing System
# Toby Hosterman <root@netspeak.com>
# 21850-21999 Unassigned
-snapenetio 22000/udp # SNAPenetIO
-snapenetio 22000/tcp # SNAPenetIO
-optocontrol 22001/udp # OptoControl
-optocontrol 22001/tcp # OptoControl
-# Kevin Kuhns <kkuhns@opto22.com>
+snapenetio 22000/udp # SNAPenetIO
+snapenetio 22000/tcp # SNAPenetIO
+optocontrol 22001/udp # OptoControl
+optocontrol 22001/tcp # OptoControl
+# Kevin Kuhns <kkuhns@opto22.com>
# 22002-22272 Unassigned
wnn6 22273/udp # wnn6
wnn6 22273/tcp # wnn6
@@ -11603,21 +11603,21 @@ brf-gw 22951/udp # Telerate Information Platform WAN
brf-gw 22951/tcp # Telerate Information Platform WAN
# Timo Sivonen <timo.sivonen@ccmail.dowjones.com>
# 22952-23999 Unassigned
-med-ltp 24000/udp # med-ltp
-med-ltp 24000/tcp # med-ltp
-med-fsp-rx 24001/udp # med-fsp-rx
-med-fsp-rx 24001/tcp # med-fsp-rx
-med-fsp-tx 24002/udp # med-fsp-tx
-med-fsp-tx 24002/tcp # med-fsp-tx
-med-supp 24003/udp # med-supp
-med-supp 24003/tcp # med-supp
-med-ovw 24004/udp # med-ovw
-med-ovw 24004/tcp # med-ovw
-med-ci 24005/udp # med-ci
-med-ci 24005/tcp # med-ci
-med-net-svc 24006/udp # med-net-svc
-med-net-svc 24006/tcp # med-net-svc
-# Juergen Fischbach <Juergen_Fischbach@agilent.com>
+med-ltp 24000/udp # med-ltp
+med-ltp 24000/tcp # med-ltp
+med-fsp-rx 24001/udp # med-fsp-rx
+med-fsp-rx 24001/tcp # med-fsp-rx
+med-fsp-tx 24002/udp # med-fsp-tx
+med-fsp-tx 24002/tcp # med-fsp-tx
+med-supp 24003/udp # med-supp
+med-supp 24003/tcp # med-supp
+med-ovw 24004/udp # med-ovw
+med-ovw 24004/tcp # med-ovw
+med-ci 24005/udp # med-ci
+med-ci 24005/tcp # med-ci
+med-net-svc 24006/udp # med-net-svc
+med-net-svc 24006/tcp # med-net-svc
+# Juergen Fischbach <Juergen_Fischbach@agilent.com>
# 24007-24241 Unassigned
filesphere 24242/udp # fileSphere
filesphere 24242/tcp # fileSphere
@@ -11627,9 +11627,9 @@ vista-4gl 24249/udp # Vista 4GL
vista-4gl 24249/tcp # Vista 4GL
# Mark Itzcovitz <mji@vistacomp.com>
# 24250-24385 Unassigned
-intel_rci 24386/udp # Intel RCI
-intel_rci 24386/tcp # Intel RCI
-# Mark Lewis <mark.h.lewis@intel.com>
+intel_rci 24386/udp # Intel RCI
+intel_rci 24386/tcp # Intel RCI
+# Mark Lewis <mark.h.lewis@intel.com>
# 24387-24553 Unassigned
binkp 24554/udp # BINKP
binkp 24554/tcp # BINKP
@@ -11703,7 +11703,7 @@ gserver 26264/udp # Gserver
gserver 26264/tcp # Gserver
# Szanto Gabor <sgabor90@hotmail.com>
# 26265-26999 Unassigned
-# Daniel Birns <daniel@globes.com>
+# Daniel Birns <daniel@globes.com>
# 27010-27344 Unassigned
imagepump 27345/udp # ImagePump
imagepump 27345/tcp # ImagePump
@@ -11742,7 +11742,7 @@ filenet-rpc 32769/udp # Filenet RPC
filenet-rpc 32769/tcp # Filenet RPC
filenet-nch 32770/udp # Filenet NCH
filenet-nch 32770/tcp # Filenet NCH
-# Daniel Whelan <dwhelan@filenet.com>
+# Daniel Whelan <dwhelan@filenet.com>
filenet-rmi 32771/udp # FileNet RMI
filenet-rmi 32771/tcp # FileNET RMI
# Chris Adkins <cadkins@filenet.com>
diff --git a/test/language/ast/casestatement.rb b/test/language/ast/casestatement.rb
index d95d788d9..2711455f2 100755
--- a/test/language/ast/casestatement.rb
+++ b/test/language/ast/casestatement.rb
@@ -9,21 +9,21 @@ require 'puppettest'
require 'puppettest/parsertesting'
class TestCaseStatement < Test::Unit::TestCase
- include PuppetTest
- include PuppetTest::ParserTesting
- AST = Puppet::Parser::AST
-
- class ActiveAST < FakeAST
- def self.clear
- $evaluated = []
+ include PuppetTest
+ include PuppetTest::ParserTesting
+ AST = Puppet::Parser::AST
+
+ class ActiveAST < FakeAST
+ def self.clear
+ $evaluated = []
end
- def evaluate
- $evaluated ||= []
- $evaluated << @evaluate
+ def evaluate
+ $evaluated ||= []
+ $evaluated << @evaluate
end
end
-
- def test_evaluate
+
+ def test_evaluate
ast = nil
scope = mkscope
param = nameobj("MyParam")
diff --git a/test/language/ast/resource.rb b/test/language/ast/resource.rb
index 97541d92f..2ed8b1569 100755
--- a/test/language/ast/resource.rb
+++ b/test/language/ast/resource.rb
@@ -9,9 +9,9 @@ require 'puppettest'
require 'puppettest/parsertesting'
class TestASTResource< Test::Unit::TestCase
- include PuppetTest
- include PuppetTest::ParserTesting
- AST = Puppet::Parser::AST
+ include PuppetTest
+ include PuppetTest::ParserTesting
+ AST = Puppet::Parser::AST
def setup
super
diff --git a/test/language/ast/resource_reference.rb b/test/language/ast/resource_reference.rb
index 75cb53c12..44c23fd2b 100755
--- a/test/language/ast/resource_reference.rb
+++ b/test/language/ast/resource_reference.rb
@@ -9,9 +9,9 @@ require 'puppettest'
require 'puppettest/parsertesting'
class TestASTResourceReference < Test::Unit::TestCase
- include PuppetTest
- include PuppetTest::ParserTesting
- AST = Puppet::Parser::AST
+ include PuppetTest
+ include PuppetTest::ParserTesting
+ AST = Puppet::Parser::AST
def newref(type, title)
AST::ResourceReference.new(:type => type, :title => AST::String.new(:value => title))
diff --git a/test/language/ast/selector.rb b/test/language/ast/selector.rb
index 6e923bdcb..0c9a6e675 100755
--- a/test/language/ast/selector.rb
+++ b/test/language/ast/selector.rb
@@ -9,9 +9,9 @@ require 'puppettest'
require 'puppettest/parsertesting'
class TestSelector < Test::Unit::TestCase
- include PuppetTest
- include PuppetTest::ParserTesting
- AST = Puppet::Parser::AST
+ include PuppetTest
+ include PuppetTest::ParserTesting
+ AST = Puppet::Parser::AST
def test_evaluate
scope = mkscope
diff --git a/test/language/ast/variable.rb b/test/language/ast/variable.rb
index bde397bb4..7aef2a8c2 100755
--- a/test/language/ast/variable.rb
+++ b/test/language/ast/variable.rb
@@ -9,9 +9,9 @@ require 'puppettest'
require 'puppettest/parsertesting'
class TestVariable < Test::Unit::TestCase
- include PuppetTest
- include PuppetTest::ParserTesting
- AST = Puppet::Parser::AST
+ include PuppetTest
+ include PuppetTest::ParserTesting
+ AST = Puppet::Parser::AST
def setup
super
diff --git a/test/language/resource.rb b/test/language/resource.rb
index c7ed1f019..0298d6910 100755
--- a/test/language/resource.rb
+++ b/test/language/resource.rb
@@ -6,7 +6,7 @@ require 'puppettest'
require 'puppettest/resourcetesting'
class TestResource < PuppetTest::TestCase
- include PuppetTest
+ include PuppetTest
include PuppetTest::ParserTesting
include PuppetTest::ResourceTesting
Parser = Puppet::Parser
diff --git a/test/language/snippets.rb b/test/language/snippets.rb
index eac852ed0..64681d6f9 100755
--- a/test/language/snippets.rb
+++ b/test/language/snippets.rb
@@ -10,7 +10,7 @@ require 'puppet/network/handler'
require 'puppettest'
class TestSnippets < Test::Unit::TestCase
- include PuppetTest
+ include PuppetTest
def setup
super
diff --git a/test/lib/puppettest.rb b/test/lib/puppettest.rb
index 2f84a6c28..8c1eed910 100755
--- a/test/lib/puppettest.rb
+++ b/test/lib/puppettest.rb
@@ -53,10 +53,10 @@ module PuppetTest
require 'getoptlong'
result = GetoptLong.new(
- [ "--debug", "-d", GetoptLong::NO_ARGUMENT ],
- [ "--resolve", "-r", GetoptLong::REQUIRED_ARGUMENT ],
- [ "-n", GetoptLong::REQUIRED_ARGUMENT ],
- [ "--help", "-h", GetoptLong::NO_ARGUMENT ]
+ [ "--debug", "-d", GetoptLong::NO_ARGUMENT ],
+ [ "--resolve", "-r", GetoptLong::REQUIRED_ARGUMENT ],
+ [ "-n", GetoptLong::REQUIRED_ARGUMENT ],
+ [ "--help", "-h", GetoptLong::NO_ARGUMENT ]
)
usage = "USAGE: TESTOPTS='[-n <method> -n <method> ...] [-d]' rake [target] [target] ..."
diff --git a/test/lib/puppettest/support/utils.rb b/test/lib/puppettest/support/utils.rb
index f23c6483b..7491095de 100644
--- a/test/lib/puppettest/support/utils.rb
+++ b/test/lib/puppettest/support/utils.rb
@@ -64,10 +64,10 @@ module PuppetTest::Support::Utils
def set_mygroup
# retrieve the user name
group = %x{groups}.chomp.split(/ /)[0]
- unless group
- raise "Could not find group to set in @mygroup"
- end
- @mygroup = group
+ unless group
+ raise "Could not find group to set in @mygroup"
+ end
+ @mygroup = group
end
def run_events(type, trans, events, msg)
diff --git a/test/lib/puppettest/testcase.rb b/test/lib/puppettest/testcase.rb
index 15c835854..9af0292b4 100644
--- a/test/lib/puppettest/testcase.rb
+++ b/test/lib/puppettest/testcase.rb
@@ -7,7 +7,7 @@ require 'puppettest'
require 'puppettest/runnable_test'
class PuppetTest::TestCase < Test::Unit::TestCase
- include PuppetTest
+ include PuppetTest
extend PuppetTest::RunnableTest
def self.suite
diff --git a/test/network/authconfig.rb b/test/network/authconfig.rb
index 3a05096d5..b619bec7e 100755
--- a/test/network/authconfig.rb
+++ b/test/network/authconfig.rb
@@ -7,7 +7,7 @@ require 'puppettest'
require 'puppet/network/authconfig'
class TestAuthConfig < Test::Unit::TestCase
- include PuppetTest
+ include PuppetTest
def request(call, client, ip)
r = Puppet::Network::ClientRequest.new(client, ip, false)
diff --git a/test/network/authorization.rb b/test/network/authorization.rb
index 23ec8f95c..3ee10a4a8 100755
--- a/test/network/authorization.rb
+++ b/test/network/authorization.rb
@@ -7,7 +7,7 @@ require 'puppet/network/authorization'
require 'mocha'
class TestAuthConfig < Test::Unit::TestCase
- include PuppetTest
+ include PuppetTest
# A mock class for authconfig
class FakeAuth
diff --git a/test/network/authstore.rb b/test/network/authstore.rb
index 587f39627..7a793afe5 100755
--- a/test/network/authstore.rb
+++ b/test/network/authstore.rb
@@ -7,7 +7,7 @@ require 'mocha'
require 'puppet/network/authstore'
class TestAuthStore < Test::Unit::TestCase
- include PuppetTest
+ include PuppetTest
Declaration = Puppet::Network::AuthStore::Declaration
def mkstore
store = nil
@@ -124,7 +124,7 @@ class TestAuthStore < Test::Unit::TestCase
%w{hostname.com 192.168.0.4},
%w{localhost 192.168.0.1},
%w{localhost 127.0.0.1}
-
+
].each { |ary|
assert(@store.allowed?(*ary), "Failed to allow %s" % [ary.join(",")])
}
@@ -136,7 +136,7 @@ class TestAuthStore < Test::Unit::TestCase
"store did not return nil")
end
assert_equal([Declaration.new(:allow, "*.host.com")],
- @store.send(:instance_variable_get, "@declarations"),
+ @store.send(:instance_variable_get, "@declarations"),
"Did not store declaration")
# Now add another one and make sure it gets sorted appropriately
@@ -146,8 +146,8 @@ class TestAuthStore < Test::Unit::TestCase
end
assert_equal([
- Declaration.new(:allow, "me.host.com"),
- Declaration.new(:allow, "*.host.com")
+ Declaration.new(:allow, "me.host.com"),
+ Declaration.new(:allow, "*.host.com")
],
@store.send(:instance_variable_get, "@declarations"),
"Did not sort declarations")
@@ -189,7 +189,7 @@ class TestAuthStore < Test::Unit::TestCase
invalid
^invalid!
inval$id
-
+
}.each { |pat|
assert_raise(Puppet::AuthStoreError,
"name '%s' was allowed" % pat) {
@@ -298,14 +298,14 @@ class TestAuthStore < Test::Unit::TestCase
9.times { |a|
threads << Thread.new {
9.times { |b|
- Thread.pass
- @store.interpolate([nil, "a#{b}", "madstop.com"])
- Thread.pass
- assert( @store.allowed?("a#{b}.madstop.com", "192.168.0.1") )
- Thread.pass
- @store.reset_interpolation
- Thread.pass
- }
+ Thread.pass
+ @store.interpolate([nil, "a#{b}", "madstop.com"])
+ Thread.pass
+ assert( @store.allowed?("a#{b}.madstop.com", "192.168.0.1") )
+ Thread.pass
+ @store.reset_interpolation
+ Thread.pass
+ }
}
}
threads.each { |th| th.join }
@@ -314,7 +314,7 @@ class TestAuthStore < Test::Unit::TestCase
end
class TestAuthStoreDeclaration < PuppetTest::TestCase
- include PuppetTest
+ include PuppetTest
Declaration = Puppet::Network::AuthStore::Declaration
def setup
diff --git a/test/network/client_request.rb b/test/network/client_request.rb
index 7408e2b87..3a35706be 100755
--- a/test/network/client_request.rb
+++ b/test/network/client_request.rb
@@ -7,7 +7,7 @@ require 'puppettest'
require 'puppet/network/client_request'
class TestClientRequest < Test::Unit::TestCase
- include PuppetTest
+ include PuppetTest
def test_initialize
req = nil
diff --git a/test/network/handler/fileserver.rb b/test/network/handler/fileserver.rb
index 5158f51ca..47f848ed2 100755
--- a/test/network/handler/fileserver.rb
+++ b/test/network/handler/fileserver.rb
@@ -6,7 +6,7 @@ require 'puppettest'
require 'puppet/network/handler/fileserver'
class TestFileServer < Test::Unit::TestCase
- include PuppetTest
+ include PuppetTest
def mkmount(path = nil)
mount = nil
diff --git a/test/network/handler/report.rb b/test/network/handler/report.rb
index 8719c68b5..914f03450 100755
--- a/test/network/handler/report.rb
+++ b/test/network/handler/report.rb
@@ -7,11 +7,11 @@ require 'puppet/network/handler/report'
require 'puppettest/reporttesting'
class TestReportServer < Test::Unit::TestCase
- include PuppetTest
- include PuppetTest::Reporttesting
+ include PuppetTest
+ include PuppetTest::Reporttesting
Report = Puppet::Network::Handler.report
- Puppet::Util.logmethods(self)
+ Puppet::Util.logmethods(self)
def mkserver
server = nil
diff --git a/test/network/handler/runner.rb b/test/network/handler/runner.rb
index 71d86fd9d..23cff83ff 100755
--- a/test/network/handler/runner.rb
+++ b/test/network/handler/runner.rb
@@ -6,7 +6,7 @@ require 'puppettest'
require 'puppet/network/handler/runner'
class TestHandlerRunner < Test::Unit::TestCase
- include PuppetTest
+ include PuppetTest
def test_it_calls_agent_runner
runner = mock 'runner'
diff --git a/test/network/rights.rb b/test/network/rights.rb
index e1d9f8a0a..71b8c3765 100755
--- a/test/network/rights.rb
+++ b/test/network/rights.rb
@@ -6,7 +6,7 @@ require 'puppettest'
require 'puppet/network/rights'
class TestRights < Test::Unit::TestCase
- include PuppetTest
+ include PuppetTest
def setup
super
diff --git a/test/network/xmlrpc/webrick_servlet.rb b/test/network/xmlrpc/webrick_servlet.rb
index 74326f6a0..1d83d36ad 100755
--- a/test/network/xmlrpc/webrick_servlet.rb
+++ b/test/network/xmlrpc/webrick_servlet.rb
@@ -10,11 +10,11 @@ require 'mocha'
class TestXMLRPCWEBrickServlet < Test::Unit::TestCase
include PuppetTest
def test_basics
- # Make sure we're doing things as our user info, rather than puppet/puppet
- setme
- set_mygroup
- Puppet[:user] = @me
- Puppet[:group] = @mygroup
+ # Make sure we're doing things as our user info, rather than puppet/puppet
+ setme
+ set_mygroup
+ Puppet[:user] = @me
+ Puppet[:group] = @mygroup
servlet = nil
ca = Puppet::Network::Handler.ca.new
diff --git a/test/other/dsl.rb b/test/other/dsl.rb
index 45b51982d..3ef21a372 100755
--- a/test/other/dsl.rb
+++ b/test/other/dsl.rb
@@ -7,8 +7,8 @@ require 'puppet/dsl'
require 'puppettest'
class TestDSL < Test::Unit::TestCase
- include PuppetTest
- include Puppet::DSL
+ include PuppetTest
+ include Puppet::DSL
def teardown
super
diff --git a/test/other/events.rb b/test/other/events.rb
index 3f02575d9..a954cd7f6 100755
--- a/test/other/events.rb
+++ b/test/other/events.rb
@@ -7,7 +7,7 @@ require 'puppettest'
class TestEvents < Test::Unit::TestCase
- include PuppetTest
+ include PuppetTest
def test_simplesubscribe
name = tempfile()
diff --git a/test/other/overrides.rb b/test/other/overrides.rb
index 3c13dabbc..22c3d2ac1 100755
--- a/test/other/overrides.rb
+++ b/test/other/overrides.rb
@@ -6,7 +6,7 @@ require 'puppet'
require 'puppettest'
class TestOverrides < Test::Unit::TestCase
- include PuppetTest
+ include PuppetTest
def mksubdirs(basedir, level)
@@tmpfiles << basedir
dir = basedir.dup
diff --git a/test/other/puppet.rb b/test/other/puppet.rb
index 23aa6971b..2dcd7e576 100755
--- a/test/other/puppet.rb
+++ b/test/other/puppet.rb
@@ -7,7 +7,7 @@ require 'puppettest'
# Test the different features of the main puppet module
class TestPuppetModule < Test::Unit::TestCase
- include PuppetTest
+ include PuppetTest
include SignalObserver
def mkfakeclient
diff --git a/test/other/relationships.rb b/test/other/relationships.rb
index b3a70eeae..976d6d894 100755
--- a/test/other/relationships.rb
+++ b/test/other/relationships.rb
@@ -6,10 +6,10 @@ require 'puppet'
require 'puppettest'
class TestRelationships < Test::Unit::TestCase
- include PuppetTest
- def setup
- super
- Puppet::Type.type(:exec)
+ include PuppetTest
+ def setup
+ super
+ Puppet::Type.type(:exec)
end
def newfile
diff --git a/test/other/report.rb b/test/other/report.rb
index dd2f4c1ef..a77c48362 100755
--- a/test/other/report.rb
+++ b/test/other/report.rb
@@ -9,8 +9,8 @@ require 'puppettest'
require 'puppettest/reporttesting'
class TestReports < Test::Unit::TestCase
- include PuppetTest
- include PuppetTest::Reporttesting
+ include PuppetTest
+ include PuppetTest::Reporttesting
def mkreport
# First do some work
diff --git a/test/ral/manager/provider.rb b/test/ral/manager/provider.rb
index 86008b13d..16d865800 100755
--- a/test/ral/manager/provider.rb
+++ b/test/ral/manager/provider.rb
@@ -6,7 +6,7 @@ require 'puppettest'
require 'mocha'
class TestTypeProviders < Test::Unit::TestCase
- include PuppetTest
+ include PuppetTest
def setup
super
diff --git a/test/ral/manager/type.rb b/test/ral/manager/type.rb
index 1bd6d7163..7923610b3 100755
--- a/test/ral/manager/type.rb
+++ b/test/ral/manager/type.rb
@@ -6,7 +6,7 @@ require 'puppettest'
require 'mocha'
class TestType < Test::Unit::TestCase
- include PuppetTest
+ include PuppetTest
def test_typemethods
Puppet::Type.eachtype { |type|
name = nil
diff --git a/test/ral/providers/cron/crontab.rb b/test/ral/providers/cron/crontab.rb
index 2ad7997a2..d52105ce3 100755
--- a/test/ral/providers/cron/crontab.rb
+++ b/test/ral/providers/cron/crontab.rb
@@ -7,8 +7,8 @@ require 'mocha'
require 'puppettest/fileparsing'
class TestCronParsedProvider < Test::Unit::TestCase
- include PuppetTest
- include PuppetTest::FileParsing
+ include PuppetTest
+ include PuppetTest::FileParsing
FIELDS = {
diff --git a/test/ral/providers/group.rb b/test/ral/providers/group.rb
index e4ee82a74..c5956bd78 100755
--- a/test/ral/providers/group.rb
+++ b/test/ral/providers/group.rb
@@ -6,7 +6,7 @@ require 'puppettest'
require 'etc'
class TestGroupProvider < Test::Unit::TestCase
- include PuppetTest
+ include PuppetTest
def setup
super
@@tmpgroups = []
diff --git a/test/ral/providers/host/netinfo.rb b/test/ral/providers/host/netinfo.rb
index e513974fc..131b32eec 100755
--- a/test/ral/providers/host/netinfo.rb
+++ b/test/ral/providers/host/netinfo.rb
@@ -9,18 +9,18 @@ require 'puppettest'
if Puppet::Type.type(:host).provider(:netinfo).suitable?
class TestNetinfoHostProvider < Test::Unit::TestCase
- include PuppetTest
-
- def setup
- super
- @host = Puppet::Type.type(:host)
- @provider = @host.provider(:netinfo)
+ include PuppetTest
+
+ def setup
+ super
+ @host = Puppet::Type.type(:host)
+ @provider = @host.provider(:netinfo)
end
- def test_list
- list = nil
- assert_nothing_raised do
- list = @provider.instances
+ def test_list
+ list = nil
+ assert_nothing_raised do
+ list = @provider.instances
end
assert(list.length > 0)
list.each do |prov|
diff --git a/test/ral/providers/host/parsed.rb b/test/ral/providers/host/parsed.rb
index 60920d05b..28b553356 100755
--- a/test/ral/providers/host/parsed.rb
+++ b/test/ral/providers/host/parsed.rb
@@ -8,8 +8,8 @@ require 'puppettest/fileparsing'
require 'test/unit'
class TestParsedHostProvider < Test::Unit::TestCase
- include PuppetTest
- include PuppetTest::FileParsing
+ include PuppetTest
+ include PuppetTest::FileParsing
def setup
super
diff --git a/test/ral/providers/mailalias/aliases.rb b/test/ral/providers/mailalias/aliases.rb
index 46dd65ff1..d938fbeef 100755
--- a/test/ral/providers/mailalias/aliases.rb
+++ b/test/ral/providers/mailalias/aliases.rb
@@ -6,8 +6,8 @@ require 'puppettest'
require 'puppettest/fileparsing'
class TestMailaliasAliasesProvider < Test::Unit::TestCase
- include PuppetTest
- include PuppetTest::FileParsing
+ include PuppetTest
+ include PuppetTest::FileParsing
def setup
super
diff --git a/test/ral/providers/mount/netinfo.rb b/test/ral/providers/mount/netinfo.rb
index 9a02bc471..7a9703c1b 100755
--- a/test/ral/providers/mount/netinfo.rb
+++ b/test/ral/providers/mount/netinfo.rb
@@ -9,11 +9,11 @@ require 'puppettest'
#
# if Puppet::Type.type(:mount).provider(:netinfo).suitable?
# class TestNetinfoMountProvider < Test::Unit::TestCase
-# include PuppetTest
-#
-# def setup
-# super
-# @mount = Puppet::Type.type(:mount)
+# include PuppetTest
+#
+# def setup
+# super
+# @mount = Puppet::Type.type(:mount)
# end
#
# if Process.uid == 0 and Facter.value(:hostname) == "midden"
@@ -58,11 +58,11 @@ require 'puppettest'
# assert(prov.device != :absent, "Netinfo thinks the root device is missing")
# end
# end
-#
-# def test_list
-# list = nil
-# assert_nothing_raised do
-# list = @mount.list
+#
+# def test_list
+# list = nil
+# assert_nothing_raised do
+# list = @mount.list
# end
# assert(list.length > 0)
# list.each do |obj|
diff --git a/test/ral/providers/package.rb b/test/ral/providers/package.rb
index 486078ed7..8af5108cc 100755
--- a/test/ral/providers/package.rb
+++ b/test/ral/providers/package.rb
@@ -6,7 +6,7 @@ require 'puppettest'
require 'etc'
class TestPackageProvider < Test::Unit::TestCase
- include PuppetTest
+ include PuppetTest
def setup
super
diff --git a/test/ral/providers/package/aptitude.rb b/test/ral/providers/package/aptitude.rb
index a7c0c84ac..5e4749333 100755
--- a/test/ral/providers/package/aptitude.rb
+++ b/test/ral/providers/package/aptitude.rb
@@ -8,64 +8,64 @@ class AptitudePackageProviderTest < PuppetTest::TestCase
confine "Aptitude package provider missing" =>
Puppet::Type.type(:package).provider(:aptitude).suitable?
- def setup
+ def setup
super
- @type = Puppet::Type.type(:package)
- end
-
- def test_install
- pkg = @type.new :name => 'faff',
- :provider => :aptitude,
- :ensure => :present,
- :source => "/tmp/faff.deb"
+ @type = Puppet::Type.type(:package)
+ end
- pkg.provider.expects(
- :dpkgquery
- ).with(
- '-W',
- '--showformat',
- '${Status} ${Package} ${Version}\n',
- 'faff'
- ).returns(
- "deinstall ok config-files faff 1.2.3-1\n"
- ).times(1)
+ def test_install
+ pkg = @type.new :name => 'faff',
+ :provider => :aptitude,
+ :ensure => :present,
+ :source => "/tmp/faff.deb"
- pkg.provider.expects(
- :aptitude
- ).with(
- '-y',
- '-o',
- 'DPkg::Options::=--force-confold',
- :install,
- 'faff'
- ).returns(0)
-
- pkg.evaluate.each { |state|
+ pkg.provider.expects(
+ :dpkgquery
+ ).with(
+ '-W',
+ '--showformat',
+ '${Status} ${Package} ${Version}\n',
+ 'faff'
+ ).returns(
+ "deinstall ok config-files faff 1.2.3-1\n"
+ ).times(1)
+
+ pkg.provider.expects(
+ :aptitude
+ ).with(
+ '-y',
+ '-o',
+ 'DPkg::Options::=--force-confold',
+ :install,
+ 'faff'
+ ).returns(0)
+
+ pkg.evaluate.each { |state|
state.forward
}
- end
-
- def test_purge
- pkg = @type.new :name => 'faff', :provider => :aptitude, :ensure => :purged
+ end
+
+ def test_purge
+ pkg = @type.new :name => 'faff', :provider => :aptitude, :ensure => :purged
+
+ pkg.provider.expects(
+ :dpkgquery
+ ).with(
+ '-W',
+ '--showformat',
+ '${Status} ${Package} ${Version}\n',
+ 'faff'
+ ).returns(
+ "install ok installed faff 1.2.3-1\n"
+ ).times(1)
+ pkg.provider.expects(
+ :aptitude
+ ).with(
+ '-y',
+ 'purge',
+ 'faff'
+ ).returns(0)
- pkg.provider.expects(
- :dpkgquery
- ).with(
- '-W',
- '--showformat',
- '${Status} ${Package} ${Version}\n',
- 'faff'
- ).returns(
- "install ok installed faff 1.2.3-1\n"
- ).times(1)
- pkg.provider.expects(
- :aptitude
- ).with(
- '-y',
- 'purge',
- 'faff'
- ).returns(0)
-
- pkg.evaluate.each { |state| state.forward }
- end
+ pkg.evaluate.each { |state| state.forward }
+ end
end
diff --git a/test/ral/providers/parsedfile.rb b/test/ral/providers/parsedfile.rb
index d57a873ea..8a9fa89d2 100755
--- a/test/ral/providers/parsedfile.rb
+++ b/test/ral/providers/parsedfile.rb
@@ -10,8 +10,8 @@ require 'puppet/provider/parsedfile'
require 'facter'
class TestParsedFile < Test::Unit::TestCase
- include PuppetTest
- include PuppetTest::FileParsing
+ include PuppetTest
+ include PuppetTest::FileParsing
Puppet::Type.newtype(:testparsedfiletype) do
ensurable
diff --git a/test/ral/providers/port/parsed.rb b/test/ral/providers/port/parsed.rb
index d295f04e6..41da17993 100755
--- a/test/ral/providers/port/parsed.rb
+++ b/test/ral/providers/port/parsed.rb
@@ -9,8 +9,8 @@ require 'puppettest'
#require 'facter'
#
#class TestParsedPort < Test::Unit::TestCase
-# include PuppetTest
-# include PuppetTest::FileParsing
+# include PuppetTest
+# include PuppetTest::FileParsing
#
# def setup
# super
diff --git a/test/ral/providers/provider.rb b/test/ral/providers/provider.rb
index 4df67807f..9e5e585dc 100755
--- a/test/ral/providers/provider.rb
+++ b/test/ral/providers/provider.rb
@@ -6,7 +6,7 @@ require 'puppettest'
require 'facter'
class TestProvider < Test::Unit::TestCase
- include PuppetTest
+ include PuppetTest
def echo
echo = Puppet::Util.binary("echo")
@@ -345,7 +345,7 @@ class TestProvider < Test::Unit::TestCase
end
class TestProviderFeatures < Test::Unit::TestCase
- include PuppetTest
+ include PuppetTest
def setup
super
diff --git a/test/ral/providers/service/base.rb b/test/ral/providers/service/base.rb
index c11ce4801..03ecca59d 100755
--- a/test/ral/providers/service/base.rb
+++ b/test/ral/providers/service/base.rb
@@ -8,32 +8,32 @@ require File.dirname(__FILE__) + '/../../../lib/puppettest'
require 'puppettest'
class TestBaseServiceProvider < Test::Unit::TestCase
- include PuppetTest
+ include PuppetTest
- def test_base
- running = tempfile()
-
- commands = {}
- %w{touch rm test}.each do |c|
- path = %x{which #{c}}.chomp
- if path == ""
- $stderr.puts "Cannot find '#{c}'; cannot test base service provider"
- return
+ def test_base
+ running = tempfile()
+
+ commands = {}
+ %w{touch rm test}.each do |c|
+ path = %x{which #{c}}.chomp
+ if path == ""
+ $stderr.puts "Cannot find '#{c}'; cannot test base service provider"
+ return
end
commands[c.to_sym] = path
end
- service = Puppet::Type.type(:service).new(
- :name => "yaytest", :provider => :base,
- :start => "%s %s" % [commands[:touch], running],
- :status => "%s -f %s" % [commands[:test], running],
- :stop => "%s %s" % [commands[:rm], running]
- )
-
- provider = service.provider
- assert(provider, "did not get base provider")
-
- assert_nothing_raised do
- provider.start
+ service = Puppet::Type.type(:service).new(
+ :name => "yaytest", :provider => :base,
+ :start => "%s %s" % [commands[:touch], running],
+ :status => "%s -f %s" % [commands[:test], running],
+ :stop => "%s %s" % [commands[:rm], running]
+ )
+
+ provider = service.provider
+ assert(provider, "did not get base provider")
+
+ assert_nothing_raised do
+ provider.start
end
assert(FileTest.exists?(running), "start was not called correctly")
assert_nothing_raised do
@@ -51,16 +51,16 @@ class TestBaseServiceProvider < Test::Unit::TestCase
# Testing #454
def test_that_failures_propagate
nope = "/no/such/command"
- service = Puppet::Type.type(:service).new(
- :name => "yaytest", :provider => :base,
- :start => nope,
- :status => nope,
- :stop => nope,
- :restart => nope
- )
+ service = Puppet::Type.type(:service).new(
+ :name => "yaytest", :provider => :base,
+ :start => nope,
+ :status => nope,
+ :stop => nope,
+ :restart => nope
+ )
- provider = service.provider
- assert(provider, "did not get base provider")
+ provider = service.provider
+ assert(provider, "did not get base provider")
# We can't fail well when status is messed up, because we depend on the return code
# of the command for data.
diff --git a/test/ral/providers/sshkey/parsed.rb b/test/ral/providers/sshkey/parsed.rb
index d7d083db0..f2992386d 100755
--- a/test/ral/providers/sshkey/parsed.rb
+++ b/test/ral/providers/sshkey/parsed.rb
@@ -6,8 +6,8 @@ require 'puppettest'
require 'puppettest/fileparsing'
class TestParsedSSHKey < Test::Unit::TestCase
- include PuppetTest
- include PuppetTest::FileParsing
+ include PuppetTest
+ include PuppetTest::FileParsing
def setup
super
diff --git a/test/ral/providers/user/useradd.rb b/test/ral/providers/user/useradd.rb
index f791a054a..1b1f5d7e8 100755
--- a/test/ral/providers/user/useradd.rb
+++ b/test/ral/providers/user/useradd.rb
@@ -8,12 +8,12 @@ class UserAddProviderTest < PuppetTest::TestCase
confine "useradd user provider missing" =>
Puppet::Type.type(:user).provider(:useradd).suitable?
- def setup
+ def setup
super
- @type = Puppet::Type.type(:user)
- @provider = Puppet::Type.type(:user).provider(:useradd)
+ @type = Puppet::Type.type(:user)
+ @provider = Puppet::Type.type(:user).provider(:useradd)
@home = tempfile
- @vals = {:name => 'faff',
+ @vals = {:name => 'faff',
:provider => :useradd,
:ensure => :present,
:uid => 5000,
@@ -22,10 +22,10 @@ class UserAddProviderTest < PuppetTest::TestCase
:comment => "yayness",
:groups => %w{one two}
}
- end
+ end
def setup_user
- @user = @type.new(@vals)
+ @user = @type.new(@vals)
@vals.each do |name, val|
next unless @user.class.validproperty?(name)
@@ -39,9 +39,9 @@ class UserAddProviderTest < PuppetTest::TestCase
"useradd provider is missing %s" % feature)
end
end
-
- def test_create
- user = setup_user
+
+ def test_create
+ user = setup_user
@vals.each do |name, val|
next unless user.class.validproperty?(name)
@@ -50,7 +50,7 @@ class UserAddProviderTest < PuppetTest::TestCase
user.expects(:allowdupe?).returns(false)
user.expects(:managehome?).returns(false)
- user.provider.expects(:execute).with do |params|
+ user.provider.expects(:execute).with do |params|
command = params.shift
assert_equal(@provider.command(:add), command,
"Got incorrect command")
@@ -78,9 +78,9 @@ class UserAddProviderTest < PuppetTest::TestCase
true
end
-
+
user.provider.create
- end
+ end
# Make sure we add the right flags when managing home
def test_managehome
@@ -95,7 +95,7 @@ class UserAddProviderTest < PuppetTest::TestCase
# First run
@user.expects(:managehome?).returns(true)
- @user.provider.expects(:execute).with do |params|
+ @user.provider.expects(:execute).with do |params|
assert_equal(params[0], @provider.command(:add),
"useradd was not called")
assert(params.include?("-m"),
@@ -116,7 +116,7 @@ class UserAddProviderTest < PuppetTest::TestCase
# First run
@user.expects(:managehome?).returns(false)
- @user.provider.expects(:execute).with do |params|
+ @user.provider.expects(:execute).with do |params|
assert_equal(params[0], @provider.command(:add),
"useradd was not called")
if %w{Fedora RedHat}.include?(Facter.value(:operatingsystem))
@@ -144,7 +144,7 @@ class UserAddProviderTest < PuppetTest::TestCase
# First run
@user.expects(:allowdupe?).returns(true)
- @user.provider.expects(:execute).with do |params|
+ @user.provider.expects(:execute).with do |params|
assert_equal(params[0], @provider.command(:add),
"useradd was not called")
assert(params.include?("-o"),
@@ -163,7 +163,7 @@ class UserAddProviderTest < PuppetTest::TestCase
# First run
@user.expects(:allowdupe?).returns(false)
- @user.provider.expects(:execute).with do |params|
+ @user.provider.expects(:execute).with do |params|
assert_equal(params[0], @provider.command(:add),
"useradd was not called")
assert(! params.include?("-o"),
@@ -182,7 +182,7 @@ class UserAddProviderTest < PuppetTest::TestCase
@vals[:password] = "somethingorother"
setup_user
- @user.provider.expects(:execute).with do |params|
+ @user.provider.expects(:execute).with do |params|
assert_equal(params[0], @provider.command(:add),
"useradd was not called")
params.shift
@@ -204,7 +204,7 @@ class UserAddProviderTest < PuppetTest::TestCase
setup_user
@vals[:password] = "somethingelse"
- @user.provider.expects(:execute).with do |params|
+ @user.provider.expects(:execute).with do |params|
assert_equal(params[0], @provider.command(:modify),
"usermod was not called")
diff --git a/test/ral/type/cron.rb b/test/ral/type/cron.rb
index 20ed773d6..2e25d82df 100755
--- a/test/ral/type/cron.rb
+++ b/test/ral/type/cron.rb
@@ -7,7 +7,7 @@ require 'puppettest'
# Test cron job creation, modification, and destruction
class TestCron < Test::Unit::TestCase
- include PuppetTest
+ include PuppetTest
def setup
super
diff --git a/test/ral/type/exec.rb b/test/ral/type/exec.rb
index e156beaae..9384d09db 100755
--- a/test/ral/type/exec.rb
+++ b/test/ral/type/exec.rb
@@ -5,7 +5,7 @@ require File.dirname(__FILE__) + '/../../lib/puppettest'
require 'puppettest'
class TestExec < Test::Unit::TestCase
- include PuppetTest
+ include PuppetTest
def test_execution
command = nil
output = nil
diff --git a/test/ral/type/group.rb b/test/ral/type/group.rb
index e82144b81..c6d6c5ee6 100755
--- a/test/ral/type/group.rb
+++ b/test/ral/type/group.rb
@@ -6,7 +6,7 @@ require 'puppettest'
require 'etc'
class TestGroup < Test::Unit::TestCase
- include PuppetTest
+ include PuppetTest
p = Puppet::Type.type(:group).provide :fake, :parent => PuppetTest::FakeProvider do
@name = :fake
diff --git a/test/ral/type/host.rb b/test/ral/type/host.rb
index 5cafddbc0..95f698157 100755
--- a/test/ral/type/host.rb
+++ b/test/ral/type/host.rb
@@ -7,7 +7,7 @@ require 'test/unit'
require 'facter'
class TestHost < Test::Unit::TestCase
- include PuppetTest
+ include PuppetTest
def setup
super
diff --git a/test/ral/type/mailalias.rb b/test/ral/type/mailalias.rb
index 0dc0f6a6a..c9974dc1b 100755
--- a/test/ral/type/mailalias.rb
+++ b/test/ral/type/mailalias.rb
@@ -6,7 +6,7 @@ require 'puppettest'
require 'mocha'
class TestMailAlias < Test::Unit::TestCase
- include PuppetTest
+ include PuppetTest
def setup
super
diff --git a/test/ral/type/port.rb b/test/ral/type/port.rb
index 20d243d26..c751cd89f 100755
--- a/test/ral/type/port.rb
+++ b/test/ral/type/port.rb
@@ -7,7 +7,7 @@ require 'puppettest'
#require 'facter'
#
#class TestPort < Test::Unit::TestCase
-# include PuppetTest
+# include PuppetTest
#
# def setup
# super
diff --git a/test/ral/type/resources.rb b/test/ral/type/resources.rb
index 066a9e6bf..426e76b0e 100755
--- a/test/ral/type/resources.rb
+++ b/test/ral/type/resources.rb
@@ -8,9 +8,9 @@ require File.dirname(__FILE__) + '/../../lib/puppettest'
require 'puppettest'
class TestResources < Test::Unit::TestCase
- include PuppetTest
-
- def add_purge_lister
+ include PuppetTest
+
+ def add_purge_lister
# Now define the list method
class << @purgetype
def instances
@@ -29,8 +29,8 @@ class TestResources < Test::Unit::TestCase
end
obj
end
-
- def mkpurgertype
+
+ def mkpurgertype
# Create a purgeable type
$purgemembers = {}
@purgetype = Puppet::Type.newtype(:purgetest) do
@@ -53,10 +53,10 @@ class TestResources < Test::Unit::TestCase
Puppet::Type.rmtype(:purgetest)
end
end
-
- def setup
- super
- @type = Puppet::Type.type(:resources)
+
+ def setup
+ super
+ @type = Puppet::Type.type(:resources)
end
def test_purge
diff --git a/test/ral/type/service.rb b/test/ral/type/service.rb
index 6f78c53ce..d12a94cc0 100755
--- a/test/ral/type/service.rb
+++ b/test/ral/type/service.rb
@@ -6,7 +6,7 @@ require 'puppettest'
require 'mocha'
class TestServiceType < Test::Unit::TestCase
- include PuppetTest
+ include PuppetTest
# #199
def test_no_refresh_when_starting
diff --git a/test/ral/type/sshkey.rb b/test/ral/type/sshkey.rb
index 509a381fc..981079e92 100755
--- a/test/ral/type/sshkey.rb
+++ b/test/ral/type/sshkey.rb
@@ -6,7 +6,7 @@ require 'puppettest'
require 'facter'
class TestSSHKey < Test::Unit::TestCase
- include PuppetTest
+ include PuppetTest
def setup
super
# god i'm lazy
diff --git a/test/ral/type/user.rb b/test/ral/type/user.rb
index 627191e38..7cceef710 100755
--- a/test/ral/type/user.rb
+++ b/test/ral/type/user.rb
@@ -6,7 +6,7 @@ require 'puppettest'
require 'etc'
class TestUser < Test::Unit::TestCase
- include PuppetTest
+ include PuppetTest
p = Puppet::Type.type(:user).provide :fake, :parent => PuppetTest::FakeProvider do
@name = :fake
diff --git a/test/ral/type/yumrepo.rb b/test/ral/type/yumrepo.rb
index 5ece6c1e0..f3221fb84 100755
--- a/test/ral/type/yumrepo.rb
+++ b/test/ral/type/yumrepo.rb
@@ -6,7 +6,7 @@ require 'puppettest'
require 'fileutils'
class TestYumRepo < Test::Unit::TestCase
- include PuppetTest
+ include PuppetTest
def setup
super
diff --git a/test/test b/test/test
index 1e0f9fd2b..98c504a8d 100755
--- a/test/test
+++ b/test/test
@@ -76,11 +76,11 @@ require 'getoptlong'
include Find
result = GetoptLong.new(
- [ "--debug", "-d", GetoptLong::NO_ARGUMENT ],
- [ "--verbose", "-v", GetoptLong::NO_ARGUMENT ],
- [ "-n", GetoptLong::REQUIRED_ARGUMENT ],
- [ "--files", "-f", GetoptLong::NO_ARGUMENT ],
- [ "--help", "-h", GetoptLong::NO_ARGUMENT ]
+ [ "--debug", "-d", GetoptLong::NO_ARGUMENT ],
+ [ "--verbose", "-v", GetoptLong::NO_ARGUMENT ],
+ [ "-n", GetoptLong::REQUIRED_ARGUMENT ],
+ [ "--files", "-f", GetoptLong::NO_ARGUMENT ],
+ [ "--help", "-h", GetoptLong::NO_ARGUMENT ]
)
usage = "USAGE: %s [--help] suite" % $0
diff --git a/test/util/autoload.rb b/test/util/autoload.rb
index 6aaf32995..ae7624b62 100755
--- a/test/util/autoload.rb
+++ b/test/util/autoload.rb
@@ -7,7 +7,7 @@ require 'puppet/util/autoload'
require 'puppettest'
class TestAutoload < Test::Unit::TestCase
- include PuppetTest
+ include PuppetTest
@things = []
def self.newthing(name)
@things << name
diff --git a/test/util/features.rb b/test/util/features.rb
index e20c73c65..ef69ad72b 100755
--- a/test/util/features.rb
+++ b/test/util/features.rb
@@ -9,21 +9,21 @@ require 'puppettest'
require 'puppet/util/feature'
class TestFeatures < Test::Unit::TestCase
- include PuppetTest
-
- def setup
- super
- @libdir = tempfile()
+ include PuppetTest
+
+ def setup
+ super
+ @libdir = tempfile()
Puppet[:libdir] = @libdir
@path = File.join(@libdir, "features")
- @features = Puppet::Util::Feature.new("features")
+ @features = Puppet::Util::Feature.new("features")
end
-
- def test_new
+
+ def test_new
redirect
- assert_nothing_raised do
- @features.add(:failer) do
- raise ArgumentError, "nopes"
+ assert_nothing_raised do
+ @features.add(:failer) do
+ raise ArgumentError, "nopes"
end
end
diff --git a/test/util/fileparsing.rb b/test/util/fileparsing.rb
index adccfab65..d7c196cdb 100755
--- a/test/util/fileparsing.rb
+++ b/test/util/fileparsing.rb
@@ -8,8 +8,8 @@ require 'puppet'
require 'puppet/util/fileparsing'
class TestUtilFileParsing < Test::Unit::TestCase
- include PuppetTest
- include PuppetTest::FileParsing
+ include PuppetTest
+ include PuppetTest::FileParsing
class FParser
include Puppet::Util::FileParsing
@@ -598,8 +598,8 @@ billy three four\n"
end
class TestUtilFileRecord < Test::Unit::TestCase
- include PuppetTest
- include PuppetTest::FileParsing
+ include PuppetTest
+ include PuppetTest::FileParsing
Record = Puppet::Util::FileParsing::FileRecord
def test_new_filerecord
diff --git a/test/util/inifile.rb b/test/util/inifile.rb
index 498816b8d..50075fa92 100755
--- a/test/util/inifile.rb
+++ b/test/util/inifile.rb
@@ -7,7 +7,7 @@ require 'puppet/util/inifile'
require 'puppettest'
class TestFileType < Test::Unit::TestCase
- include PuppetTest
+ include PuppetTest
def setup
super
diff --git a/test/util/instance_loader.rb b/test/util/instance_loader.rb
index 708d3f893..a7ea41532 100755
--- a/test/util/instance_loader.rb
+++ b/test/util/instance_loader.rb
@@ -7,7 +7,7 @@ require 'puppet/util/instance_loader'
require 'puppettest'
class TestInstanceloader < Test::Unit::TestCase
- include PuppetTest
+ include PuppetTest
def setup
super
diff --git a/test/util/pidlock.rb b/test/util/pidlock.rb
index 671668d01..8d22ead81 100755
--- a/test/util/pidlock.rb
+++ b/test/util/pidlock.rb
@@ -7,120 +7,120 @@ require 'fileutils'
Puppet.debug = false
class TestPuppetUtilPidlock < Test::Unit::TestCase
- include PuppetTest
-
- def setup
- super
- @workdir = tstdir
- end
-
- def teardown
- super
- FileUtils.rm_rf(@workdir)
- end
-
- def test_00_basic_create
- l = nil
- assert_nothing_raised { l = Puppet::Util::Pidlock.new(@workdir + '/nothingmuch') }
-
- assert_equal Puppet::Util::Pidlock, l.class
-
- assert_equal @workdir + '/nothingmuch', l.lockfile
- end
-
- def test_10_uncontended_lock
- l = Puppet::Util::Pidlock.new(@workdir + '/test_lock')
-
- assert !l.locked?
- assert !l.mine?
- assert l.lock
- assert l.locked?
- assert l.mine?
- assert !l.anonymous?
- # It's OK to call lock multiple times
- assert l.lock
- assert l.unlock
- assert !l.locked?
- assert !l.mine?
- end
-
- def test_20_someone_elses_lock
- childpid = nil
- l = Puppet::Util::Pidlock.new(@workdir + '/someone_elses_lock')
-
- # First, we need a PID that's guaranteed to be (a) used, (b) someone
- # else's, and (c) around for the life of this test.
- childpid = fork { loop do; sleep 10; end }
-
- File.open(l.lockfile, 'w') { |fd| fd.write(childpid) }
-
- assert l.locked?
- assert !l.mine?
- assert !l.lock
- assert l.locked?
- assert !l.mine?
- assert !l.unlock
- assert l.locked?
- assert !l.mine?
- ensure
- Process.kill("KILL", childpid) unless childpid.nil?
- end
-
- def test_30_stale_lock
- # This is a bit hard to guarantee, but we need a PID that is definitely
- # unused, and will stay so for the the life of this test. Our best
- # bet is to create a process, get it's PID, let it die, and *then*
- # lock on it.
- childpid = fork { exit }
-
- # Now we can't continue until we're sure that the PID is dead
- Process.wait(childpid)
-
- l = Puppet::Util::Pidlock.new(@workdir + '/stale_lock')
-
- # locked? should clear the lockfile
- File.open(l.lockfile, 'w') { |fd| fd.write(childpid) }
- assert File.exists?(l.lockfile)
- assert !l.locked?
- assert !File.exists?(l.lockfile)
-
- # lock should replace the lockfile with our own
- File.open(l.lockfile, 'w') { |fd| fd.write(childpid) }
- assert File.exists?(l.lockfile)
- assert l.lock
- assert l.locked?
- assert l.mine?
-
- # unlock should fail, and should *not* molest the existing lockfile,
- # despite it being stale
- File.open(l.lockfile, 'w') { |fd| fd.write(childpid) }
- assert File.exists?(l.lockfile)
- assert !l.unlock
- assert File.exists?(l.lockfile)
- end
-
- def test_40_not_locked_at_all
- l = Puppet::Util::Pidlock.new(@workdir + '/not_locked')
-
- assert !l.locked?
- # We can't unlock if we don't hold the lock
- assert !l.unlock
- end
-
- def test_50_anonymous_lock
- l = Puppet::Util::Pidlock.new(@workdir + '/anonymous_lock')
-
- assert !l.locked?
- assert l.lock(:anonymous => true)
- assert l.locked?
- assert l.anonymous?
- assert !l.mine?
- assert "", File.read(l.lockfile)
- assert !l.unlock
- assert l.locked?
- assert l.anonymous?
- assert l.unlock(:anonymous => true)
- assert !File.exists?(l.lockfile)
- end
+ include PuppetTest
+
+ def setup
+ super
+ @workdir = tstdir
+ end
+
+ def teardown
+ super
+ FileUtils.rm_rf(@workdir)
+ end
+
+ def test_00_basic_create
+ l = nil
+ assert_nothing_raised { l = Puppet::Util::Pidlock.new(@workdir + '/nothingmuch') }
+
+ assert_equal Puppet::Util::Pidlock, l.class
+
+ assert_equal @workdir + '/nothingmuch', l.lockfile
+ end
+
+ def test_10_uncontended_lock
+ l = Puppet::Util::Pidlock.new(@workdir + '/test_lock')
+
+ assert !l.locked?
+ assert !l.mine?
+ assert l.lock
+ assert l.locked?
+ assert l.mine?
+ assert !l.anonymous?
+ # It's OK to call lock multiple times
+ assert l.lock
+ assert l.unlock
+ assert !l.locked?
+ assert !l.mine?
+ end
+
+ def test_20_someone_elses_lock
+ childpid = nil
+ l = Puppet::Util::Pidlock.new(@workdir + '/someone_elses_lock')
+
+ # First, we need a PID that's guaranteed to be (a) used, (b) someone
+ # else's, and (c) around for the life of this test.
+ childpid = fork { loop do; sleep 10; end }
+
+ File.open(l.lockfile, 'w') { |fd| fd.write(childpid) }
+
+ assert l.locked?
+ assert !l.mine?
+ assert !l.lock
+ assert l.locked?
+ assert !l.mine?
+ assert !l.unlock
+ assert l.locked?
+ assert !l.mine?
+ ensure
+ Process.kill("KILL", childpid) unless childpid.nil?
+ end
+
+ def test_30_stale_lock
+ # This is a bit hard to guarantee, but we need a PID that is definitely
+ # unused, and will stay so for the the life of this test. Our best
+ # bet is to create a process, get it's PID, let it die, and *then*
+ # lock on it.
+ childpid = fork { exit }
+
+ # Now we can't continue until we're sure that the PID is dead
+ Process.wait(childpid)
+
+ l = Puppet::Util::Pidlock.new(@workdir + '/stale_lock')
+
+ # locked? should clear the lockfile
+ File.open(l.lockfile, 'w') { |fd| fd.write(childpid) }
+ assert File.exists?(l.lockfile)
+ assert !l.locked?
+ assert !File.exists?(l.lockfile)
+
+ # lock should replace the lockfile with our own
+ File.open(l.lockfile, 'w') { |fd| fd.write(childpid) }
+ assert File.exists?(l.lockfile)
+ assert l.lock
+ assert l.locked?
+ assert l.mine?
+
+ # unlock should fail, and should *not* molest the existing lockfile,
+ # despite it being stale
+ File.open(l.lockfile, 'w') { |fd| fd.write(childpid) }
+ assert File.exists?(l.lockfile)
+ assert !l.unlock
+ assert File.exists?(l.lockfile)
+ end
+
+ def test_40_not_locked_at_all
+ l = Puppet::Util::Pidlock.new(@workdir + '/not_locked')
+
+ assert !l.locked?
+ # We can't unlock if we don't hold the lock
+ assert !l.unlock
+ end
+
+ def test_50_anonymous_lock
+ l = Puppet::Util::Pidlock.new(@workdir + '/anonymous_lock')
+
+ assert !l.locked?
+ assert l.lock(:anonymous => true)
+ assert l.locked?
+ assert l.anonymous?
+ assert !l.mine?
+ assert "", File.read(l.lockfile)
+ assert !l.unlock
+ assert l.locked?
+ assert l.anonymous?
+ assert l.unlock(:anonymous => true)
+ assert !File.exists?(l.lockfile)
+ end
end
-
+
diff --git a/test/util/settings.rb b/test/util/settings.rb
index 2ff9e66ec..1fdd425e6 100755
--- a/test/util/settings.rb
+++ b/test/util/settings.rb
@@ -8,8 +8,8 @@ require 'puppet/util/settings'
require 'puppettest/parsertesting'
class TestSettings < Test::Unit::TestCase
- include PuppetTest
- include PuppetTest::ParserTesting
+ include PuppetTest
+ include PuppetTest::ParserTesting
CElement = Puppet::Util::Settings::CElement
CBoolean = Puppet::Util::Settings::CBoolean
diff --git a/test/util/storage.rb b/test/util/storage.rb
index cc378c690..89c3b13f8 100755
--- a/test/util/storage.rb
+++ b/test/util/storage.rb
@@ -6,7 +6,7 @@ require 'puppet'
require 'puppettest'
class TestStorage < Test::Unit::TestCase
- include PuppetTest
+ include PuppetTest
def mkfile
path = tempfile()