summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/Rakefile4
-rwxr-xr-xtest/certmgr/ca.rb10
-rwxr-xr-xtest/certmgr/certmgr.rb8
-rw-r--r--test/data/providers/cron/crontab.allthree4
-rw-r--r--test/data/providers/cron/crontab.envNcomment2
-rw-r--r--test/data/providers/cron/crontab.envNname2
-rw-r--r--test/data/providers/cron/crontab.multirecords2
-rw-r--r--test/data/providers/cron/crontab_collections.yaml28
-rw-r--r--test/data/providers/cron/crontab_multiple_with_env.yaml12
-rw-r--r--test/data/providers/cron/crontab_sample_records.yaml204
-rw-r--r--test/data/providers/package/testpackages.yaml12
-rw-r--r--test/data/reports/1.yaml34
-rw-r--r--test/data/reports/tagmail_passers.conf4
-rw-r--r--test/data/snippets/casestatement.pp4
-rw-r--r--test/data/snippets/classincludes.pp2
-rw-r--r--test/data/snippets/fqparents.pp4
-rw-r--r--test/data/types/hosts/12
-rw-r--r--test/data/types/port/darwin1566
-rwxr-xr-xtest/language/ast/resource_reference.rb2
-rwxr-xr-xtest/language/ast/selector.rb16
-rwxr-xr-xtest/language/ast/variable.rb2
-rwxr-xr-xtest/language/functions.rb24
-rwxr-xr-xtest/language/parser.rb22
-rwxr-xr-xtest/language/scope.rb4
-rwxr-xr-xtest/language/snippets.rb8
-rwxr-xr-xtest/lib/puppettest.rb8
-rw-r--r--test/lib/puppettest/certificates.rb4
-rw-r--r--test/lib/puppettest/fakes.rb2
-rw-r--r--test/lib/puppettest/parsertesting.rb6
-rw-r--r--test/lib/puppettest/railstesting.rb6
-rw-r--r--test/lib/puppettest/servertest.rb2
-rw-r--r--test/lib/puppettest/support/assertions.rb4
-rwxr-xr-xtest/lib/puppettest/support/resources.rb10
-rwxr-xr-xtest/network/handler/bucket.rb4
-rwxr-xr-xtest/network/handler/fileserver.rb28
-rwxr-xr-xtest/network/server/webrick.rb2
-rwxr-xr-xtest/other/dsl.rb2
-rwxr-xr-xtest/other/events.rb4
-rwxr-xr-xtest/other/puppet.rb2
-rwxr-xr-xtest/other/relationships.rb22
-rwxr-xr-xtest/other/report.rb28
-rwxr-xr-xtest/other/transactions.rb74
-rwxr-xr-xtest/puppet/tc_suidmanager.rb2
-rwxr-xr-xtest/rails/railsparameter.rb6
-rwxr-xr-xtest/ral/manager/attributes.rb2
-rwxr-xr-xtest/ral/manager/manager.rb14
-rwxr-xr-xtest/ral/manager/type.rb22
-rwxr-xr-xtest/ral/providers/cron/crontab.rb10
-rwxr-xr-xtest/ral/providers/group.rb2
-rwxr-xr-xtest/ral/providers/host/netinfo.rb8
-rwxr-xr-xtest/ral/providers/mailalias/aliases.rb2
-rwxr-xr-xtest/ral/providers/mount/netinfo.rb26
-rwxr-xr-xtest/ral/providers/package.rb2
-rwxr-xr-xtest/ral/providers/package/aptitude.rb2
-rwxr-xr-xtest/ral/providers/package/aptrpm.rb8
-rwxr-xr-xtest/ral/providers/parsedfile.rb6
-rwxr-xr-xtest/ral/providers/port/parsed.rb6
-rwxr-xr-xtest/ral/providers/provider.rb6
-rwxr-xr-xtest/ral/providers/service/base.rb2
-rwxr-xr-xtest/ral/providers/sshkey/parsed.rb22
-rwxr-xr-xtest/ral/providers/user.rb8
-rwxr-xr-xtest/ral/type/cron.rb4
-rwxr-xr-xtest/ral/type/exec.rb14
-rwxr-xr-xtest/ral/type/file.rb64
-rwxr-xr-xtest/ral/type/fileignoresource.rb64
-rwxr-xr-xtest/ral/type/filesources.rb32
-rwxr-xr-xtest/ral/type/group.rb2
-rwxr-xr-xtest/ral/type/host.rb10
-rwxr-xr-xtest/ral/type/resources.rb44
-rwxr-xr-xtest/ral/type/sshkey.rb12
-rwxr-xr-xtest/ral/type/user.rb6
-rwxr-xr-xtest/ral/type/yumrepo.rb6
-rwxr-xr-xtest/ral/type/zone.rb4
-rwxr-xr-xtest/test4
-rwxr-xr-xtest/util/features.rb14
-rwxr-xr-xtest/util/fileparsing.rb12
-rwxr-xr-xtest/util/inifile.rb10
-rwxr-xr-xtest/util/log.rb2
-rwxr-xr-xtest/util/package.rb2
-rwxr-xr-xtest/util/settings.rb20
-rwxr-xr-xtest/util/storage.rb4
-rwxr-xr-xtest/util/utiltest.rb20
82 files changed, 1348 insertions, 1348 deletions
diff --git a/test/Rakefile b/test/Rakefile
index a1f8c26ec..47be213d9 100644
--- a/test/Rakefile
+++ b/test/Rakefile
@@ -75,8 +75,8 @@ filemap.each do |dir, files|
t.libs += $test_library_paths + ['..']
t.libs << '..'
t.test_files = [ file ]
- t.verbose = true
- end
+ t.verbose = true
+ end
end
end
diff --git a/test/certmgr/ca.rb b/test/certmgr/ca.rb
index e354f3dea..5b7944b46 100755
--- a/test/certmgr/ca.rb
+++ b/test/certmgr/ca.rb
@@ -22,11 +22,11 @@ class TestCA < Test::Unit::TestCase
def mkca
Puppet::SSLCertificates::CA.new
end
-
+
def test_clean
dirs = [:csrdir, :signeddir, :publickeydir, :privatekeydir, :certdir]
ca = mkca
-
+
hosts.each do |host|
files = []
dirs.each do |dir|
@@ -46,7 +46,7 @@ class TestCA < Test::Unit::TestCase
end
end
end
-
+
def test_host2Xfile
ca = mkca
hosts.each do |host|
@@ -60,7 +60,7 @@ class TestCA < Test::Unit::TestCase
end
end
end
-
+
def test_list
ca = mkca
# Make a fake csr
@@ -71,7 +71,7 @@ class TestCA < Test::Unit::TestCase
File.open(file, "w") { |f| f.puts "yay" }
list << host.downcase
end
-
+
assert_equal(list.sort, ca.list.sort, "list was not correct")
end
diff --git a/test/certmgr/certmgr.rb b/test/certmgr/certmgr.rb
index 033700089..2c4605f03 100755
--- a/test/certmgr/certmgr.rb
+++ b/test/certmgr/certmgr.rb
@@ -164,7 +164,7 @@ class TestCertMgr < Test::Unit::TestCase
assert_equal($?,0)
assert_equal(File.join(Puppet[:certdir], "signedcertest.pem: OK\n"), output)
end
-
+
def test_interactiveca
ca = nil
@@ -224,14 +224,14 @@ class TestCertMgr < Test::Unit::TestCase
ca = mkCA()
h1 = mksignedcert(ca, "host1.example.com")
h2 = mksignedcert(ca, "host2.example.com")
-
+
assert(ca.cert.verify(ca.cert.public_key))
assert(h1.verify(ca.cert.public_key))
assert(h2.verify(ca.cert.public_key))
crl = ca.crl
assert_not_nil(crl)
-
+
store = mkStore(ca)
assert( store.verify(ca.cert))
assert( store.verify(h1, [ca.cert]))
@@ -252,7 +252,7 @@ class TestCertMgr < Test::Unit::TestCase
assert( store.verify(ca.cert), "Could not verify CA certs after reloading certs.")
assert(!store.verify(h1, [ca.cert]), "Incorrectly verified revoked cert.")
assert( store.verify(h2, [ca.cert]), "Could not verify certs with reloaded CA.")
-
+
ca.revoke(h2.serial)
assert_equal(1, ca.crl.extensions.size)
diff --git a/test/data/providers/cron/crontab.allthree b/test/data/providers/cron/crontab.allthree
index dd2a40466..c1a61c30d 100644
--- a/test/data/providers/cron/crontab.allthree
+++ b/test/data/providers/cron/crontab.allthree
@@ -1,4 +1,4 @@
----
+---
- |
# comment 1
# Puppet Name: name2
@@ -9,7 +9,7 @@
- - :record_type: :comment
:line: "# comment 1"
- :command: command4
- :environment:
+ :environment:
- env3=val
:name: name2
:record_type: :crontab
diff --git a/test/data/providers/cron/crontab.envNcomment b/test/data/providers/cron/crontab.envNcomment
index 63effe076..44d41f535 100644
--- a/test/data/providers/cron/crontab.envNcomment
+++ b/test/data/providers/cron/crontab.envNcomment
@@ -1,4 +1,4 @@
----
+---
- |
# comment 9
env10=val
diff --git a/test/data/providers/cron/crontab.envNname b/test/data/providers/cron/crontab.envNname
index cc058248e..7cbc3fce1 100644
--- a/test/data/providers/cron/crontab.envNname
+++ b/test/data/providers/cron/crontab.envNname
@@ -1,4 +1,4 @@
----
+---
- |
env6=val
# Puppet Name: name7
diff --git a/test/data/providers/cron/crontab.multirecords b/test/data/providers/cron/crontab.multirecords
index 63effe076..44d41f535 100644
--- a/test/data/providers/cron/crontab.multirecords
+++ b/test/data/providers/cron/crontab.multirecords
@@ -1,4 +1,4 @@
----
+---
- |
# comment 9
env10=val
diff --git a/test/data/providers/cron/crontab_collections.yaml b/test/data/providers/cron/crontab_collections.yaml
index 45c8eaf65..b323830d5 100644
--- a/test/data/providers/cron/crontab_collections.yaml
+++ b/test/data/providers/cron/crontab_collections.yaml
@@ -1,43 +1,43 @@
----
-:with_name:
+---
+:with_name:
- :name
- :spaces_in_command_with_times
-:with_env:
+:with_env:
- :environment
- :spaces_in_command_with_times
-:simple:
+:simple:
- :spaces_in_command_with_times
-:with_multiple_envs:
+:with_multiple_envs:
- :environment
- :lowercase_environment
- :spaces_in_command_with_times
-:with_name_and_env:
+:with_name_and_env:
- :name_with_spaces
- :another_env
- :spaces_in_command_with_times
-:with_name_and_multiple_envs:
+:with_name_and_multiple_envs:
- :long_name
- :another_env
- :fourth_env
- :spaces_in_command_with_times
----
-:with_name:
+---
+:with_name:
- :name
- :spaces_in_command_with_times
-:with_env:
+:with_env:
- :environment
- :spaces_in_command_with_times
-:simple:
+:simple:
- :spaces_in_command_with_times
-:with_multiple_envs:
+:with_multiple_envs:
- :environment
- :lowercase_environment
- :spaces_in_command_with_times
-:with_name_and_env:
+:with_name_and_env:
- :name_with_spaces
- :another_env
- :spaces_in_command_with_times
-:with_name_and_multiple_envs:
+:with_name_and_multiple_envs:
- :long_name
- :another_env
- :fourth_env
diff --git a/test/data/providers/cron/crontab_multiple_with_env.yaml b/test/data/providers/cron/crontab_multiple_with_env.yaml
index 8573bd467..ff7af8eb3 100644
--- a/test/data/providers/cron/crontab_multiple_with_env.yaml
+++ b/test/data/providers/cron/crontab_multiple_with_env.yaml
@@ -1,4 +1,4 @@
----
+---
- |
# comment 1
# Puppet Name: name2
@@ -13,19 +13,19 @@
- - :record_type: :comment
:line: "# comment 1"
- :command: command4
- :environment:
+ :environment:
- env3=val
:name: name2
:record_type: :crontab
- :command: command5
- :environment:
+ :environment:
- env3=val
- env4=other
:name: name with spaces
:record_type: :crontab
- :record_type: :comment
:line: "# comment 5"
----
+---
- |
# comment 1
# Puppet Name: name2
@@ -40,12 +40,12 @@
- - :record_type: :comment
:line: "# comment 1"
- :command: command4
- :environment:
+ :environment:
- env3=val
:name: name2
:record_type: :crontab
- :command: command5
- :environment:
+ :environment:
- env3=val
- env4=other
:name: name with spaces
diff --git a/test/data/providers/cron/crontab_sample_records.yaml b/test/data/providers/cron/crontab_sample_records.yaml
index cafe9de25..56dd6ad49 100644
--- a/test/data/providers/cron/crontab_sample_records.yaml
+++ b/test/data/providers/cron/crontab_sample_records.yaml
@@ -1,272 +1,272 @@
----
-:longcommment:
+---
+:longcommment:
:text: "# This is a comment"
- :record:
+ :record:
:line: "# This is a comment"
:record_type: :comment
-:special:
+:special:
:text: "@hourly /bin/date"
- :record:
+ :record:
:special: hourly
:command: /bin/date
:record_type: :freebsd_special
-:long_name:
+:long_name:
:text: "# Puppet Name: long_name"
- :record:
+ :record:
:line: "# Puppet Name: long_name"
:name: long_name
:record_type: :comment
-:multiple_minutes:
+:multiple_minutes:
:text: 5,15 * * * * /bin/date
- :record:
- :minute:
+ :record:
+ :minute:
- "5"
- "15"
:command: /bin/date
:record_type: :crontab
-:environment:
+:environment:
:text: ONE=TWO
- :record:
+ :record:
:line: ONE=TWO
:record_type: :environment
-:empty:
+:empty:
:text: ""
- :record:
+ :record:
:line: ""
:record_type: :blank
-:simple:
+:simple:
:text: "* * * * * /bin/date"
- :record:
+ :record:
:command: /bin/date
:record_type: :crontab
-:whitespace:
+:whitespace:
:text: " "
- :record:
+ :record:
:line: " "
:record_type: :blank
-:minute_and_hour:
+:minute_and_hour:
:text: 5 15 * * * /bin/date
- :record:
- :minute:
+ :record:
+ :minute:
- "5"
- :hour:
+ :hour:
- "15"
:command: /bin/date
:record_type: :crontab
-:lowercase_environment:
+:lowercase_environment:
:text: a=b
- :record:
+ :record:
:line: a=b
:record_type: :environment
-:special_with_spaces:
+:special_with_spaces:
:text: "@daily /bin/echo testing"
- :record:
+ :record:
:special: daily
:command: /bin/echo testing
:record_type: :freebsd_special
-:tabs:
+:tabs:
:text: !binary |
CQ==
- :record:
+ :record:
:line: !binary |
CQ==
:record_type: :blank
-:multiple_minute_and_hour:
+:multiple_minute_and_hour:
:text: 5,10 15,20 * * * /bin/date
- :record:
- :minute:
+ :record:
+ :minute:
- "5"
- "10"
- :hour:
+ :hour:
- "15"
- "20"
:command: /bin/date
:record_type: :crontab
-:name:
+:name:
:text: "# Puppet Name: testing"
- :record:
+ :record:
:line: "# Puppet Name: testing"
:name: testing
:record_type: :comment
-:another_env:
+:another_env:
:text: Testing=True
- :record:
+ :record:
:line: Testing=True
:record_type: :environment
-:shortcomment:
+:shortcomment:
:text: "#"
- :record:
+ :record:
:line: "#"
:record_type: :comment
-:spaces_in_command:
+:spaces_in_command:
:text: "* * * * * /bin/echo testing"
- :record:
+ :record:
:command: /bin/echo testing
:record_type: :crontab
-:fourth_env:
+:fourth_env:
:text: True=False
- :record:
+ :record:
:line: True=False
:record_type: :environment
-:simple_with_minute:
+:simple_with_minute:
:text: 5 * * * * /bin/date
- :record:
- :minute:
+ :record:
+ :minute:
- "5"
:command: /bin/date
:record_type: :crontab
-:spaces_in_command_with_times:
+:spaces_in_command_with_times:
:text: 5,10 15,20 * * * /bin/echo testing
- :record:
- :minute:
+ :record:
+ :minute:
- "5"
- "10"
- :hour:
+ :hour:
- "15"
- "20"
:command: /bin/echo testing
:record_type: :crontab
-:name_with_spaces:
+:name_with_spaces:
:text: "# Puppet Name: another name"
- :record:
+ :record:
:line: "# Puppet Name: another name"
:name: another name
:record_type: :comment
----
-:longcommment:
+---
+:longcommment:
:text: "# This is a comment"
- :record:
+ :record:
:line: "# This is a comment"
:record_type: :comment
-:special:
+:special:
:text: "@hourly /bin/date"
- :record:
+ :record:
:special: hourly
:command: /bin/date
:record_type: :freebsd_special
-:long_name:
+:long_name:
:text: "# Puppet Name: long_name"
- :record:
+ :record:
:line: "# Puppet Name: long_name"
:name: long_name
:record_type: :comment
-:multiple_minutes:
+:multiple_minutes:
:text: 5,15 * * * * /bin/date
- :record:
- :minute:
+ :record:
+ :minute:
- "5"
- "15"
:command: /bin/date
:record_type: :crontab
-:environment:
+:environment:
:text: ONE=TWO
- :record:
+ :record:
:line: ONE=TWO
:record_type: :environment
-:empty:
+:empty:
:text: ""
- :record:
+ :record:
:line: ""
:record_type: :blank
-:simple:
+:simple:
:text: "* * * * * /bin/date"
- :record:
+ :record:
:command: /bin/date
:record_type: :crontab
-:whitespace:
+:whitespace:
:text: " "
- :record:
+ :record:
:line: " "
:record_type: :blank
-:minute_and_hour:
+:minute_and_hour:
:text: 5 15 * * * /bin/date
- :record:
- :minute:
+ :record:
+ :minute:
- "5"
- :hour:
+ :hour:
- "15"
:command: /bin/date
:record_type: :crontab
-:lowercase_environment:
+:lowercase_environment:
:text: a=b
- :record:
+ :record:
:line: a=b
:record_type: :environment
-:special_with_spaces:
+:special_with_spaces:
:text: "@daily /bin/echo testing"
- :record:
+ :record:
:special: daily
:command: /bin/echo testing
:record_type: :freebsd_special
-:tabs:
+:tabs:
:text: !binary |
CQ==
- :record:
+ :record:
:line: !binary |
CQ==
:record_type: :blank
-:multiple_minute_and_hour:
+:multiple_minute_and_hour:
:text: 5,10 15,20 * * * /bin/date
- :record:
- :minute:
+ :record:
+ :minute:
- "5"
- "10"
- :hour:
+ :hour:
- "15"
- "20"
:command: /bin/date
:record_type: :crontab
-:name:
+:name:
:text: "# Puppet Name: testing"
- :record:
+ :record:
:line: "# Puppet Name: testing"
:name: testing
:record_type: :comment
-:another_env:
+:another_env:
:text: Testing=True
- :record:
+ :record:
:line: Testing=True
:record_type: :environment
-:shortcomment:
+:shortcomment:
:text: "#"
- :record:
+ :record:
:line: "#"
:record_type: :comment
-:spaces_in_command:
+:spaces_in_command:
:text: "* * * * * /bin/echo testing"
- :record:
+ :record:
:command: /bin/echo testing
:record_type: :crontab
-:fourth_env:
+:fourth_env:
:text: True=False
- :record:
+ :record:
:line: True=False
:record_type: :environment
-:simple_with_minute:
+:simple_with_minute:
:text: 5 * * * * /bin/date
- :record:
- :minute:
+ :record:
+ :minute:
- "5"
:command: /bin/date
:record_type: :crontab
-:spaces_in_command_with_times:
+:spaces_in_command_with_times:
:text: 5,10 15,20 * * * /bin/echo testing
- :record:
- :minute:
+ :record:
+ :minute:
- "5"
- "10"
- :hour:
+ :hour:
- "15"
- "20"
:command: /bin/echo testing
:record_type: :crontab
-:name_with_spaces:
+:name_with_spaces:
:text: "# Puppet Name: another name"
- :record:
+ :record:
:line: "# Puppet Name: another name"
:name: another name
:record_type: :comment
diff --git a/test/data/providers/package/testpackages.yaml b/test/data/providers/package/testpackages.yaml
index 8d8935eb9..7d7ce0225 100644
--- a/test/data/providers/package/testpackages.yaml
+++ b/test/data/providers/package/testpackages.yaml
@@ -1,6 +1,6 @@
----
+---
- :operatingsystem: Solaris
- :files:
+ :files:
- /usr/local/pkg/rdesktop-1.3.1-sol10-intel-local
- /usr/local/pkg/rdesktop-1.4.1-sol10-x86-local
:hardwareisa: i386
@@ -11,21 +11,21 @@
:name: cabextract
:provider: :blastwave
- :operatingsystem: Solaris
- :files:
+ :files:
- /usr/local/pkg/arc-5.21e-sol8-sparc-local
:hardwareisa: sparc
:name: SMCarc
:operatingsystemrelease: "5.8"
:provider: :sun
- :operatingsystem: Solaris
- :files:
+ :files:
- /usr/local/pkg/arc-5.21e-sol8-intel-local
:hardwareisa: i386
:name: SMCarc
:operatingsystemrelease: "5.8"
:provider: :sun
- :operatingsystem: OpenBSD
- :files:
+ :files:
- ftp://ftp.usa.openbsd.org/pub/OpenBSD/3.8/packages/i386/aalib-1.2-no_x11.tgz
:name: aalib
:provider: :openbsd
@@ -42,7 +42,7 @@
- Fedora
- CentOS
- RedHat
- :files:
+ :files:
- /home/luke/rpm/RPMS/noarch/enhost-1.0.1-1.noarch.rpm
- /home/luke/rpm/RPMS/noarch/enhost-1.0.2-1.noarch.rpm
:name: enhost
diff --git a/test/data/reports/1.yaml b/test/data/reports/1.yaml
index 3805e90f5..bc72b8241 100644
--- a/test/data/reports/1.yaml
+++ b/test/data/reports/1.yaml
@@ -1,12 +1,12 @@
---- !ruby/object:Puppet::Transaction::Report
+--- !ruby/object:Puppet::Transaction::Report
host: culain.madstop.com
-logs:
-- !ruby/object:Puppet::Log
+logs:
+- !ruby/object:Puppet::Log
level: :notice
message: executed successfully
objectsource: true
source: //culain.madstop.com/puppetserver/exec=/bin/echo testing/returns
- tags:
+ tags:
- :puppetserver
- :puppetserver
- :basenode
@@ -15,12 +15,12 @@ logs:
- :exec
- :returns
time: 2006-09-21 13:06:59.867782 -05:00
-- !ruby/object:Puppet::Log
+- !ruby/object:Puppet::Log
level: :notice
message: ensure changed 'stopped' to 'running'
objectsource: true
source: //culain.madstop.com/mailserver/service=spamassassin/ensure
- tags:
+ tags:
- :mailserver
- :mailserver
- :basenode
@@ -29,12 +29,12 @@ logs:
- :service
- :ensure
time: 2006-09-21 13:07:01.336511 -05:00
-- !ruby/object:Puppet::Log
+- !ruby/object:Puppet::Log
level: :notice
message: ensure changed 'stopped' to 'running'
objectsource: true
source: //culain.madstop.com/mailserver/service=courier-imap-ssl/ensure
- tags:
+ tags:
- :mailserver
- :mailserver
- :basenode
@@ -43,12 +43,12 @@ logs:
- :service
- :ensure
time: 2006-09-21 13:07:01.573506 -05:00
-- !ruby/object:Puppet::Log
+- !ruby/object:Puppet::Log
level: :notice
message: ensure changed 'stopped' to 'running'
objectsource: true
source: //culain.madstop.com/mailserver/service=courier-authdaemon/ensure
- tags:
+ tags:
- :mailserver
- :mailserver
- :basenode
@@ -57,28 +57,28 @@ logs:
- :service
- :ensure
time: 2006-09-21 13:07:01.680440 -05:00
-metrics:
- time: !ruby/object:Puppet::Metric
+metrics:
+ time: !ruby/object:Puppet::Metric
label: Time
name: time
- values:
+ values:
- - :config_retrieval
- Config retrieval
- 2.26467204093933
- - :total
- Total
- 21.7894113063812
- changes: !ruby/object:Puppet::Metric
+ changes: !ruby/object:Puppet::Metric
label: Changes
name: changes
- values:
+ values:
- - :total
- Total
- 4
- objects: !ruby/object:Puppet::Metric
+ objects: !ruby/object:Puppet::Metric
label: Objects
name: objects
- values:
+ values:
- - :scheduled
- Scheduled
- 78
diff --git a/test/data/reports/tagmail_passers.conf b/test/data/reports/tagmail_passers.conf
index 6cadf03f8..ae6d2e7f2 100644
--- a/test/data/reports/tagmail_passers.conf
+++ b/test/data/reports/tagmail_passers.conf
@@ -7,7 +7,7 @@
one: abuse@domain.com
# with weird spacing
- one : abuse@domain.com
+ one : abuse@domain.com
# with multiple tags
one, two: abuse@domain.com
@@ -25,6 +25,6 @@ one, two-three, !four-five, !six: abuse@domain.com
one, two: abuse@domain.com, testing@domain.com
# and with weird spacing
-one, two: abuse@domain.com , testing@domain.com
+one, two: abuse@domain.com , testing@domain.com
# and a trailing comment
diff --git a/test/data/snippets/casestatement.pp b/test/data/snippets/casestatement.pp
index 4fcf2e408..955982819 100644
--- a/test/data/snippets/casestatement.pp
+++ b/test/data/snippets/casestatement.pp
@@ -19,10 +19,10 @@ case $ovar {
}
"booness", "yayness": {
case $var {
- "nep": {
+ "nep": {
file { "/tmp/noexistsfile": mode => 644, ensure => file }
}
- "value": {
+ "value": {
file { "/tmp/existsfile2": mode => 755, ensure => file }
}
}
diff --git a/test/data/snippets/classincludes.pp b/test/data/snippets/classincludes.pp
index 927800599..bd5b44ed7 100644
--- a/test/data/snippets/classincludes.pp
+++ b/test/data/snippets/classincludes.pp
@@ -12,6 +12,6 @@ class sub2 inherits base {
file { "/tmp/classincludes3": ensure => file, mode => 755 }
}
-$sub = "sub2"
+$sub = "sub2"
include sub1, $sub
diff --git a/test/data/snippets/fqparents.pp b/test/data/snippets/fqparents.pp
index 40fb93344..ee2f65423 100644
--- a/test/data/snippets/fqparents.pp
+++ b/test/data/snippets/fqparents.pp
@@ -1,8 +1,8 @@
class base {
class one {
file { "/tmp/fqparent1": ensure => file }
- }
-}
+ }
+}
class two::three inherits base::one {
file { "/tmp/fqparent2": ensure => file }
diff --git a/test/data/types/hosts/1 b/test/data/types/hosts/1
index f0b27f359..286dcb72d 100644
--- a/test/data/types/hosts/1
+++ b/test/data/types/hosts/1
@@ -1,3 +1,3 @@
# Do not remove the following line, or various programs
# that require network functionality will fail.
-127.0.0.1 hostname.domain.net hostname localhost.localdomain localhost
+127.0.0.1 hostname.domain.net hostname localhost.localdomain localhost
diff --git a/test/data/types/port/darwin b/test/data/types/port/darwin
index c5e5376a2..3d27dd506 100644
--- a/test/data/types/port/darwin
+++ b/test/data/types/port/darwin
@@ -285,7 +285,7 @@ dixie 96/tcp # DIXIE Protocol Specification
swift-rvf 97/udp # Swift Remote Virtural File Protocol
swift-rvf 97/tcp # Swift Remote Virtural File Protocol
# Maurice R. Turcotte
-# <mailrus!uflorida!rm1!dnmrt%rmatl@uunet.UU.NET>
+# <mailrus!uflorida!rm1!dnmrt%rmatl@uunet.UU.NET>
tacnews 98/udp # TAC News
tacnews 98/tcp # TAC News
# Jon Postel <postel@isi.edu>
@@ -306,7 +306,7 @@ acr-nema 104/tcp # ACR-NEMA Digital Imag. & Comm. 300
# Patrick McNamee <--none--->
cso 105/udp # CCSO name server protocol
cso 105/tcp # CCSO name server protocol
-# Martin Hamilton <martin@mrrl.lut.as.uk>
+# Martin Hamilton <martin@mrrl.lut.as.uk>
csnet-ns 105/udp # Mailbox Name Nameserver
csnet-ns 105/tcp # Mailbox Name Nameserver
# Marvin Solomon <solomon@CS.WISC.EDU>
@@ -333,7 +333,7 @@ mcidas 112/udp # McIDAS Data Transmission Protocol
mcidas 112/tcp # McIDAS Data Transmission Protocol
# Glenn Davis <support@unidata.ucar.edu>
auth 113/udp # Authentication Service
-ident 113/tcp auth #
+ident 113/tcp auth #
# Mike St. Johns <stjohns@arpa.mil>
audionews 114/udp # Audio News Multicast
audionews 114/tcp # Audio News Multicast
@@ -402,11 +402,11 @@ ingres-net 134/tcp # INGRES-NET Service
epmap 135/udp # DCE endpoint resolution
epmap 135/tcp # DCE endpoint resolution
# Joe Pato <pato@apollo.hp.com>
-profile 136/udp # PROFILE Naming System
-profile 136/tcp # PROFILE Naming System
+profile 136/udp # PROFILE Naming System
+profile 136/tcp # PROFILE Naming System
# Larry Peterson <llp@ARIZONA.EDU>
-netbios-ns 137/udp # NETBIOS Name Service
-netbios-ns 137/tcp # NETBIOS Name Service
+netbios-ns 137/udp # NETBIOS Name Service
+netbios-ns 137/tcp # NETBIOS Name Service
netbios-dgm 138/udp # NETBIOS Datagram Service
netbios-dgm 138/tcp # NETBIOS Datagram Service
netbios-ssn 139/udp # NETBIOS Session Service
@@ -417,8 +417,8 @@ emfis-data 140/tcp # EMFIS Data Service
emfis-cntl 141/udp # EMFIS Control Service
emfis-cntl 141/tcp # EMFIS Control Service
# Gerd Beling <GBELING@ISI.EDU>
-bl-idm 142/udp # Britton-Lee IDM
-bl-idm 142/tcp # Britton-Lee IDM
+bl-idm 142/udp # Britton-Lee IDM
+bl-idm 142/tcp # Britton-Lee IDM
# Susie Snitzer <---none--->
imap 143/udp # Internet Message Access Protocol
imap 143/tcp # Internet Message Access Protocol
@@ -426,8 +426,8 @@ imap 143/tcp # Internet Message Access Protocol
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
+uaac 145/udp # UAAC Protocol
+uaac 145/tcp # UAAC Protocol
# David A. Gomberg <gomberg@GATEWAY.MITRE.ORG>
iso-tp0 146/udp # ISO-IP0
iso-tp0 146/tcp # ISO-IP0
@@ -437,144 +437,144 @@ iso-ip 147/tcp # ISO-IP
jargon 148/udp # Jargon
jargon 148/tcp # Jargon
# Bill Weinman <wew@bearnet.com>
-aed-512 149/udp # AED 512 Emulation Service
-aed-512 149/tcp # AED 512 Emulation Service
+aed-512 149/udp # AED 512 Emulation Service
+aed-512 149/tcp # AED 512 Emulation Service
# Albert G. Broscius <broscius@DSL.CIS.UPENN.EDU>
-sql-net 150/udp # SQL-NET
-sql-net 150/tcp # SQL-NET
+sql-net 150/udp # SQL-NET
+sql-net 150/tcp # SQL-NET
# Martin Picard <<---none--->
-hems 151/udp # HEMS
-hems 151/tcp # HEMS
-bftp 152/udp # Background File Transfer Program
-bftp 152/tcp # Background File Transfer Program
+hems 151/udp # HEMS
+hems 151/tcp # HEMS
+bftp 152/udp # Background File Transfer Program
+bftp 152/tcp # Background File Transfer Program
# Annette DeSchon <DESCHON@ISI.EDU>
-sgmp 153/udp # SGMP
-sgmp 153/tcp # SGMP
+sgmp 153/udp # SGMP
+sgmp 153/tcp # SGMP
# Marty Schoffstahl <schoff@NISC.NYSER.NET>
-netsc-prod 154/udp # NETSC
-netsc-prod 154/tcp # NETSC
-netsc-dev 155/udp # NETSC
-netsc-dev 155/tcp # NETSC
+netsc-prod 154/udp # NETSC
+netsc-prod 154/tcp # NETSC
+netsc-dev 155/udp # NETSC
+netsc-dev 155/tcp # NETSC
# Sergio Heker <heker@JVNCC.CSC.ORG>
-sqlsrv 156/udp # SQL Service
-sqlsrv 156/tcp # SQL Service
+sqlsrv 156/udp # SQL Service
+sqlsrv 156/tcp # SQL Service
# Craig Rogers <Rogers@ISI.EDU>
knet-cmp 157/udp # KNET/VM Command/Message Protocol
knet-cmp 157/tcp # KNET/VM Command/Message Protocol
# Gary S. Malkin <GMALKIN@XYLOGICS.COM>
-pcmail-srv 158/udp # PCMail Server
-pcmail-srv 158/tcp # PCMail Server
+pcmail-srv 158/udp # PCMail Server
+pcmail-srv 158/tcp # PCMail Server
# Mark L. Lambert <markl@PTT.LCS.MIT.EDU>
-nss-routing 159/udp # NSS-Routing
-nss-routing 159/tcp # NSS-Routing
+nss-routing 159/udp # NSS-Routing
+nss-routing 159/tcp # NSS-Routing
# Yakov Rekhter <Yakov@IBM.COM>
-sgmp-traps 160/udp # SGMP-TRAPS
-sgmp-traps 160/tcp # SGMP-TRAPS
+sgmp-traps 160/udp # SGMP-TRAPS
+sgmp-traps 160/tcp # SGMP-TRAPS
# Marty Schoffstahl <schoff@NISC.NYSER.NET>
snmp 161/udp # SNMP
snmp 161/tcp # SNMP
snmptrap 162/udp # SNMPTRAP
snmptrap 162/tcp # SNMPTRAP
# Marshall Rose <mrose@dbc.mtview.ca.us>
-cmip-man 163/udp # CMIP/TCP Manager
-cmip-man 163/tcp # CMIP/TCP Manager
-cmip-agent 164/udp # CMIP/TCP Agent
-cmip-agent 164/tcp # CMIP/TCP Agent
+cmip-man 163/udp # CMIP/TCP Manager
+cmip-man 163/tcp # CMIP/TCP Manager
+cmip-agent 164/udp # CMIP/TCP Agent
+cmip-agent 164/tcp # CMIP/TCP Agent
# Amatzia Ben-Artzi <---none--->
-xns-courier 165/udp # Xerox
-xns-courier 165/tcp # Xerox
+xns-courier 165/udp # Xerox
+xns-courier 165/tcp # Xerox
# Susie Armstrong <Armstrong.wbst128@XEROX.COM>
-s-net 166/udp # Sirius Systems
-s-net 166/tcp # Sirius Systems
+s-net 166/udp # Sirius Systems
+s-net 166/tcp # Sirius Systems
# Brian Lloyd <brian@lloyd.com>
-namp 167/udp # NAMP
-namp 167/tcp # NAMP
+namp 167/udp # NAMP
+namp 167/tcp # NAMP
# Marty Schoffstahl <schoff@NISC.NYSER.NET>
-rsvd 168/udp # RSVD
-rsvd 168/tcp # RSVD
+rsvd 168/udp # RSVD
+rsvd 168/tcp # RSVD
# Neil Todd <mcvax!ist.co.uk!neil@UUNET.UU.NET>
-send 169/udp # SEND
-send 169/tcp # SEND
+send 169/udp # SEND
+send 169/tcp # SEND
# William D. Wisner <wisner@HAYES.FAI.ALASKA.EDU>
-print-srv 170/udp # Network PostScript
-print-srv 170/tcp # Network PostScript
+print-srv 170/udp # Network PostScript
+print-srv 170/tcp # Network PostScript
# Brian Reid <reid@DECWRL.DEC.COM>
multiplex 171/udp # Network Innovations Multiplex
multiplex 171/tcp # Network Innovations Multiplex
-cl/1 172/udp # Network Innovations CL/1
-cl/1 172/tcp # Network Innovations CL/1
+cl/1 172/udp # Network Innovations CL/1
+cl/1 172/tcp # Network Innovations CL/1
# Kevin DeVault <<---none--->
-xyplex-mux 173/udp # Xyplex
-xyplex-mux 173/tcp # Xyplex
+xyplex-mux 173/udp # Xyplex
+xyplex-mux 173/tcp # Xyplex
# Bob Stewart <STEWART@XYPLEX.COM>
-mailq 174/udp # MAILQ
-mailq 174/tcp # MAILQ
+mailq 174/udp # MAILQ
+mailq 174/tcp # MAILQ
# Rayan Zachariassen <rayan@AI.TORONTO.EDU>
-vmnet 175/udp # VMNET
-vmnet 175/tcp # VMNET
+vmnet 175/udp # VMNET
+vmnet 175/tcp # VMNET
# Christopher Tengi <tengi@Princeton.EDU>
-genrad-mux 176/udp # GENRAD-MUX
-genrad-mux 176/tcp # GENRAD-MUX
+genrad-mux 176/udp # GENRAD-MUX
+genrad-mux 176/tcp # GENRAD-MUX
# Ron Thornton <thornton@qm7501.genrad.com>
-xdmcp 177/udp # X Display Manager Control Protocol
-xdmcp 177/tcp # X Display Manager Control Protocol
+xdmcp 177/udp # X Display Manager Control Protocol
+xdmcp 177/tcp # X Display Manager Control Protocol
# Robert W. Scheifler <RWS@XX.LCS.MIT.EDU>
-nextstep 178/udp # NextStep Window Server
-nextstep 178/tcp # NextStep Window Server
+nextstep 178/udp # NextStep Window Server
+nextstep 178/tcp # NextStep Window Server
# Leo Hourvitz <leo@NEXT.COM>
-bgp 179/udp # Border Gateway Protocol
-bgp 179/tcp # Border Gateway Protocol
+bgp 179/udp # Border Gateway Protocol
+bgp 179/tcp # Border Gateway Protocol
# Kirk Lougheed <LOUGHEED@MATHOM.CISCO.COM>
-ris 180/udp # Intergraph
-ris 180/tcp # Intergraph
+ris 180/udp # Intergraph
+ris 180/tcp # Intergraph
# Dave Buehmann <ingr!daveb@UUNET.UU.NET>
-unify 181/udp # Unify
-unify 181/tcp # Unify
+unify 181/udp # Unify
+unify 181/tcp # Unify
# Mark Ainsley <ianaportmaster@unify.com>
-audit 182/udp # Unisys Audit SITP
-audit 182/tcp # Unisys Audit SITP
+audit 182/udp # Unisys Audit SITP
+audit 182/tcp # Unisys Audit SITP
# Gil Greenbaum <gcole@nisd.cam.unisys.com>
-ocbinder 183/udp # OCBinder
-ocbinder 183/tcp # OCBinder
-ocserver 184/udp # OCServer
-ocserver 184/tcp # OCServer
+ocbinder 183/udp # OCBinder
+ocbinder 183/tcp # OCBinder
+ocserver 184/udp # OCServer
+ocserver 184/tcp # OCServer
# Jerrilynn Okamura <--none--->
-remote-kis 185/udp # Remote-KIS
-remote-kis 185/tcp # Remote-KIS
-kis 186/udp # KIS Protocol
-kis 186/tcp # KIS Protocol
+remote-kis 185/udp # Remote-KIS
+remote-kis 185/tcp # Remote-KIS
+kis 186/udp # KIS Protocol
+kis 186/tcp # KIS Protocol
# Ralph Droms <rdroms@NRI.RESTON.VA.US>
aci 187/udp # Application Communication Interface
aci 187/tcp # Application Communication Interface
# Rick Carlos <rick.ticipa.csc.ti.com>
-mumps 188/udp # Plus Five's MUMPS
-mumps 188/tcp # Plus Five's MUMPS
+mumps 188/udp # Plus Five's MUMPS
+mumps 188/tcp # Plus Five's MUMPS
# Hokey Stenn <hokey@PLUS5.COM>
-qft 189/udp # Queued File Transport
-qft 189/tcp # Queued File Transport
+qft 189/udp # Queued File Transport
+qft 189/tcp # Queued File Transport
# Wayne Schroeder <schroeder@SDS.SDSC.EDU>
gacp 190/udp # Gateway Access Control Protocol
gacp 190/tcp # Gateway Access Control Protocol
# C. Philip Wood <cpw@LANL.GOV>
-prospero 191/udp # Prospero Directory Service
-prospero 191/tcp # Prospero Directory Service
+prospero 191/udp # Prospero Directory Service
+prospero 191/tcp # Prospero Directory Service
# B. Clifford Neuman <bcn@isi.edu>
-osu-nms 192/udp # OSU Network Monitoring System
-osu-nms 192/tcp # OSU Network Monitoring System
+osu-nms 192/udp # OSU Network Monitoring System
+osu-nms 192/tcp # OSU Network Monitoring System
# Doug Karl <KARL-D@OSU-20.IRCC.OHIO-STATE.EDU>
-srmp 193/udp # Spider Remote Monitoring Protocol
-srmp 193/tcp # Spider Remote Monitoring Protocol
+srmp 193/udp # Spider Remote Monitoring Protocol
+srmp 193/tcp # Spider Remote Monitoring Protocol
# Ted J. Socolofsky <Teds@SPIDER.CO.UK>
-irc 194/udp # Internet Relay Chat Protocol
-irc 194/tcp # Internet Relay Chat Protocol
+irc 194/udp # Internet Relay Chat Protocol
+irc 194/tcp # Internet Relay Chat Protocol
# Jarkko Oikarinen <jto@TOLSUN.OULU.FI>
-dn6-nlm-aud 195/udp # DNSIX Network Level Module Audit
-dn6-nlm-aud 195/tcp # DNSIX Network Level Module Audit
+dn6-nlm-aud 195/udp # DNSIX Network Level Module Audit
+dn6-nlm-aud 195/tcp # DNSIX Network Level Module Audit
dn6-smm-red 196/udp # DNSIX Session Mgt Module Audit Redir
dn6-smm-red 196/tcp # DNSIX Session Mgt Module Audit Redir
# Lawrence Lebahn <DIA3@PAXRV-NES.NAVY.MIL>
-dls 197/udp # Directory Location Service
-dls 197/tcp # Directory Location Service
+dls 197/udp # Directory Location Service
+dls 197/tcp # Directory Location Service
dls-mon 198/udp # Directory Location Service Monitor
dls-mon 198/tcp # Directory Location Service Monitor
# Scott Bellew <smb@cs.purdue.edu>
@@ -584,40 +584,40 @@ smux 199/tcp # SMUX
src 200/udp # IBM System Resource Controller
src 200/tcp # IBM System Resource Controller
# Gerald McBrearty <---none--->
-at-rtmp 201/udp # AppleTalk Routing Maintenance
-at-rtmp 201/tcp # AppleTalk Routing Maintenance
-at-nbp 202/udp # AppleTalk Name Binding
-at-nbp 202/tcp # AppleTalk Name Binding
-at-3 203/udp # AppleTalk Unused
-at-3 203/tcp # AppleTalk Unused
-at-echo 204/udp # AppleTalk Echo
-at-echo 204/tcp # AppleTalk Echo
-at-5 205/udp # AppleTalk Unused
-at-5 205/tcp # AppleTalk Unused
-at-zis 206/udp # AppleTalk Zone Information
-at-zis 206/tcp # AppleTalk Zone Information
-at-7 207/udp # AppleTalk Unused
-at-7 207/tcp # AppleTalk Unused
-at-8 208/udp # AppleTalk Unused
-at-8 208/tcp # AppleTalk Unused
+at-rtmp 201/udp # AppleTalk Routing Maintenance
+at-rtmp 201/tcp # AppleTalk Routing Maintenance
+at-nbp 202/udp # AppleTalk Name Binding
+at-nbp 202/tcp # AppleTalk Name Binding
+at-3 203/udp # AppleTalk Unused
+at-3 203/tcp # AppleTalk Unused
+at-echo 204/udp # AppleTalk Echo
+at-echo 204/tcp # AppleTalk Echo
+at-5 205/udp # AppleTalk Unused
+at-5 205/tcp # AppleTalk Unused
+at-zis 206/udp # AppleTalk Zone Information
+at-zis 206/tcp # AppleTalk Zone Information
+at-7 207/udp # AppleTalk Unused
+at-7 207/tcp # AppleTalk Unused
+at-8 208/udp # AppleTalk Unused
+at-8 208/tcp # AppleTalk Unused
# Rob Chandhok <chandhok@gnome.cs.cmu.edu>
qmtp 209/udp # The Quick Mail Transfer Protocol
qmtp 209/tcp # The Quick Mail Transfer Protocol
# Dan Bernstein <djb@silverton.berkeley.edu>
z39.50 210/udp # ANSI Z39.50
z39.50 210/tcp # ANSI Z39.50
-# Mark H. Needleman <markn@sirsi.com>
+# Mark H. Needleman <markn@sirsi.com>
914c/g 211/udp # Texas Instruments 914C/G Terminal
914c/g 211/tcp # Texas Instruments 914C/G Terminal
# Bill Harrell <---none--->
-anet 212/udp # ATEXSSTR
-anet 212/tcp # ATEXSSTR
+anet 212/udp # ATEXSSTR
+anet 212/tcp # ATEXSSTR
# Jim Taylor <taylor@heart.epps.kodak.com>
-ipx 213/udp # IPX
+ipx 213/udp # IPX
ipx 213/tcp # IPX
# Don Provan <donp@xlnvax.novell.com>
-vmpwscs 214/udp # VM PWSCS
-vmpwscs 214/tcp # VM PWSCS
+vmpwscs 214/udp # VM PWSCS
+vmpwscs 214/tcp # VM PWSCS
# Dan Shia <dset!shia@uunet.UU.NET>
softpc 215/udp # Insignia Solutions
softpc 215/tcp # Insignia Solutions
@@ -628,22 +628,22 @@ CAIlic 216/tcp # Computer Associates Int'l License Server
dbase 217/udp # dBASE Unix
dbase 217/tcp # dBASE Unix
# Don Gibson
-# <sequent!aero!twinsun!ashtate.A-T.COM!dong@uunet.UU.NET>
+# <sequent!aero!twinsun!ashtate.A-T.COM!dong@uunet.UU.NET>
mpp 218/udp # Netix Message Posting Protocol
mpp 218/tcp # Netix Message Posting Protocol
# Shannon Yeh <yeh@netix.com>
-uarps 219/udp # Unisys ARPs
-uarps 219/tcp # Unisys ARPs
+uarps 219/udp # Unisys ARPs
+uarps 219/tcp # Unisys ARPs
# Ashok Marwaha <---none--->
imap3 220/udp # Interactive Mail Access Protocol v3
imap3 220/tcp # Interactive Mail Access Protocol v3
# James Rice <RICE@SUMEX-AIM.STANFORD.EDU>
-fln-spx 221/udp # Berkeley rlogind with SPX auth
-fln-spx 221/tcp # Berkeley rlogind with SPX auth
-rsh-spx 222/udp # Berkeley rshd with SPX auth
-rsh-spx 222/tcp # Berkeley rshd with SPX auth
-cdc 223/udp # Certificate Distribution Center
-cdc 223/tcp # Certificate Distribution Center
+fln-spx 221/udp # Berkeley rlogind with SPX auth
+fln-spx 221/tcp # Berkeley rlogind with SPX auth
+rsh-spx 222/udp # Berkeley rshd with SPX auth
+rsh-spx 222/tcp # Berkeley rshd with SPX auth
+cdc 223/udp # Certificate Distribution Center
+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>###
@@ -655,16 +655,16 @@ masqdialer 224/tcp # masqdialer
direct 242/udp # Direct
direct 242/tcp # Direct
# Herb Sutter <HerbS@cntc.com>
-sur-meas 243/udp # Survey Measurement
-sur-meas 243/tcp # Survey Measurement
+sur-meas 243/udp # Survey Measurement
+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>
link 245/udp # LINK
link 245/tcp # LINK
-dsp3270 246/udp # Display Systems Protocol
-dsp3270 246/tcp # Display Systems Protocol
+dsp3270 246/udp # Display Systems Protocol
+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
@@ -729,19 +729,19 @@ rescap 283/tcp # rescap
corerjd 284/udp # corerjd
corerjd 284/tcp # corerjd
# Chris Thornhill <cjt@corenetworks.com>
-# 285 Unassigned
+# 285 Unassigned
fxp-1 286/udp # FXP-1
fxp-1 286/tcp # FXP-1
-# James Darnall <jim@cennoid.com>
+# James Darnall <jim@cennoid.com>
k-block 287/udp # K-BLOCK
k-block 287/tcp # K-BLOCK
-# Simon P Jackson <jacko@kring.co.uk>
+# 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>
-entrusttime 309/udp # EntrustTime
-entrusttime 309/tcp # EntrustTime
+entrusttime 309/udp # EntrustTime
+entrusttime 309/tcp # EntrustTime
# Peter Whittaker <pww@entrust.com>
bhmds 310/udp # bhmds
bhmds 310/tcp # bhmds
@@ -884,7 +884,7 @@ hassle 375/udp # Hassle
hassle 375/tcp # Hassle
# Reinhard Doelz <doelz@comp.bioz.unibas.ch>
nip 376/udp # Amiga Envoy Network Inquiry Proto
-nip 376/tcp # Amiga Envoy Network Inquiry Proto
+nip 376/tcp # Amiga Envoy Network Inquiry Proto
# Heinz Wrobel <hwrobel@gmx.de>
tnETOS 377/udp # NEC Corporation
tnETOS 377/tcp # NEC Corporation
@@ -915,15 +915,15 @@ asa 386/tcp # ASA Message Router Object Def.
aurp 387/udp # Appletalk Update-Based Routing Pro.
aurp 387/tcp # Appletalk Update-Based Routing Pro.
# Chris Ranch <cranch@novell.com>
-unidata-ldm 388/udp # Unidata LDM
-unidata-ldm 388/tcp # Unidata LDM
+unidata-ldm 388/udp # Unidata LDM
+unidata-ldm 388/tcp # Unidata LDM
# Glenn Davis <support@unidata.ucar.edu>
ldap 389/udp # Lightweight Directory Access Protocol
ldap 389/tcp # Lightweight Directory Access Protocol
# Tim Howes <Tim.Howes@terminator.cc.umich.edu>
uis 390/udp # UIS
uis 390/tcp # UIS
-# Ed Barron <---none--->
+# Ed Barron <---none--->
synotics-relay 391/udp # SynOptics SNMP Relay Port
synotics-relay 391/tcp # SynOptics SNMP Relay Port
synotics-broker 392/udp # SynOptics Port Broker Port
@@ -1011,7 +1011,7 @@ smpte 420/tcp # SMPTE
# Si Becker <71362.22@CompuServe.COM>
ariel2 421/udp # Ariel 2
ariel2 421/tcp # Ariel 2
-ariel3 422/udp # Ariel 3
+ariel3 422/udp # Ariel 3
ariel3 422/tcp # Ariel 3
# Joel Karafin <jkarafin@infotrieve.com>
opc-job-start 423/udp # IBM Operations Planning and Control Start
@@ -1037,8 +1037,8 @@ utmpsd 430/udp # UTMPSD
utmpsd 430/tcp # UTMPSD
utmpcd 431/udp # UTMPCD
utmpcd 431/tcp # UTMPCD
-iasd 432/udp # IASD
-iasd 432/tcp # IASD
+iasd 432/udp # IASD
+iasd 432/tcp # IASD
# Nir Baroz <nbaroz@encore.com>
nnsp 433/udp # NNSP
nnsp 433/tcp # NNSP
@@ -1048,8 +1048,8 @@ mobileip-agent 434/tcp # MobileIP-Agent
mobilip-mn 435/udp # MobilIP-MN
mobilip-mn 435/tcp # MobilIP-MN
# Kannan Alagappan <kannan@sejour.lkg.dec.com>
-dna-cml 436/udp # DNA-CML
-dna-cml 436/tcp # DNA-CML
+dna-cml 436/udp # DNA-CML
+dna-cml 436/tcp # DNA-CML
# Dan Flowers <flowers@smaug.lkg.dec.com>
comscm 437/udp # comscm
comscm 437/tcp # comscm
@@ -1060,8 +1060,8 @@ dsfgw 438/tcp # dsfgw
dasp 439/udp # dasp tommy@inlab.m.eunet.de
dasp 439/tcp # dasp Thomas Obermair
# Thomas Obermair <tommy@inlab.m.eunet.de>
-sgcp 440/udp # sgcp
-sgcp 440/tcp # sgcp
+sgcp 440/udp # sgcp
+sgcp 440/tcp # sgcp
# Marshall Rose <mrose@dbc.mtview.ca.us>
decvms-sysmgt 441/udp # decvms-sysmgt
decvms-sysmgt 441/tcp # decvms-sysmgt
@@ -1113,10 +1113,10 @@ scohelp 457/tcp # scohelp
# Faith Zack <faithz@sco.com>
appleqtc 458/udp # apple quick time
appleqtc 458/tcp # apple quick time
-# Murali Ranganathan
+# Murali Ranganathan
# <murali_ranganathan@quickmail.apple.com>
-ampr-rcmd 459/udp # ampr-rcmd
-ampr-rcmd 459/tcp # ampr-rcmd
+ampr-rcmd 459/udp # ampr-rcmd
+ampr-rcmd 459/tcp # ampr-rcmd
# Rob Janssen <rob@sys3.pe1chl.ampr.org>
skronk 460/udp # skronk
skronk 460/tcp # skronk
@@ -1132,7 +1132,7 @@ alpes 463/tcp # alpes
kpasswd 464/udp # kpasswd
kpasswd 464/tcp # kpasswd
# Theodore Ts'o <tytso@MIT.EDU>
-igmpv3lite 465/udp # IGMP over UDP for SSM
+igmpv3lite 465/udp # IGMP over UDP for SSM
urd 465/tcp # URL Rendesvous Directory for SSM
# Toerless Eckert <eckert@cisco.com>
digital-vrc 466/udp # digital-vrc
@@ -1185,7 +1185,7 @@ ph 481/tcp # Ph service
# Roland Hedberg <Roland.Hedberg@umdac.umu.se>
bgs-nsi 482/udp # bgs-nsi
bgs-nsi 482/tcp # bgs-nsi
-# Jon Saperia <saperia@bgs.com>
+# Jon Saperia <saperia@bgs.com>
ulpnet 483/udp # ulpnet
ulpnet 483/tcp # ulpnet
# Kevin Mooney <kevinm@bfs.unibol.com>
@@ -1197,7 +1197,7 @@ powerburst 485/tcp # Air Soft Power Burst
# <gary@airsoft.com>
avian 486/udp # avian
avian 486/tcp # avian
-# Robert Ullmann
+# Robert Ullmann
# <Robert_Ullmann/CAM/Lotus.LOTUS@crd.lotus.com>
saft 487/udp # saft Simple Asynchronous File Transfer
saft 487/tcp # saft Simple Asynchronous File Transfer
@@ -1221,7 +1221,7 @@ ticf-2 493/tcp # Transport Independent Convergence for FNA
# Mamoru Ito <Ito@pcnet.ks.pfu.co.jp>
pov-ray 494/udp # POV-Ray
pov-ray 494/tcp # POV-Ray
-# POV-Team Co-ordinator
+# POV-Team Co-ordinator
# <iana-port.remove-spamguard@povray.org>
intecourier 495/udp # intecourier
intecourier 495/tcp # intecourier
@@ -1277,9 +1277,9 @@ passgo 511/tcp # PassGo
exec 512/tcp # remote process execution;
# authentication performed using
# passwords and UNIX login names
-comsat 512/udp biff #
+comsat 512/udp biff #
# of new mail received; currently
-# receives messages only from
+# receives messages only from
# processes on the same machine
login 513/tcp # remote login a la telnet;
# automatic authentication performed
@@ -1287,13 +1287,13 @@ login 513/tcp # remote login a la telnet;
# and distributed data bases which
# identify "authentication domains"
who 513/udp # maintains data bases showing who's
-# logged in to machines on a local
+# logged in to machines on a local
# net and the load average of the
# machine
shell 514/tcp # cmd
-# like exec, but automatic authentication
+# like exec, but automatic authentication
# is performed as for login server
-syslog 514/udp #
+syslog 514/udp #
printer 515/udp # spooler
printer 515/tcp # spooler
videotex 516/udp # videotex
@@ -1309,8 +1309,8 @@ talk 517/udp # like tenex link, but across
# use link protocol (this is actually
# just a rendezvous port from which a
# tcp connection is established)
-ntalk 518/udp #
-ntalk 518/tcp #
+ntalk 518/udp #
+ntalk 518/tcp #
utime 519/udp # unixtime
utime 519/tcp # unixtime
router 520/udp # local routing process (on site);
@@ -1320,13 +1320,13 @@ efs 520/tcp # extended file name server
ripng 521/udp # ripng
ripng 521/tcp # ripng
# Robert E. Minnear <minnear@ipsilon.com>
-ulp 522/udp # ULP
-ulp 522/tcp # ULP
+ulp 522/udp # ULP
+ulp 522/tcp # ULP
# Max Morris <maxm@MICROSOFT.com>
ibm-db2 523/udp # IBM-DB2
ibm-db2 523/tcp # IBM-DB2
# Peter Pau <pau@VNET.IBM.COM>
-ncp 524/udp # NCP
+ncp 524/udp # NCP
ncp 524/tcp # NCP
# Don Provan <donp@sjf.novell.com>
timed 525/udp # timeserver
@@ -1338,7 +1338,7 @@ stx 527/udp # Stock IXChange
stx 527/tcp # Stock IXChange
custix 528/udp # Customer IXChange
custix 528/tcp # Customer IXChange
-# Ferdi Ladeira <ferdi.ladeira@ixchange.com>
+# Ferdi Ladeira <ferdi.ladeira@ixchange.com>
irc-serv 529/udp # IRC-SERV
irc-serv 529/tcp # IRC-SERV
# Brian Tackett <cym@acrux.net>
@@ -1370,18 +1370,18 @@ apertus-ldp 539/tcp # Apertus Technologies Load Determination
uucp 540/udp # uucpd
uucp 540/tcp # uucpd
uucp-rlogin 541/udp # uucp-rlogin
-uucp-rlogin 541/tcp # uucp-rlogin
+uucp-rlogin 541/tcp # uucp-rlogin
# Stuart Lynne <sl@wimsey.com>
commerce 542/udp # commerce
commerce 542/tcp # commerce
# Randy Epstein <repstein@host.net>
-klogin 543/udp #
-klogin 543/tcp #
+klogin 543/udp #
+klogin 543/tcp #
kshell 544/udp # krcmd
kshell 544/tcp # krcmd
appleqtcsrvr 545/udp # appleqtcsrvr
appleqtcsrvr 545/tcp # appleqtcsrvr
-# Murali Ranganathan
+# Murali Ranganathan
# <Murali_Ranganathan@quickmail.apple.com>
dhcpv6-client 546/udp # DHCPv6 Client
dhcpv6-client 546/tcp # DHCPv6 Client
@@ -1408,8 +1408,8 @@ pirp 553/tcp # pirp
rtsp 554/udp # Real Time Stream Control Protocol
rtsp 554/tcp # Real Time Stream Control Protocol
# Rob Lanphier <robla@prognet.com>
-dsf 555/udp #
-dsf 555/tcp #
+dsf 555/udp #
+dsf 555/tcp #
remotefs 556/udp # rfs server
remotefs 556/tcp # rfs server
openvms-sysipc 557/udp # openvms-sysipc
@@ -1422,8 +1422,8 @@ teedtap 559/tcp # TEEDTAP
# Mort Hoffman <hoffman@mail.ndhm.gtegsc.com>
rmonitor 560/udp # rmonitord
rmonitor 560/tcp # rmonitord
-monitor 561/udp #
-monitor 561/tcp #
+monitor 561/udp #
+monitor 561/tcp #
chshell 562/udp # chcmd
chshell 562/tcp # chcmd
nntps 563/udp # nntp protocol over TLS/SSL (was snntp)
@@ -1554,14 +1554,14 @@ nqs 607/udp # nqs
nqs 607/tcp # nqs
# Bill Schiefelbein <schief@aspen.cray.com>
sift-uft 608/udp # Sender-Initiated/Unsolicited File Transfer
-sift-uft 608/tcp # Sender-Initiated/Unsolicited File Transfer
+sift-uft 608/tcp # Sender-Initiated/Unsolicited File Transfer
# Rick Troth <troth@rice.edu>
npmp-trap 609/udp # npmp-trap
npmp-trap 609/tcp # npmp-trap
npmp-local 610/udp # npmp-local
npmp-local 610/tcp # npmp-local
-npmp-gui 611/udp # npmp-gui
-npmp-gui 611/tcp # npmp-gui
+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
@@ -1667,13 +1667,13 @@ 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>
+# Bernard Volz <volz@ipworks.com>
rrp 648/udp # Registry Registrar Protocol (RRP)
rrp 648/tcp # Registry Registrar Protocol (RRP)
# 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>
+# David Cooper <david.cooper@oracle.com>
obex 650/udp # OBEX
obex 650/tcp # OBEX
# Jeff Garbers <FJG030@email.mot.com>
@@ -1803,7 +1803,7 @@ 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>
+# Curtis Anderson <ecanderson@turbolinux.com>
rushd 696/udp # RUSHD
rushd 696/tcp # RUSHD
# Greg Ercolano <erco@netcom.com>
@@ -1812,7 +1812,7 @@ uuidgen 697/tcp # UUIDGEN
# James Falkner <james.falkner@sun.com>
olsr 698/udp # OLSR
olsr 698/tcp # OLSR
-# Thomas Clausen <thomas.clausen@inria.fr>
+# Thomas Clausen <thomas.clausen@inria.fr>
accessnetwork 699/udp # Access Network
accessnetwork 699/tcp # Access Network
# Yingchun Xu <Yingchun_Xu@3com.com>
@@ -1845,7 +1845,7 @@ netviewdm2 730/tcp # IBM NetView DM/6000 send/tcp
netviewdm3 731/udp # IBM NetView DM/6000 receive/tcp
netviewdm3 731/tcp # IBM NetView DM/6000 receive/tcp
# Philippe Binet (phbinet@vnet.IBM.COM)
-# 732-740 Unassigned
+# 732-740 Unassigned
netgw 741/udp # netGW
netgw 741/tcp # netGW
# Oliver Korfmacher (okorf@netcs.com)
@@ -1856,7 +1856,7 @@ netrcs 742/tcp # Network based Rev. Cont. Sys.
flexlm 744/udp # Flexible License Manager
flexlm 744/tcp # Flexible License Manager
# Matt Christiano
-# <globes@matt@oliveb.atc.olivetti.com>
+# <globes@matt@oliveb.atc.olivetti.com>
# 745-746 Unassigned
fujitsu-dev 747/udp # Fujitsu Device Control
fujitsu-dev 747/tcp # Fujitsu Device Control
@@ -1864,7 +1864,7 @@ ris-cm 748/udp # Russell Info Sci Calendar Manager
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 #
+loadav 750/udp kerberos-iv #
rfile 750/tcp #
# Martin Hamilton <martin@mrrl.lut.as.uk>
pump 751/udp #
@@ -1887,8 +1887,8 @@ rxe 761/udp #
rxe 761/tcp #
quotad 762/udp #
quotad 762/tcp #
-cycleserv 763/udp #
-cycleserv 763/tcp #
+cycleserv 763/udp #
+cycleserv 763/tcp #
omserv 764/udp #
omserv 764/tcp #
webster 765/udp #
@@ -1901,19 +1901,19 @@ phonebook 767/tcp # phone
# 768 Unassigned
vid 769/udp #
vid 769/tcp #
-cadlock 770/udp #
-cadlock 770/tcp #
+cadlock 770/udp #
+cadlock 770/tcp #
rtip 771/udp #
rtip 771/tcp #
-cycleserv2 772/udp #
-cycleserv2 772/tcp #
+cycleserv2 772/udp #
+cycleserv2 772/tcp #
notify 773/udp #
submit 773/tcp #
-acmaint_dbd 774/udp #
+acmaint_dbd 774/udp #
rpasswd 774/tcp #
acmaint_transd 775/udp #
entomb 775/tcp #
-wpages 776/udp #
+wpages 776/udp #
wpages 776/tcp #
# Josyula R. Rao <jrrao@watson.ibm.com>
multiling-http 777/udp # Multiling HTTP
@@ -1945,7 +1945,7 @@ pkix-3-ca-ra 829/tcp # PKIX-3 CA/RA
# 830-846 Unassigned
dhcp-failover2 847/udp # dhcp-failover 2
dhcp-failover2 847/tcp # dhcp-failover 2
-# Bernard Volz <volz@ipworks.com>
+# Bernard Volz <volz@ipworks.com>
gdoi 848/udp # GDOI
gdoi 848/tcp # GDOI
# RFC-ietf-msec-gdoi-07.txt
@@ -1982,14 +1982,14 @@ ideafarm-chat 902/udp # IDEAFARM-CHAT
ideafarm-chat 902/tcp # IDEAFARM-CHAT
ideafarm-catch 903/udp # IDEAFARM-CATCH
ideafarm-catch 903/tcp # IDEAFARM-CATCH
-# Wo'o Ideafarm <wo@ideafarm.com>
+# Wo'o Ideafarm <wo@ideafarm.com>
# 904-910 Unassigned
xact-backup 911/udp # xact-backup
xact-backup 911/tcp # xact-backup
# Bill Carroll <billc@xactlabs.com>
apex-mesh 912/udp # APEX relay-relay service
apex-mesh 912/tcp # APEX relay-relay service
-apex-edge 913/udp # APEX endpoint-relay service
+apex-edge 913/udp # APEX endpoint-relay service
apex-edge 913/tcp # APEX endpoint-relay service
# [RFC3340]
# 914-988 Unassigned
@@ -2032,7 +2032,7 @@ surf 1010/tcp # surf
1023/udp # Reserved
1023/tcp # Reserved
# IANA <iana@iana.org>
- 1024/udp # Reserved
+ 1024/udp # Reserved
1024/tcp # Reserved
# IANA <iana@iana.org>
#
@@ -2047,7 +2047,7 @@ cap 1026/tcp # Calender Access Protocol
exosee 1027/udp # ExoSee
exosee 1027/tcp # ExoSee
# Chagdali Isamail <chagdali@free.fr> June 2003
-# 1028-1029 Unassigned
+# 1028-1029 Unassigned
iad1 1030/udp # BBN IAD
iad1 1030/tcp # BBN IAD
iad2 1031/udp # BBN IAD
@@ -2086,7 +2086,7 @@ td-postman 1049/tcp # Tobit David Postman VPMN
# Franz-Josef Leuders <development@tobit.com>
cma 1050/udp # CORBA Management Agent
cma 1050/tcp # CORBA Management Agent
-# Ramy Zaarour <ramy@lumos.com>
+# Ramy Zaarour <ramy@lumos.com>
optima-vnet 1051/udp # Optima VNET
optima-vnet 1051/tcp # Optima VNET
# Ralf Doewich <ralf.doewich@optimatele.com>
@@ -2095,19 +2095,19 @@ ddt 1052/tcp # Dynamic DNS Tools
# Remi Lefebvre <remi@debian.org>
remote-as 1053/udp # Remote Assistant (RA)
remote-as 1053/tcp # Remote Assistant (RA)
-# Roman Kriis <roman@previo.ee>
+# Roman Kriis <roman@previo.ee>
brvread 1054/udp # BRVREAD
brvread 1054/tcp # BRVREAD
# Gilles Roussel <groussel@eu-symtrax.com>
ansyslmd 1055/udp # ANSYS - License Manager
-ansyslmd 1055/tcp # ANSYS - License Manager
+ansyslmd 1055/tcp # ANSYS - License Manager
# Suzanne Lorrin <suzanne.lorrin@ansys.com>
-vfo 1056/udp # VFO
+vfo 1056/udp # VFO
vfo 1056/tcp # VFO
# Anthony Gonzalez <agonzal1@telcordia.com>
startron 1057/udp # STARTRON
startron 1057/tcp # STARTRON
-# Markus Sabadello <sabadello@startron.org>
+# Markus Sabadello <sabadello@startron.org>
nim 1058/udp # nim
nim 1058/tcp # nim
nimreg 1059/udp # nimreg
@@ -2124,21 +2124,21 @@ veracity 1062/tcp # Veracity
# Ross Williams <ross@rocksoft.com>
kyoceranetdev 1063/udp # KyoceraNetDev
kyoceranetdev 1063/tcp # KyoceraNetDev
-# Shigenaka Kanemitsu
+# Shigenaka Kanemitsu
# <Shigenaka_Kanemitsu@ypd.kyocera.co.jp>
jstel 1064/udp # JSTEL
jstel 1064/tcp # JSTEL
-# Duane Kiser <dkiser@jsexpress.com>
+# Duane Kiser <dkiser@jsexpress.com>
syscomlan 1065/udp # SYSCOMLAN
syscomlan 1065/tcp # SYSCOMLAN
# Urs Ryf <urs.ryf@selectron.ch>
fpo-fns 1066/udp # FPO-FNS
fpo-fns 1066/tcp # FPO-FNS
# Jens Klose <jklose@intercope.com>
-instl_boots 1067/udp # Installation Bootstrap Proto. Serv.
-instl_boots 1067/tcp # Installation Bootstrap Proto. Serv.
-instl_bootc 1068/udp # Installation Bootstrap Proto. Cli.
-instl_bootc 1068/tcp # Installation Bootstrap Proto. Cli.
+instl_boots 1067/udp # Installation Bootstrap Proto. Serv.
+instl_boots 1067/tcp # Installation Bootstrap Proto. Serv.
+instl_bootc 1068/udp # Installation Bootstrap Proto. Cli.
+instl_bootc 1068/tcp # Installation Bootstrap Proto. Cli.
# David Arko <darko@hpfcrn.fc.hp.com>
cognex-insight 1069/udp # COGNEX-INSIGHT
cognex-insight 1069/tcp # COGNEX-INSIGHT
@@ -2161,7 +2161,7 @@ fastechnologlm 1074/tcp # FASTechnologies License Manager
# <rhenn@fastechnologies.com>
rdrmshc 1075/udp # RDRMSHC
rdrmshc 1075/tcp # RDRMSHC
-# Ericko Shimada <eriko@kel.fujitsu.co.jp>
+# Ericko Shimada <eriko@kel.fujitsu.co.jp>
dab-sti-c 1076/udp # DAB STI-C
dab-sti-c 1076/tcp # DAB STI-C
# World DAB <worlddab_irc@worlddab.org>
@@ -2170,17 +2170,17 @@ imgames 1077/tcp # IMGames
# Jean A. Ames <engr-admin@flipside.com>
avocent-proxy 1078/udp # Avocent Proxy Protocol
avocent-proxy 1078/tcp # Avocent Proxy Protocol
-# Steven W. Clark <steven.clark@avocent.com>
+# Steven W. Clark <steven.clark@avocent.com>
asprovatalk 1079/udp # ASPROVATalk
asprovatalk 1079/tcp # ASPROVATalk
# Chiew Farn Chung <cfchung@asprova.com>
-socks 1080/udp # Socks
-socks 1080/tcp # Socks
+socks 1080/udp # Socks
+socks 1080/tcp # Socks
# Ying-Da Lee <ylee@syl.dl.nec.com
pvuniwien 1081/udp # PVUNIWIEN
pvuniwien 1081/tcp # PVUNIWIEN
# Peter Lipp >Peter.Lipp@iaik.at>
-amt-esd-prot 1082/udp # AMT-ESD-PROT
+amt-esd-prot 1082/udp # AMT-ESD-PROT
amt-esd-prot 1082/tcp # AMT-ESD-PROT
# AMTEC S.p.A <sp.amtec@interbusiness.it>
ansoft-lm-1 1083/udp # Anasoft License Manager
@@ -2192,21 +2192,21 @@ 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
+cplscrambler-in 1087/udp # CPL Scrambler Internal
cplscrambler-in 1087/tcp # CPL Scrambler Internal
cplscrambler-al 1088/udp # CPL Scrambler Alarm Log
cplscrambler-al 1088/tcp # CPL Scrambler Alarm Log
-# Richard Corn <rac@racc.com>
-ff-annunc 1089/udp # FF Annunciation
-ff-annunc 1089/tcp # FF Annunciation
+# Richard Corn <rac@racc.com>
+ff-annunc 1089/udp # FF Annunciation
+ff-annunc 1089/tcp # FF Annunciation
ff-fms 1090/udp # FF Fieldbus Message Specification
-ff-fms 1090/tcp # FF Fieldbus Message Specification
+ff-fms 1090/tcp # FF Fieldbus Message Specification
ff-sm 1091/udp # FF System Management
ff-sm 1091/tcp # FF System Management
# Fieldbus Foundation <dave.glanzer@fieldbus.org>
obrpd 1092/udp # Open Business Reporting Protocol
obrpd 1092/tcp # Open Business Reporting Protocol
-# William Randolph Royere III
+# William Randolph Royere III
# <william@royere.net>
proofd 1093/udp # PROOFD
proofd 1093/tcp # PROOFD
@@ -2215,10 +2215,10 @@ rootd 1094/tcp # ROOTD
# Fons Rademakers <Fons.Rademakers@cern.ch>
nicelink 1095/udp # NICELink
nicelink 1095/tcp # NICELink
-# Jordi Lisbona <jlisbona@tango04.net>
+# Jordi Lisbona <jlisbona@tango04.net>
cnrprotocol 1096/udp # Common Name Resolution Protocol
cnrprotocol 1096/tcp # Common Name Resolution Protocol
-# Michael Mealling <michaelm@netsol.com>
+# Michael Mealling <michaelm@netsol.com>
sunclustermgr 1097/udp # Sun Cluster Manager
sunclustermgr 1097/tcp # Sun Cluster Manager
# Ashit Patel <Ashit.Patel@eng.Sun.COM>
@@ -2228,12 +2228,12 @@ rmiregistry 1099/udp # RMI Registry
rmiregistry 1099/tcp # RMI Registry
# Mark Hodapp <mark.hodapp@sun.com>
mctp 1100/udp # MCTP
-mctp 1100/tcp # MCTP
+mctp 1100/tcp # MCTP
# Vitaly Revsin <vitaly@webmanage.com>
pt2-discover 1101/udp # PT2-DISCOVER
pt2-discover 1101/tcp # PT2-DISCOVER
-# Ralph Kammerlander
-# <ralph.kammerlander@khe.siemens.de>
+# Ralph Kammerlander
+# <ralph.kammerlander@khe.siemens.de>
adobeserver-1 1102/udp # ADOBE SERVER 1
adobeserver-1 1102/tcp # ADOBE SERVER 1
adobeserver-2 1103/udp # ADOBE SERVER 2
@@ -2244,12 +2244,12 @@ xrl 1104/tcp # XRL
# Patrick Robinson <probinson@plosive.com>
ftranhc 1105/udp # FTRANHC
ftranhc 1105/tcp # FTRANHC
-# Eriko Shimada <eriko@kel.fujitsu.co.jp>
-isoipsigport-1 1106/udp # ISOIPSIGPORT-1
+# Eriko Shimada <eriko@kel.fujitsu.co.jp>
+isoipsigport-1 1106/udp # ISOIPSIGPORT-1
isoipsigport-1 1106/tcp # ISOIPSIGPORT-1
-isoipsigport-2 1107/udp # ISOIPSIGPORT-2
-isoipsigport-2 1107/tcp # ISOIPSIGPORT-2
-# Peter Egli <peter.egli@inalp.com>
+isoipsigport-2 1107/udp # ISOIPSIGPORT-2
+isoipsigport-2 1107/tcp # ISOIPSIGPORT-2
+# Peter Egli <peter.egli@inalp.com>
ratio-adp 1108/udp # ratio-adp
ratio-adp 1108/tcp # ratio-adp
# Oliver Thulke <oth@ratio.de>
@@ -2262,8 +2262,8 @@ lmsocialserver 1111/tcp # LM Social Server
# Ron Lussier <coyote@likeminds.com>
icp 1112/udp # Intelligent Communication Protocol
icp 1112/tcp # Intelligent Communication Protocol
-# Mark H. David <mhd@gensym.com>
-# 1113 Unassigned
+# Mark H. David <mhd@gensym.com>
+# 1113 Unassigned
mini-sql 1114/udp # Mini SQL
mini-sql 1114/tcp # Mini SQL
# David Hughes <bambi@Hughes.com.au>
@@ -2277,13 +2277,13 @@ ardus-mtrns 1117/tcp # ARDUS Multicast Transfer
# 1118-1121 Unassigned
availant-mgr 1122/udp # availant-mgr
availant-mgr 1122/tcp # availant-mgr
-# Steven Pelletier <stevep@Availant.com>
+# Steven Pelletier <stevep@Availant.com>
murray 1123/udp # Murray
murray 1123/tcp # Murray
# Stu Mark <fordii@j51.com>
-# 1124-1154 Unassigned
-nfa 1155/udp # Network File Access
-nfa 1155/tcp # Network File Access
+# 1124-1154 Unassigned
+nfa 1155/udp # Network File Access
+nfa 1155/tcp # Network File Access
# James Powell <james@mailhost.unidata.com>
# 1156-1160 Unassigned
health-polling 1161/udp # Health Polling
@@ -2341,13 +2341,13 @@ anthony-data 1206/tcp # Anthony Data
# Paul Dollemore <pauld@anthonydata.com>
metasage 1207/udp # MetaSage
metasage 1207/tcp # MetaSage
-# Peter Anvelt <panvelt@xnai.com>
+# Peter Anvelt <panvelt@xnai.com>
seagull-ais 1208/udp # SEAGULL AIS
seagull-ais 1208/tcp # SEAGULL AIS
-# Lee Breisacher <lbreisacher@seagullsw.com>
+# Lee Breisacher <lbreisacher@seagullsw.com>
ipcd3 1209/udp # IPCD3
ipcd3 1209/tcp # IPCD3
-# Mark Ciskey <mlciskey@plato.com>
+# Mark Ciskey <mlciskey@plato.com>
eoss 1210/udp # EOSS
eoss 1210/tcp # EOSS
# Robert Armes <rarmes@axarte.com>
@@ -2362,7 +2362,7 @@ mpc-lifenet 1213/tcp # MPC LIFENET
# Ward Silver <hwardsil@wolfenet.com>
kazaa 1214/udp # KAZAA
kazaa 1214/tcp # KAZAA
-# Ahti Heinla <ahti@ahti.bluemoon.ee>
+# Ahti Heinla <ahti@ahti.bluemoon.ee>
scanstat-1 1215/udp # scanSTAT 1.0
scanstat-1 1215/tcp # scanSTAT 1.0
# William Scheding <wls@wls.org>
@@ -2382,22 +2382,22 @@ qt-serveradmin 1220/tcp # QT SERVER ADMIN
# Chris LeCroy <lecroy@apple.com>
sweetware-apps 1221/udp # SweetWARE Apps
sweetware-apps 1221/tcp # SweetWARE Apps
-# David Dunetz <david@sweetware.com>
-nerv 1222/udp # SNI R&D network
-nerv 1222/tcp # SNI R&D network
+# David Dunetz <david@sweetware.com>
+nerv 1222/udp # SNI R&D network
+nerv 1222/tcp # SNI R&D network
# Martin Freiss <freiss.pad@sni.de>
tgp 1223/udp # TGP
tgp 1223/tcp # TGP
-# Gur Kimchi <gur@mail.trulyglobal.com>
+# Gur Kimchi <gur@mail.trulyglobal.com>
vpnz 1224/udp # VPNz
vpnz 1224/tcp # VPNz
-# Tom Strack <TSTRACK@Advnw.com>
+# Tom Strack <TSTRACK@Advnw.com>
slinkysearch 1225/udp # SLINKYSEARCH
slinkysearch 1225/tcp # SLINKYSEARCH
# Desmond Chan <deschan@prismedia.com>
stgxfws 1226/udp # STGXFWS
stgxfws 1226/tcp # STGXFWS
-# Tetsuya Shioda <tetsuya@saint.nm.fujitsu.co.jp>
+# Tetsuya Shioda <tetsuya@saint.nm.fujitsu.co.jp>
dns2go 1227/udp # DNS2Go
dns2go 1227/tcp # DNS2Go
# Mark Richards <mark.richards@deerfield.com>
@@ -2406,7 +2406,7 @@ florence 1228/tcp # FLORENCE
# Brian Trammell <btrammell@iventurelab.com>
novell-zfs 1229/udp # Novell ZFS
novell-zfs 1229/tcp # Novell ZFS
-# Ty Ellis <tellis@novell.com>
+# Ty Ellis <tellis@novell.com>
periscope 1230/udp # Periscope
periscope 1230/tcp # Periscope
# Kevin Madden <Kevin@emailxtras.com>
@@ -2428,7 +2428,7 @@ bvcontrol 1236/tcp # bvcontrol
# Daniel J Walsh <dwalsh@bindview.com>
tsdos390 1237/udp # tsdos390
tsdos390 1237/tcp # tsdos390
-# Ben Pracht <ben.pracht@tivoli.com>
+# Ben Pracht <ben.pracht@tivoli.com>
hacl-qs 1238/udp # hacl-qs
hacl-qs 1238/tcp # hacl-qs
# Farid Faez <farid_faez@hp.com>
@@ -2437,7 +2437,7 @@ nmsd 1239/tcp # NMSD
# Yuri Machkasov <yuri@ptc.com>
instantia 1240/udp # Instantia
instantia 1240/tcp # Instantia
-# Ruth Slater <ruth.slater@ideagen.co.uk>
+# Ruth Slater <ruth.slater@ideagen.co.uk>
nessus 1241/udp # nessus
nessus 1241/tcp # nessus
# Jordan Hrycaj <jordan@mjh.teddy-net.com>
@@ -2489,7 +2489,7 @@ 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>
+# Phil Frisbie <phil@hawksoft.com>
ibm-ssd 1260/udp # ibm-ssd
ibm-ssd 1260/tcp # ibm-ssd
# Barry Whyte <barry_whyte@uk.ibm.com>
@@ -2498,19 +2498,19 @@ mpshrsv 1261/tcp # mpshrsv
# Makoto Ikeyama <ikeyama@ael.fujitsu.co.jp>
qnts-orb 1262/udp # QNTS-ORB
qnts-orb 1262/tcp # QNTS-ORB
-# Raghurama Bhat <raghu@quintus.com>
+# Raghurama Bhat <raghu@quintus.com>
dka 1263/udp # dka
dka 1263/tcp # dka
# Chris Griffin <cgriffin@dka.com>
prat 1264/udp # PRAT
prat 1264/tcp # PRAT
-# Keith Wood <keith.wood@epid.eurotherm.co.uk>
+# Keith Wood <keith.wood@epid.eurotherm.co.uk>
dssiapi 1265/udp # DSSIAPI
dssiapi 1265/tcp # DSSIAPI
-# Steve Sando <steve.sando@diversifiedsoftware.com>
+# Steve Sando <steve.sando@diversifiedsoftware.com>
dellpwrappks 1266/udp # DELLPWRAPPKS
dellpwrappks 1266/tcp # DELLPWRAPPKS
-# David Troeger <David_Troeger@dell.com>
+# David Troeger <David_Troeger@dell.com>
epc 1267/udp # eTrust Policy Compliance
epc 1267/tcp # eTrust Policy Compliance
# Aaron Stein <aaron.stein@ca.com>
@@ -2545,15 +2545,15 @@ miva-mqs 1277/tcp # mqs
# Miva Corporation <jwoods@miva.com.au>
dellwebadmin-1 1278/udp # Dell Web Admin 1
dellwebadmin-1 1278/tcp # Dell Web Admin 1
-dellwebadmin-2 1279/udp # Dell Web Admin 2
+dellwebadmin-2 1279/udp # Dell Web Admin 2
dellwebadmin-2 1279/tcp # Dell Web Admin 2
-# Bridget Navoda <Bridget_Navoda@dell.com>
+# Bridget Navoda <Bridget_Navoda@dell.com>
pictrography 1280/udp # Pictrography
pictrography 1280/tcp # Pictrography
-# Takashi Hoshino <hoshino@miya.fujifilm.co.jp>
+# Takashi Hoshino <hoshino@miya.fujifilm.co.jp>
healthd 1281/udp # healthd
healthd 1281/tcp # healthd
-# James E. Housley <jim@thehousleys.net>
+# James E. Housley <jim@thehousleys.net>
emperion 1282/udp # Emperion
emperion 1282/tcp # Emperion
# Claus Thor Barth <ctb@satworks.net>
@@ -2565,7 +2565,7 @@ iee-qfx 1284/tcp # IEE-QFX
neoiface 1285/udp # neoiface
neoiface 1285/tcp # neoiface
# Jason McManus <jasonm@neoinformatics.com>
-netuitive 1286/udp # netuitive
+netuitive 1286/udp # netuitive
netuitive 1286/tcp # netuitive
# Clayton Wilkinson <cwilkinson@netuitive.com>
# 1287 Unassigned
@@ -2574,8 +2574,8 @@ navbuddy 1288/tcp # NavBuddy
# Eric Hackman <ehackman@millapps.com>
jwalkserver 1289/udp # JWalkServer
jwalkserver 1289/tcp # JWalkServer
-winjaserver 1290/udp # WinJaServer
-winjaserver 1290/tcp # WinJaServer
+winjaserver 1290/udp # WinJaServer
+winjaserver 1290/tcp # WinJaServer
seagulllms 1291/udp # SEAGULLLMS
seagulllms 1291/tcp # SEAGULLLMS
# Lee Breisacher <lbreisacher@seafullsw.com>
@@ -2590,18 +2590,18 @@ cmmdriver 1294/tcp # CMMdriver
# Lutz Karras <karras@zeiss.de>
ehtp 1295/udp # End-by-Hop Transmission Protocol
ehtp 1295/tcp # End-by-Hop Transmission Protocol
-# Alexander Bogdanov <alexandr_bgd@softhome.net>
+# Alexander Bogdanov <alexandr_bgd@softhome.net>
dproxy 1296/udp # dproxy
dproxy 1296/tcp # dproxy
sdproxy 1297/udp # sdproxy
sdproxy 1297/tcp # sdproxy
-# Raimond Diederik <rdiederik@descartes.com>
+# Raimond Diederik <rdiederik@descartes.com>
lpcp 1298/udp # lpcp
lpcp 1298/tcp # lpcp
# Christian Stredicke <stredicke@snom.de>
hp-sci 1299/udp # hp-sci
hp-sci 1299/tcp # hp-sci
-# Kim Scott <kims@cup.hp.com>
+# 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>
@@ -2624,10 +2624,10 @@ re-conn-proto 1306/tcp # RE-Conn-Proto
# Sandeep Singhal <sandeep@reefedge.com>
pacmand 1307/udp # Pacmand
pacmand 1307/tcp # Pacmand
-# Edward T. O'Shea <oshea@bellsouth.net>
+# Edward T. O'Shea <oshea@bellsouth.net>
odsi 1308/udp # Optical Domain Service Interconnect (ODSI)
odsi 1308/tcp # Optical Domain Service Interconnect (ODSI)
-# K. Arvind <arvind@tenornetworks.com>
+# K. Arvind <arvind@tenornetworks.com>
jtag-server 1309/udp # JTAG server
jtag-server 1309/tcp # JTAG server
# Andrew Draper <adraper@altera.com>
@@ -2657,10 +2657,10 @@ vrts-ipcserver 1317/tcp # vrts-ipcserver
# Bruce Hestand <Bruce.Hestand@veritas.com>
krb5gatekeeper 1318/udp # krb5gatekeeper
krb5gatekeeper 1318/tcp # krb5gatekeeper
-# Patrick Moore <pcmoore@sandia.gov>
+# Patrick Moore <pcmoore@sandia.gov>
panja-icsp 1319/udp # Panja-ICSP
panja-icsp 1319/tcp # Panja-ICSP
-# Ron Barber <ron.barber@panja.com>
+# Ron Barber <ron.barber@panja.com>
panja-axbnet 1320/udp # Panja-AXBNET
panja-axbnet 1320/tcp # Panja-AXBNET
# Andrew van Wensen <avanwensen@panja.com>
@@ -2675,7 +2675,7 @@ brcd 1323/tcp # brcd
# Todd Picquelle <todd@convergence.net>
delta-mcp 1324/udp # delta-mcp
delta-mcp 1324/tcp # delta-mcp
-# Quinton Tormanen <quinton@deltacompsys.com>
+# Quinton Tormanen <quinton@deltacompsys.com>
dx-instrument 1325/udp # DX-Instrument
dx-instrument 1325/tcp # DX-Instrument
# Walt Modic <Walt.Modic@dionex.com>
@@ -2693,19 +2693,19 @@ netdb-export 1329/tcp # netdb-export
# Konstantinos Kostis <netdb@kostis.net>
streetperfect 1330/udp # StreetPerfect
streetperfect 1330/tcp # StreetPerfect
-# Michael R. Young <michael.young@tor.sunpub.com>
+# Michael R. Young <michael.young@tor.sunpub.com>
intersan 1331/udp # intersan
intersan 1331/tcp # intersan
-# Barry H. Feild <barry@intersan.net>
+# Barry H. Feild <barry@intersan.net>
pcia-rxp-b 1332/udp # PCIA RXP-B
pcia-rxp-b 1332/tcp # PCIA RXP-B
# James Dabbs <jdabbs@tga.com>
passwrd-policy 1333/udp # Password Policy
passwrd-policy 1333/tcp # Password Policy
-# Tonio Pirotta <tonio@tpis.com.au>
+# Tonio Pirotta <tonio@tpis.com.au>
writesrv 1334/udp # writesrv
writesrv 1334/tcp # writesrv
-# Marvin Toungate <toungate@austin.ibm.com>
+# Marvin Toungate <toungate@austin.ibm.com>
digital-notary 1335/udp # Digital Notary Protocol
digital-notary 1335/tcp # Digital Notary Protocol
# Wes Doonan
@@ -2717,7 +2717,7 @@ menandmice-dns 1337/tcp # menandmice DNS
# Sigfus Magnusson <sigfusm@menandmice.com>
wmc-log-svc 1338/udp # WMC-log-svr
wmc-log-svc 1338/tcp # WMC-log-svr
-# Stephen Brosseau <brosseau@workingmachines.com>
+# Stephen Brosseau <brosseau@workingmachines.com>
kjtsiteserver 1339/udp # kjtsiteserver
kjtsiteserver 1339/tcp # kjtsiteserver
# Jason Aubain <jaubain@kjt.com>
@@ -2726,7 +2726,7 @@ naap 1340/tcp # NAAP
# Henry Haverinen <henry.haverinen@nokia.com>
qubes 1341/udp # QuBES
qubes 1341/tcp # QuBES
-# Eric Grange <egrange@creative-it.net>
+# Eric Grange <egrange@creative-it.net>
esbroker 1342/udp # ESBroker
esbroker 1342/tcp # ESBroker
# Alexander Medvinsky <smedvinsky@gi.com>
@@ -2739,154 +2739,154 @@ icap 1344/tcp # ICAP
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
+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
-sbook 1349/udp # Registration Network Protocol
-sbook 1349/tcp # Registration Network Protocol
-editbench 1350/udp # Registration Network Protocol
-editbench 1350/tcp # Registration Network Protocol
+sbook 1349/udp # Registration Network Protocol
+sbook 1349/tcp # Registration Network Protocol
+editbench 1350/udp # Registration Network Protocol
+editbench 1350/tcp # Registration Network Protocol
# Simson L. Garfinkel <simsong@next.cambridge.ma.us>
-equationbuilder 1351/udp # Digital Tool Works (MIT)
-equationbuilder 1351/tcp # Digital Tool Works (MIT)
+equationbuilder 1351/udp # Digital Tool Works (MIT)
+equationbuilder 1351/tcp # Digital Tool Works (MIT)
# Terrence J. Talbot <lexcube!tjt@bu.edu>
-lotusnote 1352/udp # Lotus Note
-lotusnote 1352/tcp # Lotus Note
+lotusnote 1352/udp # Lotus Note
+lotusnote 1352/tcp # Lotus Note
# Greg Pflaum <iris.com!Greg_Pflaum@uunet.uu.net>
-relief 1353/udp # Relief Consulting
-relief 1353/tcp # Relief Consulting
+relief 1353/udp # Relief Consulting
+relief 1353/tcp # Relief Consulting
# John Feiler <relief!jjfeiler@uu2.psi.com>
-rightbrain 1354/udp # RightBrain Software
-rightbrain 1354/tcp # RightBrain Software
+rightbrain 1354/udp # RightBrain Software
+rightbrain 1354/tcp # RightBrain Software
# Glenn Reid <glann@rightbrain.com>
-intuitive-edge 1355/udp # Intuitive Edge
-intuitive-edge 1355/tcp # Intuitive Edge
+intuitive-edge 1355/udp # Intuitive Edge
+intuitive-edge 1355/tcp # Intuitive Edge
# Montgomery Zukowski
-# <monty@nextnorth.acs.ohio-state.edu>
-cuillamartin 1356/udp # CuillaMartin Company
-cuillamartin 1356/tcp # CuillaMartin Company
-pegboard 1357/udp # Electronic PegBoard
-pegboard 1357/tcp # Electronic PegBoard
+# <monty@nextnorth.acs.ohio-state.edu>
+cuillamartin 1356/udp # CuillaMartin Company
+cuillamartin 1356/tcp # CuillaMartin Company
+pegboard 1357/udp # Electronic PegBoard
+pegboard 1357/tcp # Electronic PegBoard
# Chris Cuilla
-# <balr!vpnet!cuilla!chris@clout.chi.il.us>
-connlcli 1358/udp # CONNLCLI
-connlcli 1358/tcp # CONNLCLI
-ftsrv 1359/udp # FTSRV
-ftsrv 1359/tcp # FTSRV
+# <balr!vpnet!cuilla!chris@clout.chi.il.us>
+connlcli 1358/udp # CONNLCLI
+connlcli 1358/tcp # CONNLCLI
+ftsrv 1359/udp # FTSRV
+ftsrv 1359/tcp # FTSRV
# Ines Homem de Melo <sidinf@brfapesp.bitnet>
-mimer 1360/udp # MIMER
-mimer 1360/tcp # MIMER
+mimer 1360/udp # MIMER
+mimer 1360/tcp # MIMER
# Per Schroeder <Per.Schroder@mimer.se>
-linx 1361/udp # LinX
-linx 1361/tcp # LinX
+linx 1361/udp # LinX
+linx 1361/tcp # LinX
# Steffen Schilke <---none--->
-timeflies 1362/udp # TimeFlies
-timeflies 1362/tcp # TimeFlies
+timeflies 1362/udp # TimeFlies
+timeflies 1362/tcp # TimeFlies
# Doug Kent <mouthers@slugg@nwnexus.wa.com>
ndm-requester 1363/udp # Network DataMover Requester
ndm-requester 1363/tcp # Network DataMover Requester
-ndm-server 1364/udp # Network DataMover Server
-ndm-server 1364/tcp # Network DataMover Server
+ndm-server 1364/udp # Network DataMover Server
+ndm-server 1364/tcp # Network DataMover Server
# Toshio Watanabe
-# <watanabe@godzilla.rsc.spdd.ricoh.co.j>
+# <watanabe@godzilla.rsc.spdd.ricoh.co.j>
adapt-sna 1365/udp # Network Software Associates
adapt-sna 1365/tcp # Network Software Associates
# Jeffery Chiao <714-768-401>
netware-csp 1366/udp # Novell NetWare Comm Service Platform
netware-csp 1366/tcp # Novell NetWare Comm Service Platform
# Laurie Lindsey <llindsey@novell.com>
-dcs 1367/udp # DCS
-dcs 1367/tcp # DCS
+dcs 1367/udp # DCS
+dcs 1367/tcp # DCS
# Stefan Siebert <ssiebert@dcs.de>
-screencast 1368/udp # ScreenCast
-screencast 1368/tcp # ScreenCast
+screencast 1368/udp # ScreenCast
+screencast 1368/tcp # ScreenCast
# Bill Tschumy <other!bill@uunet.UU.NET>
-gv-us 1369/udp # GlobalView to Unix Shell
-gv-us 1369/tcp # GlobalView to Unix Shell
-us-gv 1370/udp # Unix Shell to GlobalView
-us-gv 1370/tcp # Unix Shell to GlobalView
+gv-us 1369/udp # GlobalView to Unix Shell
+gv-us 1369/tcp # GlobalView to Unix Shell
+us-gv 1370/udp # Unix Shell to GlobalView
+us-gv 1370/tcp # Unix Shell to GlobalView
# Makoto Mita <mita@ssdev.ksp.fujixerox.co.jp>
-fc-cli 1371/udp # Fujitsu Config Protocol
-fc-cli 1371/tcp # Fujitsu Config Protocol
-fc-ser 1372/udp # Fujitsu Config Protocol
-fc-ser 1372/tcp # Fujitsu Config Protocol
+fc-cli 1371/udp # Fujitsu Config Protocol
+fc-cli 1371/tcp # Fujitsu Config Protocol
+fc-ser 1372/udp # Fujitsu Config Protocol
+fc-ser 1372/tcp # Fujitsu Config Protocol
# Ryuichi Horie <horie@spad.sysrap.cs.fujitsu.co.jp>
-chromagrafx 1373/udp # Chromagrafx
-chromagrafx 1373/tcp # Chromagrafx
+chromagrafx 1373/udp # Chromagrafx
+chromagrafx 1373/tcp # Chromagrafx
# Mike Barthelemy <msb@chromagrafx.com>
-molly 1374/udp # EPI Software Systems
-molly 1374/tcp # EPI Software Systems
+molly 1374/udp # EPI Software Systems
+molly 1374/tcp # EPI Software Systems
# Jim Vlcek <jvlcek@veeco.com>
-bytex 1375/udp # Bytex
-bytex 1375/tcp # Bytex
+bytex 1375/udp # Bytex
+bytex 1375/tcp # Bytex
# Mary Ann Burt <bytex!ws054!maryann@uunet.UU.NET>
-ibm-pps 1376/udp # IBM Person to Person Software
-ibm-pps 1376/tcp # IBM Person to Person Software
+ibm-pps 1376/udp # IBM Person to Person Software
+ibm-pps 1376/tcp # IBM Person to Person Software
# Simon Phipps <sphipps@vnet.ibm.com>
-cichlid 1377/udp # Cichlid License Manager
-cichlid 1377/tcp # Cichlid License Manager
+cichlid 1377/udp # Cichlid License Manager
+cichlid 1377/tcp # Cichlid License Manager
# Andy Burgess <aab@cichlid.com>
-elan 1378/udp # Elan License Manager
-elan 1378/tcp # Elan License Manager
+elan 1378/udp # Elan License Manager
+elan 1378/tcp # Elan License Manager
# Ken Greer <kg@elan.com>
-dbreporter 1379/udp # Integrity Solutions
-dbreporter 1379/tcp # Integrity Solutions
+dbreporter 1379/udp # Integrity Solutions
+dbreporter 1379/tcp # Integrity Solutions
# Tim Dawson <tdawson%mspboss@uunet.UU.NET>
-telesis-licman 1380/udp # Telesis Network License Manager
-telesis-licman 1380/tcp # Telesis Network License Manager
+telesis-licman 1380/udp # Telesis Network License Manager
+telesis-licman 1380/tcp # Telesis Network License Manager
# Karl Schendel, Jr. <wiz@telesis.com>
-apple-licman 1381/udp # Apple Network License Manager
-apple-licman 1381/tcp # Apple Network License Manager
+apple-licman 1381/udp # Apple Network License Manager
+apple-licman 1381/tcp # Apple Network License Manager
# Earl Wallace <earlw@apple.com>
udt_os 1382/udp # udt_os
udt_os 1382/tcp # udt_os
gwha 1383/udp # GW Hannaway Network License Manager
gwha 1383/tcp # GW Hannaway Network License Manager
# J. Gabriel Foster <fop@gwha.com>
-os-licman 1384/udp # Objective Solutions License Manager
-os-licman 1384/tcp # Objective Solutions License Manager
+os-licman 1384/udp # Objective Solutions License Manager
+os-licman 1384/tcp # Objective Solutions License Manager
# Donald Cornwell <don.cornwell@objective.com>
atex_elmd 1385/udp # Atex Publishing License Manager
atex_elmd 1385/tcp # Atex Publishing License Manager
# Brett Sorenson <bcs@atex.com>
-checksum 1386/udp # CheckSum License Manager
-checksum 1386/tcp # CheckSum License Manager
+checksum 1386/udp # CheckSum License Manager
+checksum 1386/tcp # CheckSum License Manager
# Andreas Glocker <glocker@sirius.com>
-cadsi-lm 1387/udp # Computer Aided Design Software Inc LM
-cadsi-lm 1387/tcp # Computer Aided Design Software Inc LM
+cadsi-lm 1387/udp # Computer Aided Design Software Inc LM
+cadsi-lm 1387/tcp # Computer Aided Design Software Inc LM
# Sulistio Muljadi <e-mail?>
objective-dbc 1388/udp # Objective Solutions DataBase Cache
objective-dbc 1388/tcp # Objective Solutions DataBase Cache
# Donald Cornwell <e-mail?>
-iclpv-dm 1389/udp # Document Manager
-iclpv-dm 1389/tcp # Document Manager
-iclpv-sc 1390/udp # Storage Controller
-iclpv-sc 1390/tcp # Storage Controller
-iclpv-sas 1391/udp # Storage Access Server
-iclpv-sas 1391/tcp # Storage Access Server
-iclpv-pm 1392/udp # Print Manager
-iclpv-pm 1392/tcp # Print Manager
-iclpv-nls 1393/udp # Network Log Server
-iclpv-nls 1393/tcp # Network Log Server
-iclpv-nlc 1394/udp # Network Log Client
-iclpv-nlc 1394/tcp # Network Log Client
-iclpv-wsm 1395/udp # PC Workstation Manager software
-iclpv-wsm 1395/tcp # PC Workstation Manager software
+iclpv-dm 1389/udp # Document Manager
+iclpv-dm 1389/tcp # Document Manager
+iclpv-sc 1390/udp # Storage Controller
+iclpv-sc 1390/tcp # Storage Controller
+iclpv-sas 1391/udp # Storage Access Server
+iclpv-sas 1391/tcp # Storage Access Server
+iclpv-pm 1392/udp # Print Manager
+iclpv-pm 1392/tcp # Print Manager
+iclpv-nls 1393/udp # Network Log Server
+iclpv-nls 1393/tcp # Network Log Server
+iclpv-nlc 1394/udp # Network Log Client
+iclpv-nlc 1394/tcp # Network Log Client
+iclpv-wsm 1395/udp # PC Workstation Manager software
+iclpv-wsm 1395/tcp # PC Workstation Manager software
# A.P. Hobson <A.P.Hobson@bra0112.wins.icl.co.uk>
-dvl-activemail 1396/udp # DVL Active Mail
-dvl-activemail 1396/tcp # DVL Active Mail
-audio-activmail 1397/udp # Audio Active Mail
-audio-activmail 1397/tcp # Audio Active Mail
-video-activmail 1398/udp # Video Active Mail
-video-activmail 1398/tcp # Video Active Mail
+dvl-activemail 1396/udp # DVL Active Mail
+dvl-activemail 1396/tcp # DVL Active Mail
+audio-activmail 1397/udp # Audio Active Mail
+audio-activmail 1397/tcp # Audio Active Mail
+video-activmail 1398/udp # Video Active Mail
+video-activmail 1398/tcp # Video Active Mail
# Avshalom Houri <Avshalom@ubique.com>
-cadkey-licman 1399/udp # Cadkey License Manager
-cadkey-licman 1399/tcp # Cadkey License Manager
-cadkey-tablet 1400/udp # Cadkey Tablet Daemon
-cadkey-tablet 1400/tcp # Cadkey Tablet Daemon
+cadkey-licman 1399/udp # Cadkey License Manager
+cadkey-licman 1399/tcp # Cadkey License Manager
+cadkey-tablet 1400/udp # Cadkey Tablet Daemon
+cadkey-tablet 1400/tcp # Cadkey Tablet Daemon
# Joe McCollough <joe@cadkey.com>
goldleaf-licman 1401/udp # Goldleaf License Manager
goldleaf-licman 1401/tcp # Goldleaf License Manager
@@ -2902,82 +2902,82 @@ ibm-res 1405/udp # IBM Remote Execution Starter
ibm-res 1405/tcp # IBM Remote Execution Starter
netlabs-lm 1406/udp # NetLabs License Manager
netlabs-lm 1406/tcp # NetLabs License Manager
-dbsa-lm 1407/udp # DBSA License Manager
-dbsa-lm 1407/tcp # DBSA License Manager
+dbsa-lm 1407/udp # DBSA License Manager
+dbsa-lm 1407/tcp # DBSA License Manager
# Scott Shattuck <ss@dbsa.com>
-sophia-lm 1408/udp # Sophia License Manager
-sophia-lm 1408/tcp # Sophia License Manager
+sophia-lm 1408/udp # Sophia License Manager
+sophia-lm 1408/tcp # Sophia License Manager
# Eric Brown <sst!emerald!eric@uunet.UU.net>
-here-lm 1409/udp # Here License Manager
-here-lm 1409/tcp # Here License Manager
+here-lm 1409/udp # Here License Manager
+here-lm 1409/tcp # Here License Manager
# David Ison <here@dialup.oar.net>
-hiq 1410/udp # HiQ License Manager
-hiq 1410/tcp # HiQ License Manager
+hiq 1410/udp # HiQ License Manager
+hiq 1410/tcp # HiQ License Manager
# Rick Pugh <rick@bilmillennium.com>
-af 1411/udp # AudioFile
-af 1411/tcp # AudioFile
+af 1411/udp # AudioFile
+af 1411/tcp # AudioFile
# Jim Gettys <jg@crl.dec.com>
-innosys 1412/udp # InnoSys
-innosys 1412/tcp # InnoSys
-innosys-acl 1413/udp # Innosys-ACL
-innosys-acl 1413/tcp # Innosys-ACL
+innosys 1412/udp # InnoSys
+innosys 1412/tcp # InnoSys
+innosys-acl 1413/udp # Innosys-ACL
+innosys-acl 1413/tcp # Innosys-ACL
# Eric Welch <--none--->
-ibm-mqseries 1414/udp # IBM MQSeries
-ibm-mqseries 1414/tcp # IBM MQSeries
+ibm-mqseries 1414/udp # IBM MQSeries
+ibm-mqseries 1414/tcp # IBM MQSeries
# Roger Meli <rmmeli%winvmd@vnet.ibm.com>
-dbstar 1415/udp # DBStar
-dbstar 1415/tcp # DBStar
+dbstar 1415/udp # DBStar
+dbstar 1415/tcp # DBStar
# Jeffrey Millman <jcm@dbstar.com>
-novell-lu6.2 1416/udp # Novell LU6.2
-novell-lu6.2 1416/tcp # Novell LU6.2
+novell-lu6.2 1416/udp # Novell LU6.2
+novell-lu6.2 1416/tcp # Novell LU6.2
# Peter Liu <--none--->
-timbuktu-srv1 1417/udp # Timbuktu Service 1 Port
-timbuktu-srv1 1417/tcp # Timbuktu Service 1 Port
-timbuktu-srv2 1418/udp # Timbuktu Service 2 Port
-timbuktu-srv2 1418/tcp # Timbuktu Service 2 Port
-timbuktu-srv3 1419/udp # Timbuktu Service 3 Port
-timbuktu-srv3 1419/tcp # Timbuktu Service 3 Port
-timbuktu-srv4 1420/udp # Timbuktu Service 4 Port
-timbuktu-srv4 1420/tcp # Timbuktu Service 4 Port
+timbuktu-srv1 1417/udp # Timbuktu Service 1 Port
+timbuktu-srv1 1417/tcp # Timbuktu Service 1 Port
+timbuktu-srv2 1418/udp # Timbuktu Service 2 Port
+timbuktu-srv2 1418/tcp # Timbuktu Service 2 Port
+timbuktu-srv3 1419/udp # Timbuktu Service 3 Port
+timbuktu-srv3 1419/tcp # Timbuktu Service 3 Port
+timbuktu-srv4 1420/udp # Timbuktu Service 4 Port
+timbuktu-srv4 1420/tcp # Timbuktu Service 4 Port
# Marc Epard <marc@netopia.com>
gandalf-lm 1421/udp # Gandalf License Manager
gandalf-lm 1421/tcp # Gandalf License Manager
# gilmer@gandalf.ca
-autodesk-lm 1422/udp # Autodesk License Manager
-autodesk-lm 1422/tcp # Autodesk License Manager
+autodesk-lm 1422/udp # Autodesk License Manager
+autodesk-lm 1422/tcp # Autodesk License Manager
# David Ko <dko@autodesk.com>
-essbase 1423/udp # Essbase Arbor Software
-essbase 1423/tcp # Essbase Arbor Software
-hybrid 1424/udp # Hybrid Encryption Protocol
-hybrid 1424/tcp # Hybrid Encryption Protocol
+essbase 1423/udp # Essbase Arbor Software
+essbase 1423/tcp # Essbase Arbor Software
+hybrid 1424/udp # Hybrid Encryption Protocol
+hybrid 1424/tcp # Hybrid Encryption Protocol
# Howard Hart <hch@hybrid.com>
-zion-lm 1425/udp # Zion Software License Manager
-zion-lm 1425/tcp # Zion Software License Manager
+zion-lm 1425/udp # Zion Software License Manager
+zion-lm 1425/tcp # Zion Software License Manager
# David Ferrero <david@zion.com>
sais 1426/udp # Satellite-data Acquisition System 1
sais 1426/tcp # Satellite-data Acquisition System 1
# Bill Taylor <sais@ssec.wisc.edu>
-mloadd 1427/udp # mloadd monitoring tool
-mloadd 1427/tcp # mloadd monitoring tool
+mloadd 1427/udp # mloadd monitoring tool
+mloadd 1427/tcp # mloadd monitoring tool
# Bob Braden <braden@isi.edu>
informatik-lm 1428/udp # Informatik License Manager
informatik-lm 1428/tcp # Informatik License Manager
# Harald Schlangmann
-# <schlangm@informatik.uni-muenchen.de>
-nms 1429/udp # Hypercom NMS
-nms 1429/tcp # Hypercom NMS
-tpdu 1430/udp # Hypercom TPDU
-tpdu 1430/tcp # Hypercom TPDU
+# <schlangm@informatik.uni-muenchen.de>
+nms 1429/udp # Hypercom NMS
+nms 1429/tcp # Hypercom NMS
+tpdu 1430/udp # Hypercom TPDU
+tpdu 1430/tcp # Hypercom TPDU
# Noor Chowdhury <noor@hypercom.com>
rgtp 1431/udp # Reverse Gossip Transport
rgtp 1431/tcp # Reverse Gossip Transport
# Ian Jackson <iwj@cam-orl.co.uk>
-blueberry-lm 1432/udp # Blueberry Software License Manager
-blueberry-lm 1432/tcp # Blueberry Software License Manager
+blueberry-lm 1432/udp # Blueberry Software License Manager
+blueberry-lm 1432/tcp # Blueberry Software License Manager
# Steve Beigel <ublueb!steve@uunet.uu.net>
-ms-sql-s 1433/udp # Microsoft-SQL-Server
-ms-sql-s 1433/tcp # Microsoft-SQL-Server
-ms-sql-m 1434/udp # Microsoft-SQL-Monitor
+ms-sql-s 1433/udp # Microsoft-SQL-Server
+ms-sql-s 1433/tcp # Microsoft-SQL-Server
+ms-sql-m 1434/udp # Microsoft-SQL-Monitor
ms-sql-m 1434/tcp # Microsoft-SQL-Monitor
# Peter Hussey <peterhus@microsoft.com>
ibm-cics 1435/udp # IBM CICS
@@ -2989,27 +2989,27 @@ saism 1436/tcp # Satellite-data Acquisition System 2
tabula 1437/udp # Tabula
tabula 1437/tcp # Tabula
# Marcelo Einhorn
-# <KGUNE%HUJIVM1.bitnet@taunivm.tau.ac.il>
-eicon-server 1438/udp # Eicon Security Agent/Server
-eicon-server 1438/tcp # Eicon Security Agent/Server
-eicon-x25 1439/udp # Eicon X25/SNA Gateway
-eicon-x25 1439/tcp # Eicon X25/SNA Gateway
-eicon-slp 1440/udp # Eicon Service Location Protocol
-eicon-slp 1440/tcp # Eicon Service Location Protocol
+# <KGUNE%HUJIVM1.bitnet@taunivm.tau.ac.il>
+eicon-server 1438/udp # Eicon Security Agent/Server
+eicon-server 1438/tcp # Eicon Security Agent/Server
+eicon-x25 1439/udp # Eicon X25/SNA Gateway
+eicon-x25 1439/tcp # Eicon X25/SNA Gateway
+eicon-slp 1440/udp # Eicon Service Location Protocol
+eicon-slp 1440/tcp # Eicon Service Location Protocol
# Pat Calhoun <CALHOUN@admin.eicon.qc.ca>
-cadis-1 1441/udp # Cadis License Management
-cadis-1 1441/tcp # Cadis License Management
-cadis-2 1442/udp # Cadis License Management
-cadis-2 1442/tcp # Cadis License Management
+cadis-1 1441/udp # Cadis License Management
+cadis-1 1441/tcp # Cadis License Management
+cadis-2 1442/udp # Cadis License Management
+cadis-2 1442/tcp # Cadis License Management
# Todd Wichers <twichers@csn.org>
-ies-lm 1443/udp # Integrated Engineering Software
-ies-lm 1443/tcp # Integrated Engineering Software
+ies-lm 1443/udp # Integrated Engineering Software
+ies-lm 1443/tcp # Integrated Engineering Software
# David Tong <David_Tong@integrated.mb.ca>
-marcam-lm 1444/udp # Marcam License Management
-marcam-lm 1444/tcp # Marcam License Management
+marcam-lm 1444/udp # Marcam License Management
+marcam-lm 1444/tcp # Marcam License Management
# Therese Hunt <hunt@marcam.com>
-proxima-lm 1445/udp # Proxima License Manager
-proxima-lm 1445/tcp # Proxima License Manager
+proxima-lm 1445/udp # Proxima License Manager
+proxima-lm 1445/tcp # Proxima License Manager
ora-lm 1446/udp # Optical Research Associates License Manager
ora-lm 1446/tcp # Optical Research Associates License Manager
apri-lm 1447/udp # Applied Parallel Research LM
@@ -3018,29 +3018,29 @@ apri-lm 1447/tcp # Applied Parallel Research LM
oc-lm 1448/udp # OpenConnect License Manager
oc-lm 1448/tcp # OpenConnect License Manager
# Sue Barnhill <snb@oc.com>
-peport 1449/udp # PEport
-peport 1449/tcp # PEport
+peport 1449/udp # PEport
+peport 1449/tcp # PEport
# Qentin Neill <quentin@ColumbiaSC.NCR.COM>
-dwf 1450/udp # Tandem Distributed Workbench Facility
-dwf 1450/tcp # Tandem Distributed Workbench Facility
+dwf 1450/udp # Tandem Distributed Workbench Facility
+dwf 1450/tcp # Tandem Distributed Workbench Facility
# Mike Bert <BERG_MIKE@tandem.com>
infoman 1451/udp # IBM Information Management
infoman 1451/tcp # IBM Information Management
# Karen Burns <---none--->
-gtegsc-lm 1452/udp # GTE Government Systems License Man
-gtegsc-lm 1452/tcp # GTE Government Systems License Man
+gtegsc-lm 1452/udp # GTE Government Systems License Man
+gtegsc-lm 1452/tcp # GTE Government Systems License Man
# Mike Gregory <Gregory_Mike@msmail.iipo.gtegsc.com>
-genie-lm 1453/udp # Genie License Manager
-genie-lm 1453/tcp # Genie License Manager
+genie-lm 1453/udp # Genie License Manager
+genie-lm 1453/tcp # Genie License Manager
# Paul Applegate <p.applegate2@genie.geis.com>
-interhdl_elmd 1454/udp # interHDL License Manager
-interhdl_elmd 1454/tcp # interHDL License Manager
+interhdl_elmd 1454/udp # interHDL License Manager
+interhdl_elmd 1454/tcp # interHDL License Manager
# Eli Sternheim eli@interhdl.com
-esl-lm 1455/udp # ESL License Manager
-esl-lm 1455/tcp # ESL License Manager
+esl-lm 1455/udp # ESL License Manager
+esl-lm 1455/tcp # ESL License Manager
# Abel Chou <abel@willy.esl.com>
-dca 1456/udp # DCA
-dca 1456/tcp # DCA
+dca 1456/udp # DCA
+dca 1456/tcp # DCA
# Jeff Garbers <jgarbers@netcom.com>
valisys-lm 1457/udp # Valisys License Manager
valisys-lm 1457/tcp # Valisys License Manager
@@ -3053,8 +3053,8 @@ proshare1 1459/tcp # Proshare Notebook Application
proshare2 1460/udp # Proshare Notebook Application
proshare2 1460/tcp # Proshare Notebook Application
# Robin Kar <Robin_Kar@ccm.hf.intel.com>
-ibm_wrless_lan 1461/udp # IBM Wireless LAN
-ibm_wrless_lan 1461/tcp # IBM Wireless LAN
+ibm_wrless_lan 1461/udp # IBM Wireless LAN
+ibm_wrless_lan 1461/tcp # IBM Wireless LAN
# <flanne@vnet.IBM.COM>
world-lm 1462/udp # World License Manager
world-lm 1462/tcp # World License Manager
@@ -3066,94 +3066,94 @@ msl_lmd 1464/udp # MSL License Manager
msl_lmd 1464/tcp # MSL License Manager
# Matt Timmermans
pipes 1465/udp # Pipes Platform mfarlin@peerlogic.com
-pipes 1465/tcp # Pipes Platform
+pipes 1465/tcp # Pipes Platform
# Mark Farlin <mfarlin@peerlogic.com>
oceansoft-lm 1466/udp # Ocean Software License Manager
oceansoft-lm 1466/tcp # Ocean Software License Manager
# Randy Leonard <randy@oceansoft.com>
-csdmbase 1467/udp # CSDMBASE
-csdmbase 1467/tcp # CSDMBASE
-csdm 1468/udp # CSDM
-csdm 1468/tcp # CSDM
+csdmbase 1467/udp # CSDMBASE
+csdmbase 1467/tcp # CSDMBASE
+csdm 1468/udp # CSDM
+csdm 1468/tcp # CSDM
# Robert Stabl <stabl@informatik.uni-muenchen.de>
aal-lm 1469/udp # Active Analysis Limited License Manager
aal-lm 1469/tcp # Active Analysis Limited License Manager
# David Snocken +44 (71)437-7009
-uaiact 1470/udp # Universal Analytics
-uaiact 1470/tcp # Universal Analytics
+uaiact 1470/udp # Universal Analytics
+uaiact 1470/tcp # Universal Analytics
# Mark R. Ludwig <Mark-Ludwig@uai.com>
-csdmbase 1471/udp # csdmbase
-csdmbase 1471/tcp # csdmbase
-csdm 1472/udp # csdm
-csdm 1472/tcp # csdm
+csdmbase 1471/udp # csdmbase
+csdmbase 1471/tcp # csdmbase
+csdm 1472/udp # csdm
+csdm 1472/tcp # csdm
# Robert Stabl <stabl@informatik.uni-muenchen.de>
-openmath 1473/udp # OpenMath
-openmath 1473/tcp # OpenMath
+openmath 1473/udp # OpenMath
+openmath 1473/tcp # OpenMath
# Garth Mayville <mayville@maplesoft.on.ca>
-telefinder 1474/udp # Telefinder
-telefinder 1474/tcp # Telefinder
+telefinder 1474/udp # Telefinder
+telefinder 1474/tcp # Telefinder
# Jim White <Jim_White@spiderisland.com>
-taligent-lm 1475/udp # Taligent License Manager
-taligent-lm 1475/tcp # Taligent License Manager
+taligent-lm 1475/udp # Taligent License Manager
+taligent-lm 1475/tcp # Taligent License Manager
# Mark Sapsford <Mark_Sapsford@@taligent.com>
-clvm-cfg 1476/udp # clvm-cfg
-clvm-cfg 1476/tcp # clvm-cfg
+clvm-cfg 1476/udp # clvm-cfg
+clvm-cfg 1476/tcp # clvm-cfg
# Eric Soderberg <seric@cup.hp.com>
-ms-sna-server 1477/udp # ms-sna-server
-ms-sna-server 1477/tcp # ms-sna-server
-ms-sna-base 1478/udp # ms-sna-base
-ms-sna-base 1478/tcp # ms-sna-base
+ms-sna-server 1477/udp # ms-sna-server
+ms-sna-server 1477/tcp # ms-sna-server
+ms-sna-base 1478/udp # ms-sna-base
+ms-sna-base 1478/tcp # ms-sna-base
# Gordon Mangione <gordm@microsoft.com>
-dberegister 1479/udp # dberegister
-dberegister 1479/tcp # dberegister
+dberegister 1479/udp # dberegister
+dberegister 1479/tcp # dberegister
# Brian Griswold <brian@dancingbear.com>
-pacerforum 1480/udp # PacerForum
-pacerforum 1480/tcp # PacerForum
+pacerforum 1480/udp # PacerForum
+pacerforum 1480/tcp # PacerForum
# Peter Caswell <pfc@pacvax.pacersoft.com>
-airs 1481/udp # AIRS
-airs 1481/tcp # AIRS
+airs 1481/udp # AIRS
+airs 1481/tcp # AIRS
# Bruce Wilson, 905-771-6161
miteksys-lm 1482/udp # Miteksys License Manager
miteksys-lm 1482/tcp # Miteksys License Manager
# Shane McRoberts <mcroberts@miteksys.com>
-afs 1483/udp # AFS License Manager
-afs 1483/tcp # AFS License Manager
+afs 1483/udp # AFS License Manager
+afs 1483/tcp # AFS License Manager
# Michael R. Pizolato <michael@afs.com>
-confluent 1484/udp # Confluent License Manager
-confluent 1484/tcp # Confluent License Manager
+confluent 1484/udp # Confluent License Manager
+confluent 1484/tcp # Confluent License Manager
# James Greenfiel <jim@pa.confluent.com>
-lansource 1485/udp # LANSource
-lansource 1485/tcp # LANSource
+lansource 1485/udp # LANSource
+lansource 1485/tcp # LANSource
# Christopher Wells <Christopher_Wells@3com.com>
-nms_topo_serv 1486/udp # nms_topo_serv
-nms_topo_serv 1486/tcp # nms_topo_serv
+nms_topo_serv 1486/udp # nms_topo_serv
+nms_topo_serv 1486/tcp # nms_topo_serv
# Sylvia Siu <Sylvia_Siu@Novell.CO>
-localinfosrvr 1487/udp # LocalInfoSrvr
-localinfosrvr 1487/tcp # LocalInfoSrvr
+localinfosrvr 1487/udp # LocalInfoSrvr
+localinfosrvr 1487/tcp # LocalInfoSrvr
# Brian Matthews <brian_matthews@ibist.ibis.com>
-docstor 1488/udp # DocStor
-docstor 1488/tcp # DocStor
+docstor 1488/udp # DocStor
+docstor 1488/tcp # DocStor
# Brian Spears <bspears@salix.com>
-dmdocbroker 1489/udp # dmdocbroker
-dmdocbroker 1489/tcp # dmdocbroker
+dmdocbroker 1489/udp # dmdocbroker
+dmdocbroker 1489/tcp # dmdocbroker
# Razmik Abnous <abnous@documentum.com>
-insitu-conf 1490/udp # insitu-conf
-insitu-conf 1490/tcp # insitu-conf
+insitu-conf 1490/udp # insitu-conf
+insitu-conf 1490/tcp # insitu-conf
# Paul Blacknell <paul@insitu.com>
-anynetgateway 1491/udp # anynetgateway
-anynetgateway 1491/tcp # anynetgateway
+anynetgateway 1491/udp # anynetgateway
+anynetgateway 1491/tcp # anynetgateway
# Dan Poirier <poirier@VNET.IBM.COM>
-stone-design-1 1492/udp # stone-design-1
-stone-design-1 1492/tcp # stone-design-1
+stone-design-1 1492/udp # stone-design-1
+stone-design-1 1492/tcp # stone-design-1
# Andrew Stone <andrew@stone.com>
-netmap_lm 1493/udp # netmap_lm
-netmap_lm 1493/tcp # netmap_lm
+netmap_lm 1493/udp # netmap_lm
+netmap_lm 1493/tcp # netmap_lm
# Phillip Magson <philm@extro.ucc.su.OZ.AU>
-ica 1494/udp # ica
-ica 1494/tcp # ica
+ica 1494/udp # ica
+ica 1494/tcp # ica
# John Richardson, Citrix Systems
-cvc 1495/udp # cvc
-cvc 1495/tcp # cvc
+cvc 1495/udp # cvc
+cvc 1495/tcp # cvc
# Bill Davidson <billd@equalizer.cray.com>
liberty-lm 1496/udp # liberty-lm
liberty-lm 1496/tcp # liberty-lm
@@ -3170,8 +3170,8 @@ fhc 1499/tcp # Federico Heinz Consultora
vlsi-lm 1500/udp # VLSI License Manager
vlsi-lm 1500/tcp # VLSI License Manager
# Shue-Lin Kuo <shuelin@mdk.sanjose.vlsi.com>
-saiscm 1501/udp # Satellite-data Acquisition System 3
-saiscm 1501/tcp # Satellite-data Acquisition System 3
+saiscm 1501/udp # Satellite-data Acquisition System 3
+saiscm 1501/tcp # Satellite-data Acquisition System 3
# Bill Taylor <sais@ssec.wisc.edu>
shivadiscovery 1502/udp # Shiva
shivadiscovery 1502/tcp # Shiva
@@ -3239,8 +3239,8 @@ 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
-pdap-np 1526/tcp # Prospero Data Access Prot non-priv
+pdap-np 1526/udp # Prospero Data Access Prot non-priv
+pdap-np 1526/tcp # Prospero Data Access Prot non-priv
# B. Clifford Neuman <bcn@isi.edu>
tlisrv 1527/udp # oracle
tlisrv 1527/tcp # oracle
@@ -3259,12 +3259,12 @@ miroconnect 1532/tcp # miroconnect
# Michael Fischer +49 531 21 13 0
virtual-places 1533/udp # Virtual Places Software
virtual-places 1533/tcp # Virtual Places Software
-# Avshalom Houri <Avshalom@ubique.com>
-micromuse-lm 1534/udp # micromuse-lm
-micromuse-lm 1534/tcp # micromuse-lm
+# Avshalom Houri <Avshalom@ubique.com>
+micromuse-lm 1534/udp # micromuse-lm
+micromuse-lm 1534/tcp # micromuse-lm
# Adam Kerrison <adam@micromuse.co.uk>
-ampr-info 1535/udp # ampr-info
-ampr-info 1535/tcp # ampr-info
+ampr-info 1535/udp # ampr-info
+ampr-info 1535/tcp # ampr-info
ampr-inter 1536/udp # ampr-inter
ampr-inter 1536/tcp # ampr-inter
# Rob Janssen <rob@sys3.pe1chl.ampr.org>
@@ -3293,7 +3293,7 @@ aspeclmd 1544/tcp # aspeclmd
# V. Balaji <balaji@aspec.com>
vistium-share 1545/udp # vistium-share
vistium-share 1545/tcp # vistium-share
-# Allison Carleton
+# Allison Carleton
# <acarleto@naper1.napervilleil.ncr.com>
abbaccuray 1546/udp # abbaccuray
abbaccuray 1546/tcp # abbaccuray
@@ -3366,7 +3366,7 @@ tsspmap 1568/tcp # tsspmap
# Paul W. Nelson <nelson@thursby.com>
ets 1569/udp # ets
ets 1569/tcp # ets
-# Carstein Seeberg <case@boole.no>
+# Carstein Seeberg <case@boole.no>
orbixd 1570/udp # orbixd
orbixd 1570/tcp # orbixd
# Bridget Walsh <bwalsh@iona.ie>
@@ -3421,8 +3421,8 @@ ibm-abtact 1586/tcp # ibm-abtact
pra_elmd 1587/udp # pra_elmd
pra_elmd 1587/tcp # pra_elmd
# Dennis Mastin <dennis@tasmania.platte.com>
-triquest-lm 1588/udp # triquest-lm
-triquest-lm 1588/tcp # triquest-lm
+triquest-lm 1588/udp # triquest-lm
+triquest-lm 1588/tcp # triquest-lm
# Nand Kumar <nkumar@triquest-da.com>
vqp 1589/udp # VQP
vqp 1589/tcp # VQP
@@ -3469,12 +3469,12 @@ picodbc 1603/tcp # pickodbc
# John Lombardo <johnl@picksys.com>
icabrowser 1604/udp # icabrowser
icabrowser 1604/tcp # icabrowser
-# Brad Pedersen <bradp@citrix.com>
+# Brad Pedersen <bradp@citrix.com>
slp 1605/udp # Salutation Manager (Salutation Protocol)
slp 1605/tcp # Salutation Manager (Salutation Protocol)
slm-api 1606/udp # Salutation Manager (SLM-API)
slm-api 1606/tcp # Salutation Manager (SLM-API)
-# Tohru Mori <tmori@VNET.IBM.COM>
+# Tohru Mori <tmori@VNET.IBM.COM>
stt 1607/udp # stt
stt 1607/tcp # stt
# Ryan Bolz <ryanbo@microsoft.com>
@@ -3578,20 +3578,20 @@ isis-ambc 1643/tcp # isis-ambc
# Ken Chapman <kchapman@isis.com>
saiseh 1644/tcp # Satellite-data Acquisition System 4
# Bill Taylor <sais@ssec.wisc.edu>
-sightline 1645/udp # SightLine
-sightline 1645/tcp # SightLine
+sightline 1645/udp # SightLine
+sightline 1645/tcp # SightLine
# Stuart J. Newman <stuart.newman@fortel.com>
sa-msg-port 1646/udp # sa-msg-port
sa-msg-port 1646/tcp # sa-msg-port
# Eric Whitehill <eawhiteh@itt.com>
rsap 1647/udp # rsap
rsap 1647/tcp # rsap
-# Holger Reif
-# <Holger.Reif@prakinf.tu-ilmenau.de>
+# Holger Reif
+# <Holger.Reif@prakinf.tu-ilmenau.de>
concurrent-lm 1648/udp # concurrent-lm
concurrent-lm 1648/tcp # concurrent-lm
# Maggie Brinsford <mjb@concurrent.co.uk>
-kermit 1649/udp # kermit
+kermit 1649/udp # kermit
kermit 1649/tcp # kermit
# Frank da Cruz <fdc@watsun.cc.columbia.edu>
nkd 1650/udp # nkd
@@ -3650,7 +3650,7 @@ netview-aix-11 1671/udp # netview-aix-11
netview-aix-11 1671/tcp # netview-aix-11
netview-aix-12 1672/udp # netview-aix-12
netview-aix-12 1672/tcp # netview-aix-12
-# Martha Crisson
+# Martha Crisson
# <CRISSON@ralvm12.vnet.ibm.com>
proshare-mc-1 1673/udp # Intel Proshare Multicast
proshare-mc-1 1673/tcp # Intel Proshare Multicast
@@ -3674,7 +3674,7 @@ darcorp-lm 1679/tcp # darcorp-lm
# <DARcorp@aol.com>
microcom-sbp 1680/udp # microcom-sbp
microcom-sbp 1680/tcp # microcom-sbp
-# Boris B. Maiden <Boris_Maiden@smtp.microcom.com>
+# Boris B. Maiden <Boris_Maiden@smtp.microcom.com>
sd-elmd 1681/udp # sd-elmd
sd-elmd 1681/tcp # sd-elmd
# Bryan Otey <bwo@softdesk.com>
@@ -3781,8 +3781,8 @@ fj-hdnet 1717/tcp # fj-hdnet
# Manabu Makino <m-makino@ael.fujitsu.co.jp>
h323gatedisc 1718/udp # h323gatedisc
h323gatedisc 1718/tcp # h323gatedisc
-h323gatestat 1719/udp # h323gatestat
-h323gatestat 1719/tcp # h323gatestat
+h323gatestat 1719/udp # h323gatestat
+h323gatestat 1719/tcp # h323gatestat
h323hostcall 1720/udp # h323hostcall
h323hostcall 1720/tcp # h323hostcall
# Jim Toga <jtoga@ibeam.jf.intel.com>
@@ -3875,13 +3875,13 @@ aspen-services 1749/tcp # aspen-services
sslp 1750/udp # Simple Socket Library's PortMaster
sslp 1750/tcp # Simple Socket Library's PortMaster
# Dr. Charles E. Campbell Jr.
-# <cec@gryphon.gsfc.nasa.gov>
+# <cec@gryphon.gsfc.nasa.gov>
swiftnet 1751/udp # SwiftNet
swiftnet 1751/tcp # SwiftNet
# Terry Lim <tkl@pentek.com>
-lofr-lm 1752/udp # Leap of Faith Research License Manager
-lofr-lm 1752/tcp # Leap of Faith Research License Manager
-#
+lofr-lm 1752/udp # Leap of Faith Research License Manager
+lofr-lm 1752/tcp # Leap of Faith Research License Manager
+#
translogic-lm 1753/udp # Translogic License Manager
translogic-lm 1753/tcp # Translogic License Manager
# Stan Dallas <stan@translogic.com>
@@ -3957,14 +3957,14 @@ pharmasoft 1779/tcp # pharmasoft
dpkeyserv 1780/udp # dpkeyserv
dpkeyserv 1780/tcp # dpkeyserv
# Yasunari Gon Yamasita <yamasita@omronsoft.co.jp>
-answersoft-lm 1781/udp # answersoft-lm
+answersoft-lm 1781/udp # answersoft-lm
answersoft-lm 1781/tcp # answersoft-lm
# James A. Brewster <jimbrew@answersoft.com>
hp-hcip 1782/udp # hp-hcip
hp-hcip 1782/tcp # hp-hcip
# Allen Baker <abaker@boi.hp.com>
-# 1783 Decomissioned Port 04/14/00, ms
-# <naonao@kikaku.mmp.fujitsu.co.jp>
+# 1783 Decomissioned Port 04/14/00, ms
+# <naonao@kikaku.mmp.fujitsu.co.jp>
finle-lm 1784/udp # Finle License Manager
finle-lm 1784/tcp # Finle License Manager
# Dongling Wang <dongling@finle.com>
@@ -3982,7 +3982,7 @@ psmond 1788/tcp # psmond
# Will Golson <golson@fc.hp.com>
hello 1789/udp # hello
hello 1789/tcp # hello
-# D. J. Bernstein <djb@koobera.math.uic.edu>
+# D. J. Bernstein <djb@koobera.math.uic.edu>
nmsp 1790/udp # Narrative Media Streaming Protocol
nmsp 1790/tcp # Narrative Media Streaming Protocol
# Paul Santinelli, Jr. <psantinelli@narrative.com>
@@ -4005,7 +4005,7 @@ vocaltec-admin 1796/udp # Vocaltec Server Administration
vocaltec-admin 1796/tcp # Vocaltec Server Administration
# Scott Petrack <Scott_Petrack@vocaltec.com>
uma 1797/udp # UMA
-uma 1797/tcp # UMA
+uma 1797/tcp # UMA
# Martin Kirk <m.kirk@opengroup.org>
etp 1798/udp # Event Transfer Protocol
etp 1798/tcp # Event Transfer Protocol
@@ -4152,13 +4152,13 @@ tunstall-pnc 1846/tcp # Tunstall PNC
# Robert M. Moore <r_moore@tunstall.co.uk>
slp-notify 1847/udp # SLP Notification
slp-notify 1847/tcp # SLP Notification
-# James Kempf <james.kempf@sun.com>
+# James Kempf <james.kempf@sun.com>
fjdocdist 1848/udp # fjdocdist
fjdocdist 1848/tcp # fjdocdist
# Yuichi Ohiwa <y-ohiwa@ael.fujitsu.co.jp>
alpha-sms 1849/udp # ALPHA-SMS
alpha-sms 1849/tcp # ALPHA-SMS
-# Benjamin Grimm <bg@webnetix.de>
+# Benjamin Grimm <bg@webnetix.de>
gsi 1850/udp # GSI
gsi 1850/tcp # GSI
# William Mullaney <mullanwi@usa.net>
@@ -4173,21 +4173,21 @@ vids-avtp 1853/tcp # VIDS-AVTP
# Sascha Kuemmel <kuemmel@vidsoft.de>
buddy-draw 1854/udp # Buddy Draw
buddy-draw 1854/tcp # Buddy Draw
-# Marvin Shin <president@medialingo.com>
+# Marvin Shin <president@medialingo.com>
fiorano-rtrsvc 1855/udp # Fiorano RtrSvc
fiorano-rtrsvc 1855/tcp # Fiorano RtrSvc
fiorano-msgsvc 1856/udp # Fiorano MsgSvc
fiorano-msgsvc 1856/tcp # Fiorano MsgSvc
-# Albert Holt <alberth@fiorano.com>
+# Albert Holt <alberth@fiorano.com>
datacaptor 1857/udp # DataCaptor
datacaptor 1857/tcp # DataCaptor
# Steven M. Forrester <StevenF@CapsuleTech.com>
privateark 1858/udp # PrivateArk
privateark 1858/tcp # PrivateArk
-# Ronen Zoran <ronenz@cyber-ark.com>
+# Ronen Zoran <ronenz@cyber-ark.com>
gammafetchsvr 1859/udp # Gamma Fetcher Server
gammafetchsvr 1859/tcp # Gamma Fetcher Server
-# Cnaan Aviv <cnaan@gammasite.com>
+# Cnaan Aviv <cnaan@gammasite.com>
sunscalar-svc 1860/udp # SunSCALAR Services
sunscalar-svc 1860/tcp # SunSCALAR Services
# Sanjay Radia <srradia@kasumbi.Eng.Sun.COM>
@@ -4208,16 +4208,16 @@ 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>
+# Jun Yoshii <yoshii@ael.fujitsu.co.jp>
udrive 1867/udp # UDRIVE
udrive 1867/tcp # UDRIVE
# Robby Walker <webmaster@cd-lab.com>
viziblebrowser 1868/udp # VizibleBrowser
viziblebrowser 1868/tcp # VizibleBrowser
-# Jimmy Talbot <jtalbot@vizible.com>
+# Jimmy Talbot <jtalbot@vizible.com>
yestrader 1869/udp # YesTrader
yestrader 1869/tcp # YesTrader
-# Robert Bryan <bbryan@yestrader.com>
+# Robert Bryan <bbryan@yestrader.com>
sunscalar-dns 1870/udp # SunSCALAR DNS Service
sunscalar-dns 1870/tcp # SunSCALAR DNS Service
# Sanjay Radia <srradia@kasumbi.Eng.Sun.COM>
@@ -4248,7 +4248,7 @@ nettgain-nms 1879/tcp # NettGain NMS
# Dr. Yair Shapira <yair@flashnetworks.com>
vsat-control 1880/udp # Gilat VSAT Control
vsat-control 1880/tcp # Gilat VSAT Control
-# Yariv Kaplan <yarivk@gilat.com>
+# Yariv Kaplan <yarivk@gilat.com>
ibm-mqseries2 1881/udp # IBM WebSphere MQ
ibm-mqseries2 1881/tcp # IBM WebSphere MQ
# Richard Maxwell <richard_maxwell@uk.ibm.com>
@@ -4260,7 +4260,7 @@ ibm-mqisdp 1883/tcp # IBM MQSeries SCADA
# Andy Stanford-Clark <andysc@uk.ibm.com>
idmaps 1884/udp # Internet Distance Map Svc
idmaps 1884/tcp # Internet Distance Map Svc
-# Sugih Jamim <jamin@eecs.umich.edu>
+# Sugih Jamim <jamin@eecs.umich.edu>
vrtstrapserver 1885/udp # Veritas Trap Server
vrtstrapserver 1885/tcp # Veritas Trap Server
# Russell Thrasher <rthrashe@veritas.com>
@@ -4278,7 +4278,7 @@ unify-adapter 1889/tcp # Unify Web Adapter Service
# Duane Gibson <ianaportmaster@unify.com>
wilkenlistener 1890/udp # wilkenListener
wilkenlistener 1890/tcp # wilkenListener
-# Wilken GmbH <fy@wilken.de>
+# Wilken GmbH <fy@wilken.de>
childkey-notif 1891/udp # ChildKey Notification
childkey-notif 1891/tcp # ChildKey Notification
childkey-ctrl 1892/udp # ChildKey Control
@@ -4290,7 +4290,7 @@ elad 1893/tcp # ELAD Protocol
o2server-port 1894/udp # O2Server Port
o2server-port 1894/tcp # O2Server Port
# Tim Howard <timothygh@hotmail.com>
-##### Microsoft (unoffically) using 1895 #####
+##### Microsoft (unoffically) using 1895 #####
b-novative-ls 1896/udp # b-novative license server
b-novative-ls 1896/tcp # b-novative license server
# Matthias Riese <Matthias.Riese@b-novative.de>
@@ -4409,7 +4409,7 @@ xaapi 1934/tcp # IBM LM Appl Agent
# Helga Wolin <hwolin@us.ibm.com>
macromedia-fcs 1935/udp # Macromedia Flash Communications server MX
macromedia-fcs 1935/tcp # Macromedia Flash Communications Server MX
-# Pritham Shetty <pritham@macromedia.com>
+# Pritham Shetty <pritham@macromedia.com>
jetcmeserver 1936/udp # JetCmeServer Server Port
jetcmeserver 1936/tcp # JetCmeServer Server Port
jwserver 1937/udp # JetVWay Server Port
@@ -4423,7 +4423,7 @@ jvclient 1940/tcp # JetVision Client Port
# Stephen Tsun <stsun@jetstream.com>
dic-aida 1941/udp # DIC-Aida
dic-aida 1941/tcp # DIC-Aida
-# Frans S.C. Witte <fscwitte@dicgroep.nl>
+# Frans S.C. Witte <fscwitte@dicgroep.nl>
res 1942/udp # Real Enterprise Service
res 1942/tcp # Real Enterprise Service
# Bob Janssen <bob@res.nl>
@@ -4463,7 +4463,7 @@ abr-basic 1954/udp # ABR-Basic Data
abr-basic 1954/tcp # ABR-Basic Data
abr-secure 1955/udp # ABR-Secure Data
abr-secure 1955/tcp # ABR-Secure Data
-# Aero9 - Graham Wooden <graham@aero9.com>
+# Aero9 - Graham Wooden <graham@aero9.com>
vrtl-vmf-ds 1956/udp # Vertel VMF DS
vrtl-vmf-ds 1956/tcp # Vertel VMF DS
# Alan Akahoshi <alan-akahoshi@vertel.com>
@@ -4472,10 +4472,10 @@ unix-status 1957/tcp # unix-status
# Thomas Erskine <erskine@sourceworks.com>
dxadmind 1958/udp # CA Administration Daemon
dxadmind 1958/tcp # CA Administration Daemon
-# John Birrell <birjo99@cai.com>
+# John Birrell <birjo99@cai.com>
simp-all 1959/udp # SIMP Channel
simp-all 1959/tcp # SIMP Channel
-# Tim Hunnewell <thunnewell@pinna.com>
+# Tim Hunnewell <thunnewell@pinna.com>
nasmanager 1960/udp # Merit DAC NASmanager
nasmanager 1960/tcp # Merit DAC NASmanager
# Richard S. Conto <rsc@merit.edu>
@@ -4484,7 +4484,7 @@ 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>
+# Chuck Shotton <cshotton@biap.com>
webmachine 1963/udp # WebMachine
webmachine 1963/tcp # WebMachine
# Tim Jowers <Tim.Jowers@ColumbiaSC.NCR.com>
@@ -4504,7 +4504,7 @@ lipsinc 1968/udp # LIPSinc
lipsinc 1968/tcp # LIPSinc
lipsinc1 1969/udp # LIPSinc 1
lipsinc1 1969/tcp # LIPSinc 1
-# Robert Armington <rarmington@lipsinc.com>
+# Robert Armington <rarmington@lipsinc.com>
netop-rc 1970/udp # NetOp Remote Control
netop-rc 1970/tcp # NetOp Remote Control
netop-school 1971/udp # NetOp School
@@ -4646,9 +4646,9 @@ submitserver 2028/tcp #
# 2029 Unassigned
device2 2030/udp #
device2 2030/tcp #
-# 2031 Unassigned
-blackboard 2032/udp #
-blackboard 2032/tcp #
+# 2031 Unassigned
+blackboard 2032/udp #
+blackboard 2032/tcp #
glogger 2033/udp #
glogger 2033/tcp #
scoremgr 2034/udp #
@@ -4693,7 +4693,7 @@ epnsdp 2051/tcp # EPNSDP
# Hiroyasu Ogata <Ogata.Hiroyasu@exc.epson.co.jp>
clearvisn 2052/udp # clearVisn Services Port
clearvisn 2052/tcp # clearVisn Services Port
-# Dave Lyons <dlyons@dnpg.com>
+# Dave Lyons <dlyons@dnpg.com>
lot105-ds-upd 2053/udp # Lot105 DSuper Updates
lot105-ds-upd 2053/tcp # Lot105 DSuper Updates
# Piers Scannell <iana-form@lot105.com>
@@ -4708,10 +4708,10 @@ omnisky 2056/tcp # OmniSky Port
# Oren Hurvitz <oren@omnisky.com>
rich-cp 2057/udp # Rich Content Protocol
rich-cp 2057/tcp # Rich Content Protocol
-# Ronen Vainish <ronen@digitalfountain.com>
+# Ronen Vainish <ronen@digitalfountain.com>
newwavesearch 2058/udp # NewWaveSearchables RMI
newwavesearch 2058/tcp # NewWaveSearchables RMI
-# Thomas Kerkau <Thomas.Kerkau@io-software.com>
+# Thomas Kerkau <Thomas.Kerkau@io-software.com>
bmc-messaging 2059/udp # BMC Messaging Service
bmc-messaging 2059/tcp # BMC Messaging Service
# Roger Huebner <Roger_Huebner@bmc.com>
@@ -4727,14 +4727,14 @@ icg-bridge 2063/udp # ICG Bridge Port
icg-bridge 2063/tcp # ICG Bridge Port
icg-iprelay 2064/udp # ICG IP Relay Port
icg-iprelay 2064/tcp # ICG IP Relay Port
-# Steve Quintana <steve@icgresearch.com>
+# Steve Quintana <steve@icgresearch.com>
dlsrpn 2065/udp # Data Link Switch Read Port Number
dlsrpn 2065/tcp # Data Link Switch Read Port Number
# Amir Peless <amirp@radware.co.il>
-# 2066 Unassigned
+# 2066 Unassigned
dlswpn 2067/udp # Data Link Switch Write Port Number
dlswpn 2067/tcp # Data Link Switch Write Port Number
-# Amir Peless <amirp@radware.co.il>
+# Amir Peless <amirp@radware.co.il>
avauthsrvprtcl 2068/udp # Avocent AuthSrv Protocol
avauthsrvprtcl 2068/tcp # Avocent AuthSrv Protocol
# Steven W. Clark <sclark@equinox.com>
@@ -4743,7 +4743,7 @@ event-port 2069/tcp # HTTP Event Port
# Larry Emlich <larry.emlich@compaq.com>
ah-esp-encap 2070/udp # AH and ESP Encapsulated in UDP packet
ah-esp-encap 2070/tcp # AH and ESP Encapsulated in UDP packet
-# Amy Weaver <aweaver@vpnet.com>
+# Amy Weaver <aweaver@vpnet.com>
acp-port 2071/udp # Axon Control Protocol
acp-port 2071/tcp # Axon Control Protocol
# Christiaan Simons <christiaan.simons@axon.nl>
@@ -4771,7 +4771,7 @@ idware-router 2079/tcp # IDWARE Router Port
# Zdenek Kolba <zdenek.kolba@id-karta.cz>
autodesk-nlm 2080/udp # Autodesk NLM (FLEXlm)
autodesk-nlm 2080/tcp # Autodesk NLM (FLEXlm)
-# Greg Suppes <greg.suppes@autodesk.com>
+# Greg Suppes <greg.suppes@autodesk.com>
kme-trap-port 2081/udp # KME PRINTER TRAP PORT
kme-trap-port 2081/tcp # KME PRINTER TRAP PORT
# Masakatsu Matsuo <masa@sdsft.kme.mei.co.jp>
@@ -4784,10 +4784,10 @@ gnunet 2086/tcp # GNUnet
# Christian Grothoff <grothoff@cs.purdue.edu> October 2002
eli 2087/udp # ELI - Event Logging Integration
eli 2087/tcp # ELI - Event Logging Integration
-# Maya Zimerman <mayaz@radware.co.il>
-# 2088 Unassigned
-sep 2089/udp # Security Encapsulation Protocol - SEP
-sep 2089/tcp # Security Encapsulation Protocol - SEP
+# Maya Zimerman <mayaz@radware.co.il>
+# 2088 Unassigned
+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
@@ -4846,7 +4846,7 @@ ergolight 2109/tcp # Ergolight
# Jindra Ryvola <jryvola@ledalite.com>
umsp 2110/udp # UMSP
umsp 2110/tcp # UMSP
-# Alexander Bogdanov <alexander_bgd@softhome.net>
+# Alexander Bogdanov <alexander_bgd@softhome.net>
dsatp 2111/udp # DSATP
dsatp 2111/tcp # DSATP
# Ralph Beck <beck@altaworks.com>
@@ -4855,7 +4855,7 @@ idonix-metanet 2112/tcp # Idonix MetaNet
# Paul Harrison <paulh@idonix.co.uk>
hsl-storm 2113/udp # HSL StoRM
hsl-storm 2113/tcp # HSL StoRM
-# Jost Faganel <jost.faganel@hermes.si>
+# Jost Faganel <jost.faganel@hermes.si>
newheights 2114/udp # NEWHEIGHTS
newheights 2114/tcp # NEWHEIGHTS
# Michael Levy <ml@nh.ca>
@@ -4864,7 +4864,7 @@ kdm 2115/tcp # Key Distribution Manager
# Mike Little <mike.little@GDC4S.com>
ccowcmr 2116/udp # CCOWCMR
ccowcmr 2116/tcp # CCOWCMR
-# Mark Morwood <markm@sentillion.com>
+# Mark Morwood <markm@sentillion.com>
mentaclient 2117/udp # MENTACLIENT
mentaclient 2117/tcp # MENTACLIENT
mentaserver 2118/udp # MENTASERVER
@@ -4881,7 +4881,7 @@ scientia-ssdb 2121/tcp # SCIENTIA-SSDB
# Ian Miller <Ian_Miller@scientia.com>
caupc-remote 2122/udp # CauPC Remote Control
caupc-remote 2122/tcp # CauPC Remote Control
-# Environics Oy <pasi.nuutinmaki@environics.fi>
+# Environics Oy <pasi.nuutinmaki@environics.fi>
gtp-control 2123/udp # GTP-Control Plane (3GPP)
gtp-control 2123/tcp # GTP-Control Plane (3GPP)
# Alessio Casati <a.casati@computer.org>
@@ -4890,10 +4890,10 @@ elatelink 2124/tcp # ELATELINK
# Tim Lawrence <lawrence@tao-group.com>
lockstep 2125/udp # LOCKSTEP
lockstep 2125/tcp # LOCKSTEP
-# Karl Forster <kforster@lockstep.com>
+# Karl Forster <kforster@lockstep.com>
pktcable-cops 2126/udp # PktCable-COPS
pktcable-cops 2126/tcp # PktCable-COPS
-# Glenn Russell <grussell@cablelabs.com>
+# Glenn Russell <grussell@cablelabs.com>
index-pc-wb 2127/udp # INDEX-PC-WB
index-pc-wb 2127/tcp # INDEX-PC-WB
# James David Fisher <jfisher1@avaya.com>
@@ -4920,13 +4920,13 @@ avenue 2134/tcp # AVENUE
# Jason Cater <jason@ncsmags.com>
gris 2135/udp # Grid Resource Information Server
gris 2135/tcp # Grid Resource Information Server
-# Steve Tuecke <tuecke@mcs.anl.gov>
+# Steve Tuecke <tuecke@mcs.anl.gov>
appworxsrv 2136/udp # APPWORXSRV
appworxsrv 2136/tcp # APPWORXSRV
# Fred McLain <fmclain@appworx.com>
connect 2137/udp # CONNECT
connect 2137/tcp # CONNECT
-# Reid Ligon <reid@connectrf.com>
+# Reid Ligon <reid@connectrf.com>
unbind-cluster 2138/udp # UNBIND-CLUSTER
unbind-cluster 2138/tcp # UNBIND-CLUSTER
# Francois Harvey <securiweb@pandore.qc.ca>
@@ -4956,7 +4956,7 @@ veritas-ucl 2148/tcp # VERITAS UNIVERSAL COMMUNICATION LAYER
# Songlin Ren <ren@veritas.com>
acptsys 2149/udp # ACPTSYS
acptsys 2149/tcp # ACPTSYS
-# Michael Lekias <admin@psdesign.com.au>
+# Michael Lekias <admin@psdesign.com.au>
dynamic3d 2150/udp # DYNAMIC3D
dynamic3d 2150/tcp # DYNAMIC3D
# Tobias Wegner <wegner@novagate.de>
@@ -4965,7 +4965,7 @@ docent 2151/tcp # DOCENT
# Hali Lindbloom <halil@docent.com>
gtp-user 2152/udp # GTP-User Plane (3GPP)
gtp-user 2152/tcp # GTP-User Plane (3GPP)
-# Alessio Casati <a.casati@computer.org>
+# Alessio Casati <a.casati@computer.org>
# 2153-2158 Unassigned
gdbremote 2159/udp # GDB Remote Debug Port
gdbremote 2159/tcp # GDB Remote Debug Port
@@ -5006,7 +5006,7 @@ tivoconnect 2190/tcp # TiVoConnect Beacon
# Jeffrey J. Peters <jpeters@tivo.com> August 2002
tvbus 2191/udp # TvBus Messaging
tvbus 2191/tcp # TvBus Messaging
-# Brian W. Beach <brian@tivo.com> January 2003
+# Brian W. Beach <brian@tivo.com> January 2003
# 2192-2199 Unassigned
ici 2200/udp # ICI
ici 2200/tcp # ICI
@@ -5060,7 +5060,7 @@ recipe 2240/tcp # RECIPe
# Charlie Limoges <charlie.limoges@gd-cs.com>
ivsd 2241/udp # IVS Daemon
ivsd 2241/tcp # IVS Daemon
-# Thierry Turletti
+# Thierry Turletti
# <Thierry.Turletti@sophia.inria.fr>
foliocorp 2242/udp # Folio Remote Server
foliocorp 2242/tcp # Folio Remote Server
@@ -5081,7 +5081,7 @@ pc-mta-addrmap 2246/tcp # PacketCable MTA Addr Map
# 2247 Unassigned
ums 2248/udp # User Management Service
ums 2248/tcp # User Management Service
-# Andrew Crockford
+# Andrew Crockford
# <andrew.crockford@modus-interactive.co.uk>
rfmp 2249/udp # RISO File Manager Protocol
rfmp 2249/tcp # RISO File Manager Protocol
@@ -5103,7 +5103,7 @@ seispoc 2254/tcp # Seismic P.O.C. Port
# Robert Reimiller <bob@certsoft.com>
vrtp 2255/udp # VRTP - ViRtue Transfer Protocol
vrtp 2255/tcp # VRTP - ViRtue Transfer Protocol
-# Max Fudim <fudim@virtue3d.com>
+# Max Fudim <fudim@virtue3d.com>
# 2256-2259 Unassigned
apc-2260 2260/udp # APC 2260
apc-2260 2260/tcp # APC 2260
@@ -5124,10 +5124,10 @@ lnvmaps 2284/udp # LNVMAPS
lnvmaps 2284/tcp # LNVMAPS
lnvmailmon 2285/udp # LNVMAILMON
lnvmailmon 2285/tcp # LNVMAILMON
-# John Payne <jpayne@lotus.com>
+# John Payne <jpayne@lotus.com>
nas-metering 2286/udp # NAS-Metering
nas-metering 2286/tcp # NAS-Metering
-# Steven Sawkins <ssawkins@symantec.com>
+# Steven Sawkins <ssawkins@symantec.com>
dna 2287/udp # DNA
dna 2287/tcp # DNA
# Tung Nguyen <dash@ricochet.net>
@@ -5327,8 +5327,8 @@ tl1 2361/tcp # TL1
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
+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
@@ -5538,7 +5538,7 @@ powerclientcsf 2443/tcp # PowerClient Central Storage Facility
# Brian Klassen <Brian.Klassen@Unisys.com>
btpp2sectrans 2444/udp # BT PP2 Sectrans
btpp2sectrans 2444/tcp # BT PP2 Sectrans
-# Ian Daniels <btexact.ports@bt.com>
+# Ian Daniels <btexact.ports@bt.com>
dtn1 2445/udp # DTN1
dtn1 2445/tcp # DTN1
# Bob Gaddie <bobg@dtn.com>
@@ -6261,8 +6261,8 @@ vspread 2695/tcp # VSPREAD
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
+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
@@ -6520,7 +6520,7 @@ piccolo 2787/tcp # piccolo - Cornerstone Software
# Dave Bellivea <DaveBelliveau@corsof.com>
fryeserv 2788/udp # NetWare Loadable Module - Seagate Software
fryeserv 2788/tcp # NetWare Loadable Module - Seagate Software
-# Joseph LoPilato
+# Joseph LoPilato
# <Joseph_M_LoPilato@notes.seagate.com>
media-agent 2789/udp # Media Agent
media-agent 2789/tcp # Media Agent
@@ -6623,7 +6623,7 @@ 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/udp # CQG Net/Lan 1
cqg-netlan-1 2824/tcp # CQG Net/LAN 1
# Jeff Wood <jw@cqg.com>
# 2825 (unassigned) Possibly assigned
@@ -6838,16 +6838,16 @@ powergemplus 2899/tcp # POWERGEMPLUS
# Koich Nakamura <naka@case.nm.fujitsu.co.jp>
quicksuite 2900/udp # QUICKSUITE
quicksuite 2900/tcp # QUICKSUITE
-# William Egge <begge@emagisoft.com>
+# William Egge <begge@emagisoft.com>
allstorcns 2901/udp # ALLSTORCNS
allstorcns 2901/tcp # ALLSTORCNS
-# Steve Dobson <sdobson@allstor.com>
+# Steve Dobson <sdobson@allstor.com>
netaspi 2902/udp # NET ASPI
netaspi 2902/tcp # NET ASPI
-# Johnson Luo <johnson_luo@mail.sercomm.com.tw>
+# Johnson Luo <johnson_luo@mail.sercomm.com.tw>
suitcase 2903/udp # SUITCASE
suitcase 2903/tcp # SUITCASE
-# Milton E. Sagen <msagen@extensis.com>
+# Milton E. Sagen <msagen@extensis.com>
m2ua 2904/sctp # M2UA
m2ua 2904/udp # M2UA
m2ua 2904/tcp # M2UA
@@ -6905,7 +6905,7 @@ cesdcdman 2921/tcp # CESD Contents Delivery Management
# Shinya Abe <abeabe@pfu.co.jp>
cesdcdtrn 2922/udp # CESD Contents Delivery Data Transfer
cesdcdtrn 2922/tcp # CESD Contents Delivery Data Transfer
-# Shinya Abe <abeabe@pfu.co.jp>
+# Shinya Abe <abeabe@pfu.co.jp>
wta-wsp-wtp-s 2923/udp # WTA-WSP-WTP-S
wta-wsp-wtp-s 2923/tcp # WTA-WSP-WTP-S
# Sebastien Bury (WAP Forum)
@@ -6936,7 +6936,7 @@ incp 2932/udp # INCP
incp 2932/tcp # INCP
# Keith Paulsen <kpaulsen@phobos.com>
4-tieropmgw 2933/udp # 4-TIER OPM GW
-4-tieropmgw 2933/tcp # 4-TIER OPM GW
+4-tieropmgw 2933/tcp # 4-TIER OPM GW
# Francois Peloffy <fpeloffy@4tier.com>
4-tieropmcli 2934/udp # 4-TIER OPM CLI
4-tieropmcli 2934/tcp # 4-TIER OPM CLI
@@ -6960,15 +6960,15 @@ sm-pas-4 2941/udp # SM-PAS-4
sm-pas-4 2941/tcp # SM-PAS-4
sm-pas-5 2942/udp # SM-PAS-5
sm-pas-5 2942/tcp # SM-PAS-5
-# Tom Haapanen <tomh@metrics.com>
+# Tom Haapanen <tomh@metrics.com>
ttnrepository 2943/udp # TTNRepository
ttnrepository 2943/tcp # TTNRepository
-# Robert Orr <rorr@teltone.com>
+# Robert Orr <rorr@teltone.com>
megaco-h248 2944/udp # Megaco H-248
megaco-h248 2944/tcp # Megaco H-248
h248-binary 2945/udp # H248 Binary
h248-binary 2945/tcp # H248 Binary
-# Tom Taylor <taylor@nortelnetworks.com>
+# Tom Taylor <taylor@nortelnetworks.com>
fjsvmpor 2946/udp # FJSVmpor
fjsvmpor 2946/tcp # FJSVmpor
# Naoki Hayashi <ha@fjh.se.fujitsu.co.jp>
@@ -7025,10 +7025,10 @@ bullant-rap 2965/tcp # BULLANT RAP
# Michael Cahill <Michael.Cahill@bullant.net>
idp-infotrieve 2966/udp # IDP-INFOTRIEVE
idp-infotrieve 2966/tcp # IDP-INFOTRIEVE
-# Kevin Bruckert <kbruckert@idpco.com>
+# Kevin Bruckert <kbruckert@idpco.com>
ssc-agent 2967/udp # SSC-AGENT
ssc-agent 2967/tcp # SSC-AGENT
-# George Dzieciol <gdzieciol@symantec.com>
+# George Dzieciol <gdzieciol@symantec.com>
enpp 2968/udp # ENPP
enpp 2968/tcp # ENPP
# Kazuhito Gassho <Gassho.Kasuhito@exc.epson.co.jp>
@@ -7088,7 +7088,7 @@ identify 2987/udp # identify
identify 2987/tcp # identify
hippad 2988/udp # HIPPA Reporting Protocol
hippad 2988/tcp # HIPPA Reporting Protocol
-# William Randolph Royere III
+# William Randolph Royere III
# <william@royere.net>
zarkov 2989/udp # ZARKOV Intelligent Agent Communication
zarkov 2989/tcp # ZARKOV Intelligent Agent Communication
@@ -7101,7 +7101,7 @@ wkstn-mon 2991/tcp # WKSTN-MON
# William David <william.david@lmco.com>
itb301 2992/udp # ITB301
itb301 2992/tcp # ITB301
-# Bodo Rueskamp <br@itchigo.com>
+# Bodo Rueskamp <br@itchigo.com>
veritas-vis1 2993/udp # VERITAS VIS1
veritas-vis1 2993/tcp # VERITAS VIS1
veritas-vis2 2994/udp # VERITAS VIS2
@@ -7204,8 +7204,8 @@ magicnotes 3023/tcp # magicnotes
nds_sso 3024/udp # 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
+arepa-raft 3025/udp # Arepa Raft
+arepa-raft 3025/tcp # Arepa Raft
# Mark Ellison <ellison@ieee.org>
agri-gateway 3026/udp # AGRI Gateway
agri-gateway 3026/tcp # AGRI Gateway
@@ -7246,7 +7246,7 @@ santak-ups 3038/tcp # Santak UPS
# Tom Liu <ssc@sc.stk.com.cn>
cogitate 3039/udp # Cogitate, Inc.
cogitate 3039/tcp # Cogitate, Inc.
-# Jim Harlan <jimh@infowest.com>
+# Jim Harlan <jimh@infowest.com>
tomato-springs 3040/udp # Tomato Springs
tomato-springs 3040/tcp # Tomato Springs
# Jack Waller III <jack@tomatosprings.com>
@@ -7261,7 +7261,7 @@ brp 3043/tcp # BRP
# Greg Gee <ggee@hns.com>
epp 3044/udp # EndPoint Protocol
epp 3044/tcp # EndPoint Protocol
-# Stephen Cipolli <scipolli@radvision.com>
+# Stephen Cipolli <scipolli@radvision.com>
responsenet 3045/udp # ResponseNet
responsenet 3045/tcp # ResponseNet
# Chul Yoon <cyoon@responsenetworks.com>
@@ -7344,7 +7344,7 @@ csd-monitor 3072/tcp # ContinuStor Monitor Port
# Ray Jantz <ray.jantz@lsil.com>
vcrp 3073/udp # Very simple chatroom prot
vcrp 3073/tcp # Very simple chatroom prot
-# Andreas Wurf <a.wurf@mediaTools.de>
+# Andreas Wurf <a.wurf@mediaTools.de>
xbox 3074/udp # Xbox game port
xbox 3074/tcp # Xbox game port
# Damon Danieli <damond@microsoft.com>
@@ -7382,13 +7382,13 @@ jdl-dbkitchen 3086/tcp # JDL-DBKitchen
# Hideo Wakabayashi <hiwaka@alles.or.jp>
asoki-sma 3087/udp # Asoki SMA
asoki-sma 3087/tcp # Asoki SMA
-# Andrew Mossberg <amossberg@asoki.net>
+# Andrew Mossberg <amossberg@asoki.net>
xdtp 3088/udp # eXtensible Data Transfer Protocol
xdtp 3088/tcp # eXtensible Data Transfer Protocol
-# Michael Shearson <mshearson@peerglobal.com>
+# Michael Shearson <mshearson@peerglobal.com>
ptk-alink 3089/udp # ParaTek Agent Linking
ptk-alink 3089/tcp # ParaTek Agent Linking
-# Robert Hodgson <robert@paratek.co.uk>
+# Robert Hodgson <robert@paratek.co.uk>
rtss 3090/udp # Rappore Session Services
rtss 3090/tcp # Rappore Session Services
# Peter Boucher <pboucher@rappore.com>
@@ -7397,7 +7397,7 @@ rtss 3090/tcp # Rappore Session Services
# Ralf Bensmann <iana@1ci.de>
njfss 3092/udp # Netware sync services
njfss 3092/tcp # Netware sync services
-# Gordon Ross <G.Ross@ccw.gov.uk>
+# Gordon Ross <G.Ross@ccw.gov.uk>
rapidmq-center 3093/udp # Jiiva RapidMQ Center
rapidmq-center 3093/tcp # Jiiva RapidMQ Center
rapidmq-reg 3094/udp # Jiiva RapidMQ Registry
@@ -7408,7 +7408,7 @@ panasas 3095/tcp # Panasas rendevous port
# Peter Berger <peterb@panasas.com>
ndl-aps 3096/udp # Active Print Server Port
ndl-aps 3096/tcp # Active Print Server Port
-# Martin Norman <martin@ndl.co.uk>
+# Martin Norman <martin@ndl.co.uk>
# 3097/tcp Reserved
# 3097/udp Reserved
itu-bicc-stc 3097/sctp # ITU-T Q.1902.1/Q.2150.3
@@ -7421,7 +7421,7 @@ chmd 3099/tcp # CHIPSY Machine Daemon
# Trond Borsting <Trond.Borsting@telelogic.com>
opcon-xps 3100/udp # OpCon/xps
opcon-xps 3100/tcp # OpCon/xps
-# David Bourland <DBourland@smausa.com>
+# David Bourland <DBourland@smausa.com>
hp-pxpib 3101/udp # HP PolicyXpert PIB Server
hp-pxpib 3101/tcp # HP PolicyXpert PIB Server
# Brian O'Keefe <bokeefe@cnd.hp.com>
@@ -7444,7 +7444,7 @@ 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 Randolph Royere III
# <william@royere.net>
sim-control 3110/udp # simulator control port
sim-control 3110/tcp # simulator control port
@@ -7461,21 +7461,21 @@ cs-auth-svr 3113/tcp # CS-Authenticate Svr Port
# Andy Georgiou <ageorgiou@crypto-solutions.co.uk>
ccmad 3114/udp # CCM AutoDiscover
ccmad 3114/tcp # CCM AutoDiscover
-# Ram Sudama <rsudama@on.com>
+# Ram Sudama <rsudama@on.com>
mctet-master 3115/udp # MCTET Master
mctet-master 3115/tcp # MCTET Master
mctet-gateway 3116/udp # MCTET Gateway
mctet-gateway 3116/tcp # MCTET Gateway
mctet-jserv 3117/udp # MCTET Jserv
mctet-jserv 3117/tcp # MCTET Jserv
-# Manuel Veloso <veloso@us.itmasters.com>
+# Manuel Veloso <veloso@us.itmasters.com>
pkagent 3118/udp # PKAgent
pkagent 3118/tcp # PKAgent
# Michael Douglass <mikedoug@datafoundry.net>
d2000kernel 3119/udp # D2000 Kernel Port
d2000kernel 3119/tcp # D2000 Kernel Port
d2000webserver 3120/udp # D2000 Webserver Port
-d2000webserver 3120/tcp # D2000 Webserver Port
+d2000webserver 3120/tcp # D2000 Webserver Port
# Tomas Rajcan <trajcan@ipesoft.sk>
epp-temp 3121/udp # Extensible Provisioning Protocol
epp-temp 3121/tcp # Extensible Provisioning Protocol
@@ -7627,7 +7627,7 @@ serverview-rm 3172/udp # SERVERVIEW-RM
serverview-rm 3172/tcp # SERVERVIEW-RM
serverview-icc 3173/udp # SERVERVIEW-ICC
serverview-icc 3173/tcp # SERVERVIEW-ICC
-# Guenther Kroenert
+# Guenther Kroenert
# <Guenther.Kroenert@fujitsu-siemens.com>
armi-server 3174/udp # ARMI Server
armi-server 3174/tcp # ARMI Server
@@ -7775,7 +7775,7 @@ digivote 3223/tcp # DIGIVOTE (R) Vote-Server
# Christian Treczoks <ct@braehler.com>
aes-discovery 3224/udp # AES Discovery Port
aes-discovery 3224/tcp # AES Discovery Port
-# Ken Richard <kenr@aeseducation.com>
+# Ken Richard <kenr@aeseducation.com>
fcip-port 3225/udp # FCIP
fcip-port 3225/tcp # FCIP
# RFC-ietf-ips-fcovertcpip-12.txt
@@ -7803,7 +7803,7 @@ whisker 3233/udp # WhiskerControl main port
whisker 3233/tcp # WhiskerControl main port
# Rudolf Cardinal <rudolf@pobox.com> February 2002
alchemy 3234/udp # Alchemy Server
-alchemy 3234/tcp # Alchemy Server
+alchemy 3234/tcp # Alchemy Server
# Mikhail Belov <mikhail@imrgold.com> February 2002
mdap-port 3235/udp # MDAP Port
mdap-port 3235/tcp # MDAP port
@@ -7991,7 +7991,7 @@ 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
# <manfred.randelzofer@fujitsu-siemens.com>
pdrncs 3299/udp # pdrncs
pdrncs 3299/tcp # pdrncs
@@ -8508,12 +8508,12 @@ dtp-dia 3489/tcp # DTP/DIA
colubris 3490/udp # Colubris Management Port
colubris 3490/tcp # Colubris Management Port
# Gilbert Moineau <gilbert.moineau@colubris.com> May 2002
-swr-port 3491/udp # SWR Port
+swr-port 3491/udp # SWR Port
swr-port 3491/tcp # SWR Port
# Ian Manning <imanning@dtsuk.com> May 2002
tvdumtray-port 3492/udp # TVDUM Tray Port
tvdumtray-port 3492/tcp # TVDUM Tray Port
-# Peter Boers <boers@isisglobal.nl> May 2002
+# Peter Boers <boers@isisglobal.nl> May 2002
nut 3493/udp # Network UPS Tools
nut 3493/tcp # Network UPS Tools
# Russell Kroll <nut-iana@exploits.org> May 2002
@@ -8581,7 +8581,7 @@ must-p2p 3514/tcp # MUST Peer to Peer
must-backplane 3515/udp # MUST Backplane
must-backplane 3515/tcp # MUST Backplane
# Rick Stefanik <r.stefanik@gatelinx.com> May 2002
-smartcard-port 3516/udp # Smartcard Port
+smartcard-port 3516/udp # Smartcard Port
smartcard-port 3516/tcp # Smartcard Port
# Scott Guthery <sguthery@mobile-mind.com> May 2002
802-11-iapp 3517/udp # IEEE 802.11 WLANs WG IAPP
@@ -8603,7 +8603,7 @@ nssocketport 3522/udp # DO over NSSocketPort
nssocketport 3522/tcp # DO over NSSocketPort
# Douglas Davidson <drd@apple.com> June 2002
odeumservlink 3523/udp # Odeum Serverlink
-odeumservlink 3523/tcp # Odeum Serverlink
+odeumservlink 3523/tcp # Odeum Serverlink
# Mads Peter Back <iana-contact@webhouse.dk> June 2002
ecmport 3524/udp # ECM Server port
ecmport 3524/tcp # ECM Server port
@@ -8637,7 +8637,7 @@ urld-port 3534/tcp # URL Daemon Port
# Jim Binkley <jrb@cs.pdx.edu> June 2002
ms-la 3535/udp # MS-LA
ms-la 3535/tcp # MS-LA
-# Eric Ledoux <ericle@microsoft.com>
+# Eric Ledoux <ericle@microsoft.com>
snac 3536/udp # SNAC
snac 3536/tcp # SNAC
# Tatsuya Igarashi <Tatsuya.Igarashi@jp.sony.com> July 2002
@@ -8675,7 +8675,7 @@ interworld 3548/udp # Interworld
interworld 3548/tcp # Interworld
# John Stephen <iana@mundocani.com> July 2002
tellumat-nms 3549/udp # Tellumat MDR NMS
-tellumat-nms 3549/tcp # Tellumat MDR NMS
+tellumat-nms 3549/tcp # Tellumat MDR NMS
# Hennie van der Merwe <hvandermerwe@tellumat.com> July 2002
ssmpp 3550/udp # Secure SMPP
ssmpp 3550/tcp # Secure SMPP
@@ -8715,7 +8715,7 @@ bmc-onekey 3561/tcp # BMC-OneKey
# Alon Tam <alon_tam@bmc.com> August 2002
sdbproxy 3562/udp # SDBProxy
sdbproxy 3562/tcp # SDBProxy
-# Eric Grange <egrange@creative-it.net> August 2002
+# Eric Grange <egrange@creative-it.net> August 2002
watcomdebug 3563/udp # Watcom Debug
watcomdebug 3563/tcp # Watcom Debug
# Dave Neudoerffer <Dave.Neudoerffer@ianywhere.com>
@@ -8870,13 +8870,13 @@ start-network 3615/tcp # Start Messaging Network
cd3o-protocol 3616/udp # cd3o Control Protocol
cd3o-protocol 3616/tcp # cd3o Control Protocol
# Chris Wilcox <cwilcox@cd3o.com> October 2002
-sharp-server 3617/udp # ATI SHARP Logic Engine
+sharp-server 3617/udp # ATI SHARP Logic Engine
sharp-server 3617/tcp # ATI SHARP Logic Engine
# Bill Reveile <Bill@allentek.com>
aairnet-1 3618/udp # AAIR-Network 1
aairnet-1 3618/tcp # AAIR-Network 1
aairnet-2 3619/udp # AAIR-Network 2
-aairnet-2 3619/tcp # AAIR-Network 2
+aairnet-2 3619/tcp # AAIR-Network 2
# James Mealey <jymealey@yahoo.com> October 2002
ep-pcp 3620/udp # EPSON Projector Control Port
ep-pcp 3620/tcp # EPSON Projector Control Port
@@ -8918,7 +8918,7 @@ distcc 3632/tcp # distributed compiler
wacp 3633/udp # Wyrnix AIS port
wacp 3633/tcp # Wyrnix AIS port
# Harry T. Vennik <htvennik@zonnet.nl> November 2002
-hlibmgr 3634/udp # hNTSP Library Manager
+hlibmgr 3634/udp # hNTSP Library Manager
hlibmgr 3634/tcp # hNTSP Library Manager
# Kenji Tetsuyama <kenji@onkyo.co.jp> November 2002
sdo 3635/udp # Simple Distributed Objects
@@ -8933,8 +8933,8 @@ scservp 3637/tcp # Customer Service Port
ehp-backup 3638/udp # EHP Backup Protocol
ehp-backup 3638/tcp # EHP Backup Protocol
# Ed Fair <ed_fair@yahoo.com> November 2002
-xap-ha 3639/udp # Extensible Automation
-xap-ha 3639/tcp # Extensible Automation
+xap-ha 3639/udp # Extensible Automation
+xap-ha 3639/tcp # Extensible Automation
# Mark Harrison <Mark@xapautomation.org> November 2002
netplay-port1 3640/udp # Netplay Port 1
netplay-port1 3640/tcp # Netplay Port 1
@@ -8950,9 +8950,9 @@ audiojuggler 3643/tcp # AudioJuggler
ssowatch 3644/udp # ssowatch
ssowatch 3644/tcp # ssowatch
# Stephane Vinsot <vinsot@enatel.com> November 2002
-cyc 3645/udp # Cyc
+cyc 3645/udp # Cyc
cyc 3645/tcp # Cyc
-# Stephen Reed <reed@cyc.com> January 2003
+# Stephen Reed <reed@cyc.com> January 2003
xss-srv-port 3646/udp # XSS Server Port
xss-srv-port 3646/tcp # XSS Server Port
# Joe Purcell <jpurcell@ensuretech.com> January 2003
@@ -8980,7 +8980,7 @@ tsp 3653/tcp # Tunnel Setup Protocol
vaprtm 3654/udp # VAP RealTime Messenger
vaprtm 3654/tcp # VAP RealTime Messenger
# Boris Polevoy <vapcom@mail.ru> January 2003
-abatemgr 3655/udp # ActiveBatch Exec Agent
+abatemgr 3655/udp # ActiveBatch Exec Agent
abatemgr 3655/tcp # ActiveBatch Exec Agent
abatjss 3656/udp # ActiveBatch Job Scheduler
abatjss 3656/tcp # ActiveBatch Job Scheduler
@@ -9112,7 +9112,7 @@ kpn-icw 3699/tcp # Internet Call Waiting
lrs-paging 3700/udp # LRS NetPage
lrs-paging 3700/tcp # LRS NetPage
# Geoffrey Wossum <geoffrey@pager.net> February 2003
-netcelera 3701/udp # NetCelera
+netcelera 3701/udp # NetCelera
netcelera 3701/tcp # NetCelera
# Tarek Nabhan <standards@itworx.com> February 2003
upnp-discovery 3702/udp # UPNP v2 Discovery
@@ -9133,7 +9133,7 @@ rt-event-s 3707/tcp # Real-Time Event Secure Port
# 3708 Unassigned
ca-idms 3709/udp # CA-IDMS Server
ca-idms 3709/tcp # CA-IDMS Server
-# Dave Ross <david.ross@ca.com>
+# Dave Ross <david.ross@ca.com>
portgate-auth 3710/udp # PortGate Authentication
portgate-auth 3710/tcp # PortGate Authentication
# Scott Harris <Scott@XRamp.com> February 2003
@@ -9259,7 +9259,7 @@ nattyserver 3753/udp # NattyServer Port
nattyserver 3753/tcp # NattyServer Port
# Akira Saito <admin@kobu.com> April 2003
timestenbroker 3754/udp # TimesTen Broker Port
-timestenbroker 3754/tcp # TimesTen Broker Port
+timestenbroker 3754/tcp # TimesTen Broker Port
# David Aspinwall <aspinwall@TimesTen.com> April 2003
sas-remote-hlp 3755/udp # SAS Remote Help Server
sas-remote-hlp 3755/tcp # SAS Remote Help Server
@@ -9278,7 +9278,7 @@ exapt-lmgr 3759/tcp # Exapt License Manager
# Christoph Kukulies <info@exapt.de> April 2003
adtempusclient 3760/udp # adTEmpus Client
adtempusclient 3760/tcp # adTempus Client
-# Bill Wingate <bill.wingate@arcanadev.com> May 2003
+# Bill Wingate <bill.wingate@arcanadev.com> May 2003
gsakmp 3761/udp # gsakmp port
gsakmp 3761/tcp # gsakmp port
# Uri Meth <umeth@sparta.com> June 2003
@@ -9343,15 +9343,15 @@ iso-tp0s 3782/tcp # Secure ISO TP0 port
# 3783-3799 Unassigned
pwgpsi 3800/udp # Print Services Interface
pwgpsi 3800/tcp # Print Services Interface
-# Harry Lewis <harryl@us.ibm.com> May 2003
+# Harry Lewis <harryl@us.ibm.com> May 2003
# 3801 Unassigned
vhd 3802/udp # VHD
vhd 3802/tcp # VHD
-# Chris Duncombe <cdunc@intoo.com>
-# 3803-3844 Unassigned
+# Chris Duncombe <cdunc@intoo.com>
+# 3803-3844 Unassigned
v-one-spp 3845/udp # V-ONE Single Port Proxy
v-one-spp 3845/tcp # V-ONE Single Port Proxy
-# Daniel Becker <dbecker@v-one.com>
+# Daniel Becker <dbecker@v-one.com>
# 3846-3860 Unassigned
winshadow-hd 3861/udp # winShadow Host Discovery
winshadow-hd 3861/tcp # winShadow Host Discovery
@@ -9362,7 +9362,7 @@ giga-pocket 3862/tcp # GIGA-POCKET
# 3863-3874 Unassigned
pnbscada 3875/udp # PNBSCADA
pnbscada 3875/tcp # PNBSCADA
-# Philip N. Bergstresser <phil@bergstresser.org>
+# Philip N. Bergstresser <phil@bergstresser.org>
# 3876-3884 Unassigned
topflow-ssl 3885/udp # TopFlow SSL
topflow-ssl 3885/tcp # TopFlow SSL
@@ -9375,7 +9375,7 @@ udt_os 3900/tcp # Unidata UDT OS
aamp 3939/udp # Anti-virus Application Management Port
aamp 3939/tcp # Anti-virus Application Management Port
# In-sik Choi <iscard@virusdesk.com> February 2002
-# 3940-3983 Unassigned
+# 3940-3983 Unassigned
mapper-nodemgr 3984/udp # MAPPER network node manager
mapper-nodemgr 3984/tcp # MAPPER network node manager
mapper-mapethd 3985/udp # MAPPER TCP/IP server
@@ -9391,7 +9391,7 @@ 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> ###################
+####### PORT 4000 also used by ICQ <www.icq.com> ###################
newoak 4001/udp # NewOak
newoak 4001/tcp # NewOak
# Jim Philippou <jphilippou@newoak.com>
@@ -9408,8 +9408,8 @@ 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
+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/tcp # Chimera HWM
@@ -9483,13 +9483,13 @@ sanavigator 4033/udp # SANavigator Peer Port
sanavigator 4033/tcp # SANavigator Peer Port
# Robert J. Chansler <rchansler@SANavigator.com>
ubxd 4034/udp # Ubiquinox Daemon
-ubxd 4034/tcp # Ubiquinox Daemon
+ubxd 4034/tcp # Ubiquinox Daemon
# Kit Smithers <ksmithers@argogroup.com>
wap-push-http 4035/udp # WAP Push OTA-HTTP port
wap-push-http 4035/tcp # WAP Push OTA-HTTP port
wap-push-https 4036/udp # WAP Push OTA-HTTP secure
wap-push-https 4036/tcp # WAP Push OTA-HTTP secure
-# Matthieu Lachance
+# Matthieu Lachance
# <matthieu.lachance@openwave.com>
# 4037-4039 Unassigned
yo-main 4040/udp # Yo.net main service
@@ -9500,7 +9500,7 @@ houston 4041/tcp # Rocketeer-Houston
# Johnny C. Norris II <jnorris@uiuc.edu>
ldxp 4042/udp # LDXP
ldxp 4042/tcp # LDXP
-# Craig Calef <craig@katmango.com>
+# Craig Calef <craig@katmango.com>
# 4043-4095 Unassigned
bre 4096/udp # BRE (Bridge Relay Element)
bre 4096/tcp # BRE (Bridge Relay Element)
@@ -9522,7 +9522,7 @@ xgrid 4111/tcp # Xgrid
xgrid 4111/udp # Xgrid
jomamqmonitor 4114/udp # JomaMQMonitor
jomamqmonitor 4114/tcp # JomaMQMonitor
-# Marcel Hofstetter <marcel.hofstetter@jomasoft.ch> January 2003
+# Marcel Hofstetter <marcel.hofstetter@jomasoft.ch> January 2003
# 4115-4131 Unassigned
nuts_dem 4132/udp # NUTS Daemon
nuts_dem 4132/tcp # NUTS Daemon
@@ -9560,7 +9560,7 @@ jini-discovery 4160/tcp # Jini Discovery
# 4161-4198 Unassigned
eims-admin 4199/udp # EIMS ADMIN
eims-admin 4199/tcp # EIMS ADMIN
-# Glenn Anderson <glenn@qualcomm.co.nz>
+# Glenn Anderson <glenn@qualcomm.co.nz>
# Mitra <mitra@earth.path.net>
corelccam 4300/udp # Corel CCam
corelccam 4300/tcp # Corel CCam
@@ -9621,7 +9621,7 @@ pharos 4443/tcp # Pharos
krb524 4444/udp # KRB524
krb524 4444/tcp # KRB524
# B. Clifford Neuman <bcn@isi.edu>
-# PROBLEM krb524 assigned the port,
+# PROBLEM krb524 assigned the port,
# PROBLEM nv used it without an assignment
nv-video 4444/udp # NV Video default
nv-video 4444/tcp # NV Video default
@@ -9678,17 +9678,17 @@ lanner-lm 4547/tcp # Lanner License Manager
# 4548-4554 Unassigned
rsip 4555/udp # RSIP Port
rsip 4555/tcp # RSIP Port
-# RFC 3103
+# RFC 3103
# 4556-4558 Unassigned
hylafax 4559/udp # HylaFAX
hylafax 4559/tcp # HylaFAX
-# Lee Howard <iana@hylafax.org> March 2002
+# Lee Howard <iana@hylafax.org> March 2002
# 4560-4566 Unassigned
tram 4567/udp # TRAM
tram 4567/tcp # TRAM
# Joe Wesley <joe.wesley@east.sun.com>
-bmc-reporting 4568/udp # BMC Reporting
-bmc-reporting 4568/tcp # BMC Reporting
+bmc-reporting 4568/udp # BMC Reporting
+bmc-reporting 4568/tcp # BMC Reporting
# Randall De Weerd <rdeweerd@bmc.com>
# 4569-4599 Unassigned
piranha1 4600/udp # Piranha1
@@ -9699,10 +9699,10 @@ piranha2 4601/tcp # Piranha2
# 4602-4659 Unassigned
smaclmgr 4660/udp # smaclmgr
smaclmgr 4660/tcp # smaclmgr
-# Hiromi Taki <stg-togo@saint.nm.fujitsu.co.jp>
+# Hiromi Taki <stg-togo@saint.nm.fujitsu.co.jp>
kar2ouche 4661/udp # Kar2ouche Peer location service
kar2ouche 4661/tcp # Kar2ouche Peer location service
-# Andy Krouwel <andy@kar2ouche.com>
+# Andy Krouwel <andy@kar2ouche.com>
# 4662-4671 Unassigned
rfa 4672/udp # remote file access server
rfa 4672/tcp # remote file access server
@@ -9723,7 +9723,7 @@ htcp 4827/udp # HTCP
htcp 4827/tcp # HTCP
# Paul Vixie <paul@vix.com>
# 4828-4836 Unassigned
-varadero-0 4837/udp # Varadero-0
+varadero-0 4837/udp # Varadero-0
varadero-0 4837/tcp # Varadero-0
varadero-1 4838/udp # Varadero-1
varadero-1 4838/tcp # Varadero-1
@@ -9817,7 +9817,7 @@ scpi-raw 5025/tcp # SCPI-RAW
asnaacceler8db 5042/udp # asnaacceler8db
asnaacceler8db 5042/tcp # asnaacceler8db
# Walter Goodwin <wpgoodwin@asna.com>
-# 5043-5049 Unassigned
+# 5043-5049 Unassigned
mmcc 5050/udp # multimedia conference control tool
mmcc 5050/tcp # multimedia conference control tool
# Steve Casner <Casner@isi.edu>
@@ -9851,7 +9851,7 @@ ca-2 5065/tcp # Channel Access 2
stanag-5066 5066/udp # STANAG-5066-SUBNET-INTF
stanag-5066 5066/tcp # STANAG-5066-SUBNET-INTF
# Donald G. Kallgren
-# <Donald.Kallgren@nc3a.nato.int>
+# <Donald.Kallgren@nc3a.nato.int>
# 5062-5068 Unassigned
i-net-2000-npr 5069/udp # I/Net 2000-NPR
i-net-2000-npr 5069/tcp # I/Net 2000-NPR
@@ -9868,7 +9868,7 @@ sdl-ets 5081/tcp # SDL - Ent Trans Server
sentinel-lm 5093/udp # Sentinel LM
sentinel-lm 5093/tcp # Sentinel LM
# Derick Snyder <dsnyder@rainbow.com>
-# 5094-5098 Unassigned
+# 5094-5098 Unassigned
sentlm-srv2srv 5099/udp # SentLM Srv2Srv
sentlm-srv2srv 5099/tcp # SentLM Srv2Srv
# Derick Snyder <dsnyder@rainbow.com>
@@ -9883,7 +9883,7 @@ ctsd 5137/tcp # MyCTS server port
# 5138-5144 Unassigned
rmonitor_secure 5145/udp # RMONITOR SECURE
rmonitor_secure 5145/tcp # RMONITOR SECURE
-# Kory Hamzeh <kory@ascend.com>
+# Kory Hamzeh <kory@ascend.com>
# 5146-5149 Unassigned
atmp 5150/udp # Ascend Tunnel Management Protocol
atmp 5150/tcp # Ascend Tunnel Management Protocol
@@ -9892,7 +9892,7 @@ esri_sde 5151/udp # ESRI SDE Remote Start
esri_sde 5151/tcp # ESRI SDE Instance
sde-discovery 5152/udp # ESRI SDE Instance Discovery
sde-discovery 5152/tcp # ESRI SDE Instance Discovery
-# Peter Aronson <paronson@esri.com>
+# Peter Aronson <paronson@esri.com>
# 5153-5164 Unassigned
ife_icorp 5165/udp # ife_1corp
ife_icorp 5165/tcp # ife_1corp
@@ -9909,19 +9909,19 @@ aol-3 5193/udp # AmericaOnline3
aol-3 5193/tcp # AmericaOnline3
# Bruce Mackey <BAMackey@aol.com>
# 5194-5199 Unassigned
-targus-getdata 5200/udp # TARGUS GetData
-targus-getdata 5200/tcp # TARGUS GetData
+targus-getdata 5200/udp # TARGUS GetData
+targus-getdata 5200/tcp # TARGUS GetData
targus-getdata1 5201/udp # TARGUS GetData 1
targus-getdata1 5201/tcp # TARGUS GetData 1
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
+targus-getdata3 5203/tcp # TARGUS GetData 3
# John Keaveney <johnkeaveney@targusinfo.com>
# 5204-5221 Unassigned
jabber-client 5222/udp # Jabber Client Connection
jabber-client 5222/tcp # Jabber Client Connection
-# David Waite <mass@akuma.org> February 2002
+# David Waite <mass@akuma.org> February 2002
# 5223-5224 Unassigned
hp-server 5225/udp # HP Server
hp-server 5225/tcp # HP Server
@@ -9937,7 +9937,7 @@ igateway 5250/tcp # iGateway
# Greg Bodine <gregory.bodine@ca.com> February 2002
# 5251-5263 Unassigned
3com-njack-1 5264/udp # 3Com Network Jack Port 1
-3com-njack-1 5264/tcp # 3Com Network Jack Port 1
+3com-njack-1 5264/tcp # 3Com Network Jack Port 1
3com-njack-2 5265/udp # 3Com Network Jack Port 2
3com-njack-2 5265/tcp # 3Com Network Jack Port 2
# Abhay Rajaram <Abhay_Rajaram@3Com.com> March 2003
@@ -9962,10 +9962,10 @@ 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/udp #
hacl-local 5304/tcp # # HA Cluster Commands
-hacl-test 5305/udp #
-hacl-test 5305/tcp # # HA Cluster Test
+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
@@ -10026,7 +10026,7 @@ 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>
+# Richard Farnham <rfarnham@salient.com>
actnet 5411/udp # ActNet
actnet 5411/tcp # ActNet
# Simon Robillard <RobillardS@actresearch.com>
@@ -10170,7 +10170,7 @@ jms 5673/tcp # JACL Message Server
# Stuart Allen <stuart@jacl.animats.net> February 2002
hyperscsi-port 5674/udp # HyperSCSI Port
hyperscsi-port 5674/tcp # HyperSCSI Port
-# Data Storage Institute, Singapore
+# Data Storage Institute, Singapore
# <Patrick@dsi.nus.edu.sg> February 2002
v5ua 5675/udp # V5UA application port
v5ua 5675/tcp # V5UA application port
@@ -10181,29 +10181,29 @@ raadmin 5676/tcp # RA Administration
questdb2-lnchr 5677/udp # Quest Central DB2 Launchr
questdb2-lnchr 5677/tcp # Quest Central DB2 Launchr
# Robert M. Mackowiak <rmackowiak@quest.com> February 2002
-rrac 5678/udp # Remote Replication Agent Connection
-rrac 5678/tcp # Remote Replication Agent Connection
+rrac 5678/udp # Remote Replication Agent Connection
+rrac 5678/tcp # Remote Replication Agent Connection
dccm 5679/udp # Direct Cable Connect Manager
dccm 5679/tcp # Direct Cable Connect Manager
# Mark Miller <mmiller@MICROSOFT.com>
# 5680-5687 Unassigned
ggz 5688/udp # GGZ Gaming Zone
ggz 5688/tcp # GGZ Gaming Zone
-# Josef Spillner <js177634@inf.tu-dresden.de> January 2003
+# Josef Spillner <js177634@inf.tu-dresden.de> January 2003
# 5689-5712 Unassigned
proshareaudio 5713/udp # proshare conf audio
proshareaudio 5713/tcp # proshare conf audio
prosharevideo 5714/udp # proshare conf video
prosharevideo 5714/tcp # proshare conf video
-prosharedata 5715/udp # proshare conf data
-prosharedata 5715/tcp # proshare conf data
+prosharedata 5715/udp # proshare conf data
+prosharedata 5715/tcp # proshare conf data
prosharerequest 5716/udp # proshare conf request
prosharerequest 5716/tcp # proshare conf request
-prosharenotify 5717/udp # proshare conf notify
-prosharenotify 5717/tcp # proshare conf notify
+prosharenotify 5717/udp # proshare conf notify
+prosharenotify 5717/tcp # proshare conf notify
# <gunner@ibeam.intel.com>
# 5718-5719 Unassigned
-ms-licensing 5720/udp # MS-Licensing
+ms-licensing 5720/udp # MS-Licensing
ms-licensing 5720/tcp # MS-Licensing
# Thomas Lindeman <tlinde@microsoft.com> November 2002
# 5721-5728 Unassigned
@@ -10214,7 +10214,7 @@ openmail 5729/tcp # Openmail User Agent Layer
unieng 5730/udp # Steltor's calendar access
unieng 5730/tcp # Steltor's calendar access
# Bernard Desruisseaux <bernard@steltor.com>
-# 5731-5740 Unassigned
+# 5731-5740 Unassigned
ida-discover1 5741/udp # IDA Discover Port 1
ida-discover1 5741/tcp # IDA Discover Port 1
ida-discover2 5742/udp # IDA Discover Port 2
@@ -10246,12 +10246,12 @@ netagent 5771/tcp # NetAgent
# 5772-5812 Unassigned
icmpd 5813/udp # ICMPD
icmpd 5813/tcp # ICMPD
-# Shane O'Donnell <shane@opennms.org>
-# 5814-5858 Unassigned
+# Shane O'Donnell <shane@opennms.org>
+# 5814-5858 Unassigned
wherehoo 5859/udp # WHEREHOO
wherehoo 5859/tcp # WHEREHOO
# Jim Youll <jim@media.mit.edu>
-# 5860-5967 Unassigned
+# 5860-5967 Unassigned
mppolicy-v5 5968/udp # mppolicy-v5
mppolicy-v5 5968/tcp # mppolicy-v5
mppolicy-mgr 5969/udp # mppolicy-mgr
@@ -10262,7 +10262,7 @@ wbem-rmi 5987/udp # WBEM RMI
wbem-rmi 5987/tcp # WBEM RMI
wbem-http 5988/udp # WBEM HTTP
wbem-http 5988/tcp # WBEM HTTP
-# Jim Davis <james.d.davis@sun.com>
+# Jim Davis <james.d.davis@sun.com>
wbem-https 5989/udp # WBEM HTTPS
wbem-https 5989/tcp # WBEM HTTPS
# Jim Davis <james.d.davis@east.sun.com>
@@ -10286,7 +10286,7 @@ ewctsp 6066/tcp # EWCTSP
# Mark Bailon <mark.bailon@ericsson.com>
srb 6067/udp # SRB
srb 6067/tcp # SRB
-# Heinz Naef <heinz.naef@nexos.com>
+# Heinz Naef <heinz.naef@nexos.com>
gsmp 6068/udp # GSMP
gsmp 6068/tcp # GSMP
# Avri Doria <avri.doria@nokia.com>
@@ -10298,7 +10298,7 @@ messageasap 6070/tcp # Messageasap
# Murray Freeman <murray@officedomain.com>
ssdtp 6071/udp # SSDTP
ssdtp 6071/tcp # SSDTP
-# Michael Shearson <mikes@softsys-inc.com>
+# Michael Shearson <mikes@softsys-inc.com>
diagnose-proc 6072/udp # DIAGNOSE-PROC
diagnose-proc 6072/tcp # DIAGNOSE-PROC
# Allan Miller <amiller@handsfreenetworks.com>
@@ -10316,7 +10316,7 @@ synchronet-rtc 6101/udp # SynchroNet-rtc
synchronet-rtc 6101/tcp # SynchroNet-rtc
synchronet-upd 6102/udp # SynchroNet-upd
synchronet-upd 6102/tcp # SynchroNet-upd
-# Arne Haugland <Arne.Haugland@parasoldev.com>
+# Arne Haugland <Arne.Haugland@parasoldev.com>
rets 6103/udp # RETS
rets 6103/tcp # RETS
# Bruce Toback <btoback@optc.com>
@@ -10330,7 +10330,7 @@ mpsserver 6106/tcp # MPS Server
# Prima Designs Systems Ltd. <info@prima.com.hk>
etc-control 6107/udp # ETC Control
etc-control 6107/tcp # ETC Control
-# Steve Polishinski <spolishinski@etcconnect.com>
+# Steve Polishinski <spolishinski@etcconnect.com>
sercomm-scadmin 6108/udp # Sercomm-SCAdmin
sercomm-scadmin 6108/tcp # Sercomm-SCAdmin
# Melinda Tsao <melinda_tsao@mail.sercomm.com.tw>
@@ -10342,7 +10342,7 @@ softcm 6110/tcp # HP SoftBench CM
spc 6111/udp # HP SoftBench Sub-Process Control
spc 6111/tcp # HP SoftBench Sub-Process Control
# Scott A. Kramer <sk@tleilaxu.sde.hp.com>
-dtspcd 6112/udp # dtspcd
+dtspcd 6112/udp # dtspcd
dtspcd 6112/tcp # dtspcd
# Doug Royer <Doug@Royer.com>
# 6113-6122 Unassigned
@@ -10373,22 +10373,22 @@ montage-lm 6147/tcp # Montage License Manager
ricardo-lm 6148/udp # Ricardo North America License Manager
ricardo-lm 6148/tcp # Ricardo North America License Manager
# M Flemming <mflemming@aol.com>
-tal-pod 6149/udp # tal-pod
-tal-pod 6149/tcp # tal-pod
+tal-pod 6149/udp # tal-pod
+tal-pod 6149/tcp # tal-pod
# Steven Loomis <srl@taligent.com>
-# 6150-6252 Unassigned
+# 6150-6252 Unassigned
crip 6253/udp # CRIP
crip 6253/tcp # CRIP
-# Mike Rodbell <mrodbell@ciena.com>
+# Mike Rodbell <mrodbell@ciena.com>
# 6254-6299 Unassigned
bmc-grx 6300/udp # BMC GRX
bmc-grx 6300/tcp # BMC GRX
# Ed Penak <ed_penak@bmc.com>
# 6301-6320 Unassigned
-emp-server1 6321/udp # Empress Software Connectivity Server 1
+emp-server1 6321/udp # Empress Software Connectivity Server 1
emp-server1 6321/tcp # Empress Software Connectivity Server 1
-emp-server2 6322/udp # Empress Software Connectivity Server 2
-emp-server2 6322/tcp # Empress Software Connectivity Server 2
+emp-server2 6322/udp # Empress Software Connectivity Server 2
+emp-server2 6322/tcp # Empress Software Connectivity Server 2
# Srdjan Holovac <srdjan@empress.com>
# 6323-6342 Unassigned
sflow 6343/udp # sFlow traffic monitoring
@@ -10403,7 +10403,7 @@ gnutella-rtr 6347/tcp # gnutella-rtr
# 6348-6381 Unassigned
metatude-mds 6382/udp # Metatude Dialogue Server
metatude-mds 6382/tcp # Metatude Dialogue Server
-# Menno Zweistra <m.zweistra@metatude.com>
+# Menno Zweistra <m.zweistra@metatude.com>
# 6383-6388 Unassigned
clariion-evr01 6389/udp # clariion-evr01
clariion-evr01 6389/tcp # clariion-evr01
@@ -10412,7 +10412,7 @@ clariion-evr01 6389/tcp # clariion-evr01
# The following blocks are in use by Seagate Software 6400-6410 #
# The previous ports are in use by Seagate Software 6400-6410 #
# Contact for these ports is Wade Richards <Wade.Richards@Seagatesoftware.com>
-# 6411-6454 Unassigned
+# 6411-6454 Unassigned
skip-cert-recv 6455/tcp # SKIP Certificate Receive
skip-cert-send 6456/tcp # SKIP Certificate Send
# Tom Markson <markson@osmosys.incog.com>
@@ -10429,7 +10429,7 @@ 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>
+# Magnus Nystrom <magnus@dynas.se>
# 6504 Unassigned
badm_priv 6505/udp # BoKS Admin Private Port
badm_priv 6505/tcp # BoKS Admin Private Port
@@ -10476,7 +10476,7 @@ parsec-peer 6581/udp # Parsec Peer-to-Peer
parsec-peer 6581/tcp # Parsec Peer-to-Peer
parsec-game 6582/udp # Parsec Gameserver
parsec-game 6582/tcp # Parsec Gameserver
-# Andreas Varga <sid@parsec.org>
+# Andreas Varga <sid@parsec.org>
# 6583-6587 Unassigned
# 6588 Unassigned
####Unofficial use of port 6588 by AnalogX and Microsoft####
@@ -10493,7 +10493,7 @@ mach 6631/tcp # Mitchell telecom host
vocaltec-gold 6670/udp # Vocaltec Global Online Directory
vocaltec-gold 6670/tcp # Vocaltec Global Online Directory
# Scott Petrack <Scott_Petrack@vocaltec.com>
-# 6671 Unassigned
+# 6671 Unassigned
vision_server 6672/udp # vision_server
vision_server 6672/tcp # vision_server
vision_elmd 6673/udp # vision_elmd
@@ -10511,9 +10511,9 @@ ibprotocol 6714/tcp # Internet Backplane Protocol
bmc-perf-agent 6767/udp # BMC PERFORM AGENT
bmc-perf-agent 6767/tcp # BMC PERFORM AGENT
bmc-perf-mgrd 6768/udp # BMC PERFORM MGRD
-bmc-perf-mgrd 6768/tcp # BMC PERFORM MGRD
+bmc-perf-mgrd 6768/tcp # BMC PERFORM MGRD
# Dima Seliverstov <Dima_Seliverstov@bmc.com>
-# 6769-6787 Unassigned
+# 6769-6787 Unassigned
smc-http 6788/udp # SMC-HTTP
smc-http 6788/tcp # SMC-HTTP
# Ratnadeep Bhattacharjee <ratnadeep.bhattacharjee@sun.com> November 2002
@@ -10533,7 +10533,7 @@ 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
+# 6843-6849 Unassigned
iccrushmore 6850/udp # ICCRUSHMORE
iccrushmore 6850/tcp # ICCRUSHMORE
# Dave Hubbard <dave@icc.net>
@@ -10542,7 +10542,7 @@ muse 6888/udp # MUSE
muse 6888/tcp # MUSE
# Muse Communications Corporation
# <howard@muse3d.com>
-# 6889-6960 Unassigned
+# 6889-6960 Unassigned
jmact3 6961/udp # JMACT3
jmact3 6961/tcp # JMACT3
jmevt2 6962/udp # jmevt2
@@ -10631,8 +10631,8 @@ clutild 7174/udp # Clutild
clutild 7174/tcp # Clutild
# Cheryl Stoutenburg <cstoutenburg@vnet.ibm.com>
# 7175-7199 Unassigned
-fodms 7200/udp # FODMS FLIP
-fodms 7200/tcp # FODMS FLIP
+fodms 7200/udp # FODMS FLIP
+fodms 7200/tcp # FODMS FLIP
# David Anthony <anthony@power.amasd.anatcp.rockwell.com>
dlip 7201/udp # DLIP
dlip 7201/tcp # DLIP
@@ -10649,7 +10649,7 @@ mindfilesys 7391/udp # mind-file system server
mindfilesys 7391/tcp # mind-file system server
mrssrendezvous 7392/udp # mrss-rendezvous server
mrssrendezvous 7392/tcp # mrss-rendezvous server
-# Dave Porter <porter@mango.com>
+# Dave Porter <porter@mango.com>
# 7393-7394 Unassigned
winqedit 7395/udp # winqedit
winqedit 7395/tcp # winqedit
@@ -10676,7 +10676,7 @@ telops-lmd 7491/udp # telops-lmd
telops-lmd 7491/tcp # telops-lmd
# David Spencer <dspencer@telops.com>
# 7492-7499 Unassigned
-# 7500 Unassigned
+# 7500 Unassigned
ovbus 7501/udp # HP OpenView Bus Daemon
ovbus 7501/tcp # HP OpenView Bus Daemon
# David M. Rhodes <davidrho@cnd.hp.com>
@@ -10759,7 +10759,7 @@ apc-7846 7846/tcp # APC 7846
# 7847-7912 Unassigned
qo-secure 7913/udp # QuickObjects secure port
qo-secure 7913/tcp # QuickObjects secure port
-# Jonas Bovin <jonas.bovin@quickobjects.com>
+# Jonas Bovin <jonas.bovin@quickobjects.com>
# 7914-7931 Unassigned
t2-drm 7932/udp # Tier 2 Data Resource Manager
t2-drm 7932/tcp # Tier 2 Data Resource Manager
@@ -10770,7 +10770,7 @@ t2-brm 7933/tcp # Tier 2 Business Rules Manager
supercell 7967/udp # Supercell
supercell 7967/tcp # Supercell
# Kevin Nakagawa <nakagawa@sigsci.com>
-# 7968-7978 Unassigned
+# 7968-7978 Unassigned
micromuse-ncps 7979/udp # Micromuse-ncps
micromuse-ncps 7979/tcp # Micromuse-ncps
# Hing Wing To <wing.to@mircromuse.com>
@@ -10789,14 +10789,14 @@ vcom-tunnel 8001/tcp # VCOM Tunnel
teradataordbms 8002/udp # Teradata ORDBMS
teradataordbms 8002/tcp # Teradata ORDBMS
# Curt Ellmann <curt.ellmann@ncr.com>
-# 8003-8007 Unassigned
+# 8003-8007 Unassigned
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/udp # oa-system
oa-system 8022/tcp # oa-system
-# Denis Girault <Denis.Girault@evidian.com>
+# Denis Girault <Denis.Girault@evidian.com>
# 8023-8031 Unassigned
pro-ed 8032/udp # ProEd
pro-ed 8032/tcp # ProEd
@@ -10834,7 +10834,7 @@ indigo-vbcp 8131/tcp # INDIGO-VBCP
# Colin Caughie <cfc@indigo-avs.com>
dbabble 8132/udp # dbabble
dbabble 8132/tcp # dbabble
-# Chris Pugmire <chrisp@netwinsite.com>
+# Chris Pugmire <chrisp@netwinsite.com>
# 8133-8159 Unassigned
patrol 8160/udp # Patrol
patrol 8160/tcp # Patrol
@@ -10901,7 +10901,7 @@ pcsync-https 8443/tcp # PCsync HTTPS
pcsync-http 8444/udp # PCsync HTTP
pcsync-http 8444/tcp # PCsync HTTP
# Katy Lynn McCullough <KatyM@LapLink.com>
-# 8445-8449 Unassigned
+# 8445-8449 Unassigned
npmp 8450/udp # npmp
npmp 8450/tcp # npmp
# Ian Chard <ian@tanagra.demon.co.uk>
@@ -10925,10 +10925,10 @@ ibus 8733/tcp # iBus
# 8734-8762 Unassigned
mc-appserver 8763/udp # MC-APPSERVER
mc-appserver 8763/tcp # MC-APPSERVER
-# Romeo Kasanwidjojo <romeo@microcomgroup.com>
+# Romeo Kasanwidjojo <romeo@microcomgroup.com>
openqueue 8764/udp # OPENQUEUE
openqueue 8764/tcp # OPENQUEUE
-# Matt Jensen <mattj@newsblip.com>
+# Matt Jensen <mattj@newsblip.com>
ultraseek-http 8765/udp # Ultraseek HTTP
ultraseek-http 8765/tcp # Ultraseek HTTP
# Walter Underwood <wunder@infoseek.com>
@@ -10942,7 +10942,7 @@ msgsrvr 8787/tcp # Message Server
truecm 8804/udp # truecm
truecm 8804/tcp # truecm
# Scott Kramer <scottk@truebluesoftware.com>
-# 8805-8879
+# 8805-8879
cddbp-alt 8880/udp # CDDBP
cddbp-alt 8880/tcp # CDDBP
# Steve Scherf <steve@moonsoft.com>
@@ -10962,7 +10962,7 @@ ddi-tcp-6 8893/tcp # Desktop Data TCP 5: NewsEDGE/Web application
ddi-udp-7 8894/udp # Desktop Data UDP 6: COAL application
ddi-tcp-7 8894/tcp # Desktop Data TCP 6: COAL application
# Fred Yao <Fred_Yao@DDIGATE2.desktopdata.com>
-# 8895-8899 Unassigned
+# 8895-8899 Unassigned
jmb-cds1 8900/udp # JMB-CDS 1
jmb-cds1 8900/tcp # JMB-CDS 1
jmb-cds2 8901/udp # JMB-CDS 2
@@ -11027,15 +11027,15 @@ xmltec-xmlmail 9091/tcp # xmltec-xmlmail
hp-pdl-datastr 9100/udp # PDL Data Streaming Port
hp-pdl-datastr 9100/tcp # PDL Data Streaming Port
# Shivaun Albright <shivaun_albright@hp.com> April 2002
-#### The protocol name "pdl-datastream" is primarily registered for use ####
+#### The protocol name "pdl-datastream" is primarily registered for use ####
#### in DNS SRV records (RFC 2782). DNS SRV records allow a protocol to run on ####
#### any port number, but the default port for this protocol is 9100 ####.
-pdl-datastream 9100/udp # Printer PDL Data Stream
-pdl-datastream 9100/tcp # Printer PDL Data Stream
+pdl-datastream 9100/udp # Printer PDL Data Stream
+pdl-datastream 9100/tcp # Printer PDL Data Stream
bacula-dir 9101/udp # Bacula Director
bacula-dir 9101/tcp # Bacula Director
bacula-fd 9102/udp # Bacula File Daemon
-bacula-fd 9102/tcp # Bacula File Daemon
+bacula-fd 9102/tcp # Bacula File Daemon
bacula-sd 9103/udp # Bacula Storage Daemon
bacula-sd 9103/tcp # Bacula Storage Daemon
# Kern Sibbald <kern@sibbald.com> January 2002
@@ -11089,7 +11089,7 @@ swtp-port2 9282/tcp # SofaWare transport port 2
# Amir Rapson <rapson@sofaware.com> February 2002
callwaveiam 9283/udp # CallWaveIAM
callwaveiam 9283/tcp # CallWaveIAM
-# Colin Kelley <cdk@callwave.com>
+# Colin Kelley <cdk@callwave.com>
visd 9284/udp # VERITAS Information Serve
visd 9284/tcp # VERITAS Information Serve
# Ravi Tavakely <ravi.tavakley@veritas.com> February 2002
@@ -11099,12 +11099,12 @@ n2h2server 9285/tcp # N2H2 Filter Service Port
# 9286 Unassigned
cumulus 9287/udp # Cumulus
cumulus 9287/tcp # Cumulus
-# Thomas Schleu <tschleu@canto.de>
+# Thomas Schleu <tschleu@canto.de>
# 9288-9291 Unassigned
armtechdaemon 9292/udp # ArmTech Daemon
armtechdaemon 9292/tcp # ArmTech Daemon
# Rohan Story <rohan@aurema.com>
-# 9293-9320 Unassigned
+# 9293-9320 Unassigned
guibase 9321/udp # guibase
guibase 9321/tcp # guibase
# Yutaka Ono <ono@saint.nm.fujitsu.co.jp>
@@ -11114,10 +11114,10 @@ mpidcmgr 9343/tcp # MpIdcMgr
mphlpdmc 9344/udp # Mphlpdmc
mphlpdmc 9344/tcp # Mphlpdmc
# Yutaka Ono <ono@saint.nm.fujitsu.co.jp>
-# 9345 Unassigned
+# 9345 Unassigned
ctechlicensing 9346/udp # C Tech Licensing
ctechlicensing 9346/tcp # C Tech Licensing
-# Reed Copsey, Jr. <reedc@ctech.com>
+# Reed Copsey, Jr. <reedc@ctech.com>
# 9347-9373 Unassigned
fjdmimgr 9374/udp # fjdmimgr
fjdmimgr 9374/tcp # fjdmimgr
@@ -11154,7 +11154,7 @@ streamcomm-ds 9612/tcp # StreamComm User Directory
l5nas-parchan 9747/udp # L5NAS Parallel Channel
l5nas-parchan 9747/tcp # L5NAS Parallel Channel
# Lawrence J. Dickson - Land-5 Corporation
-# <ldickson@land-5.com> March 2002
+# <ldickson@land-5.com> March 2002
# 9748-9752 Unassigned
rasadv 9753/udp # rasadv
rasadv 9753/tcp # rasadv
@@ -11181,7 +11181,7 @@ 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/sctp # IUA
iua 9900/udp # IUA
iua 9900/tcp # IUA
# Lyndon Ong <LyOng@ciena.com>
@@ -11192,12 +11192,12 @@ domaintime 9909/tcp # domaintime
# 9910 Unassigned
sype-transport 9911/udp # SYPECom Transport Protocol
sype-transport 9911/tcp # SYPECom Transport Protocol
-# Sylvain Pedneault <sylvain@sypecom.qc.ca> March 2003
+# Sylvain Pedneault <sylvain@sypecom.qc.ca> March 2003
# 9912-9949 Unassigned
apc-9950 9950/udp # APC 9950
apc-9950 9950/tcp # APC 9950
apc-9951 9951/udp # APC 9951
-apc-9951 9951/tcp # APC 9951
+apc-9951 9951/tcp # APC 9951
apc-9952 9952/udp # APC 9952
apc-9952 9952/tcp # APC 9952
# American Power Conversion <ports@apcc.com>
@@ -11234,8 +11234,8 @@ octopus 10008/udp # Octopus Multiplexer
octopus 10008/tcp # Octopus Multiplexer
# Chris Koeritz <fred@gruntose.com> October 2002
# 10009-10079 Unassigned
-amanda 10080/udp # Amanda
-amanda 10080/tcp # Amanda
+amanda 10080/udp # Amanda
+amanda 10080/tcp # Amanda
# John Jackson <jrj@gandalf.cc.purdue.edu>
# <amanda-core@amanda.org>
# 10081-10100 Unassigned
@@ -11251,7 +11251,7 @@ netiq-endpoint 10113/udp # NetIQ Endpoint
netiq-endpoint 10113/tcp # NetIQ Endpoint
netiq-qcheck 10114/udp # NetIQ Qcheck
netiq-qcheck 10114/tcp # NetIQ Qcheck
-# John Wood <John.Wood@netiq.com>
+# John Wood <John.Wood@netiq.com>
netiq-endpt 10115/udp # NetIQ Endpoint
netiq-endpt 10115/tcp # NetIQ Endpoint
# Gary Weichinger <gary.weichinger@netiq.com>
@@ -11261,7 +11261,7 @@ netiq-voipa 10116/tcp # NetIQ VoIP Assessor
# 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>
+# Dima Seliverstov <Dima_Seliverstov@bmc.com>
# 10129-10259 Unassigned
axis-wimp-port 10260/udp # Axis WIMP Port
axis-wimp-port 10260/tcp # Axis WIMP Port
@@ -11307,7 +11307,7 @@ atm-uhas 11367/tcp # ATM UHAS
# 11368-11370 Unassigned
hkp 11371/udp # OpenPGP HTTP Keyserver
hkp 11371/tcp # OpenPGP HTTP Keyserver
-# David Shaw <dshaw@jabberwocky.com> May 2003
+# David Shaw <dshaw@jabberwocky.com> May 2003
# 11372-11599 Unassigned
tempest-port 11600/udp # Tempest Protocol Port
tempest-port 11600/tcp # Tempest Protocol Port
@@ -11320,7 +11320,7 @@ h323callsigalt 11720/tcp # h323 Call Signal Alternate
intrepid-ssl 11751/udp # Intrepid SSL
intrepid-ssl 11751/tcp # Intrepid SSL
# Robert Eden <reden@sieglertech.com> March 2003
-# 11752-11966 Unassigned
+# 11752-11966 Unassigned
sysinfo-sp 11967/udp # SysInfo Sercice Protocol
sysinfo-sp 11967/tcp # SysInfo Service Protocol
# Mike Cooper <mcooper@magnicomp.com> March 2003
@@ -11344,7 +11344,7 @@ dbisamserver2 12006/tcp # DBISAM Database Server - Admin
# 12007-12108 Unassigned
rets-ssl 12109/udp # RETS over SSL
rets-ssl 12109/tcp # RETS over SSL
-# Bruce Toback <btoback@optc.com> February 2003
+# Bruce Toback <btoback@optc.com> February 2003
# 12110-12171 Unassigned
hivep 12172/udp # HiveP
hivep 12172/tcp # HiveP
@@ -11354,14 +11354,14 @@ italk 12345/udp # Italk Chat System
italk 12345/tcp # Italk Chat System
# Takayuki Ito <yuki@euc.jp>
# 12346-12752 Unassigned
-tsaf 12753/udp # tsaf port
-tsaf 12753/tcp # tsaf port
+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>
-# 13161-13222 Unassigned
+# 13161-13222 Unassigned
powwow-client 13223/udp # PowWow Client
powwow-client 13223/tcp # PowWow Client
powwow-server 13224/udp # PowWow Server
@@ -11379,8 +11379,8 @@ bpjava-msvc 13722/tcp # BP Java MSVC Protocol
# 13723 Unassigned
vnetd 13724/udp # Veritas Network Utility
vnetd 13724/tcp # Veritas Network Utility
-# Jeff Holmbeck <Jeff.Holmbeck@veritas.com>
-# 13725-13781 Unassigned
+# Jeff Holmbeck <Jeff.Holmbeck@veritas.com>
+# 13725-13781 Unassigned
bpcd 13782/udp # VERITAS NetBackup
bpcd 13782/tcp # VERITAS NetBackup
vopied 13783/udp # VOPIED Protocol
@@ -11410,7 +11410,7 @@ sage-best-com1 14033/tcp # sage Best! Config Server 1
sage-best-com2 14034/udp # sage Best! Config Server 2
sage-best-com2 14034/tcp # sage Best! Config Server 2
# Christian Rubach <Christian_Rubach@bestsoftware.com>
-# 14035-14140 Unassigned
+# 14035-14140 Unassigned
vcs-app 14141/udp # VCS Application
vcs-app 14141/tcp # VCS Application
# Ming Xu <ming@veritas.com>
@@ -11431,11 +11431,11 @@ hde-lcesrvr-2 14937/tcp # hde-lcesrvr-2
# 14938-14999 Unassigned
hydap 15000/udp # Hypack Data Aquisition
hydap 15000/tcp # Hypack Data Aquisition
-# Mircea Neacsu <mircea@videotron.ca>
+# Mircea Neacsu <mircea@videotron.ca>
# 15001-15344 Unassigned
xpilot 15345/udp # XPilot Contact Port
xpilot 15345/tcp # XPilot Contact Port
-# Bert Gijsbers <bert@xpilot.org>
+# Bert Gijsbers <bert@xpilot.org>
# 15346-15362 Unassigned
3link 15363/udp # 3Link Negotiation
3link 15363/tcp # 3Link Negotiation
@@ -11455,14 +11455,14 @@ netserialext4 16368/tcp # netserialext4
# 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>
+# Jane Dashevsky <jane.dashevsky@intel.com>
# 16992-17006 Unassigned
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>
+# Richard Snider <rsnider@sounds.com>
# 17186-17218 Unassigned
chipper 17219/udp # Chipper
chipper 17219/tcp # Chipper
@@ -11501,13 +11501,13 @@ ique 18769/udp # IQue Protocol
ique 18769/tcp # IQue Protocol
# Avi Drissman <avi_drissman@baseview.com> July 2002
# 18770-18887 Unassigned
-apc-necmp 18888/udp # APCNECMP
-apc-necmp 18888/tcp # APCNECMP
+apc-necmp 18888/udp # APCNECMP
+apc-necmp 18888/tcp # APCNECMP
# Michael Yip <Michael.Yip@alcatel.com>
# 18889-19190 Unassigned
opsec-uaa 19191/udp # OPSEC UAA
opsec-uaa 19191/tcp # OPSEC UAA
-# Reuven Harrison <rnd_ana@checkpoint.com>
+# Reuven Harrison <rnd_ana@checkpoint.com>
# 19192-19193 Unassigned
ua-secureagent 19194/udp # UserAuthority SecureAgent
ua-secureagent 19194/tcp # UserAuthority SecureAgent
@@ -11532,7 +11532,7 @@ 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>
+# Gita Murthy <gita@cup.hp.com>
# 19413-19539 Unassigned
sxuptp 19540/udp # SXUPTP
sxuptp 19540/tcp # SXUPTP
@@ -11559,7 +11559,7 @@ track 20670/tcp # Track
# 20671-20998 Unassigned
athand-mmp 20999/udp # AT Hand MMP
athand-mmp 20999/tcp # At Hand MMP
-# Stepan Riha <stepan.riha@hand.com>
+# Stepan Riha <stepan.riha@hand.com>
# 20300-21589 Unassigned
vofr-gateway 21590/udp # VoFR Gateway
vofr-gateway 21590/tcp # VoFR Gateway
@@ -11580,7 +11580,7 @@ netspeak-acd 21848/tcp # NetSpeak Corp. Automatic Call Distribution
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
+# 21850-21999 Unassigned
snapenetio 22000/udp # SNAPenetIO
snapenetio 22000/tcp # SNAPenetIO
optocontrol 22001/udp # OptoControl
@@ -11637,16 +11637,16 @@ binkp 24554/tcp # BINKP
# 24554-34676 Unassigned
flashfiler 24677/udp # FlashFiler
flashfiler 24677/tcp # FlashFiler
-# Ben Oram <beno@turbopower.com>
+# Ben Oram <beno@turbopower.com>
proactivate 24678/udp # Turbopower Proactivate
proactivate 24678/tcp # Turbopower Proactivate
# Ben Oram <beno@turbopower.com>
# 24679-24921 Unassigned
snip 24922/udp # Simple Net Ident Protocol
snip 24922/tcp # Simple Net Ident Protocol
-# Jean-Paul Moreaux
+# Jean-Paul Moreaux
# <jean-paul.moreaux@airbus.dasa.de>
-# 24923-24999 Unassigned
+# 24923-24999 Unassigned
icl-twobase1 25000/udp # icl-twobase1
icl-twobase1 25000/tcp # icl-twobase1
icl-twobase2 25001/udp # icl-twobase2
@@ -11668,9 +11668,9 @@ icl-twobase9 25008/tcp # icl-twobase9
icl-twobase10 25009/udp # icl-twobase10
icl-twobase10 25009/tcp # icl-twobase10
# J. A. (Tony) Sever <J.A.Sever@bra0119.wins.icl.co.uk>
-# 25010-25792 Unassigned
+# 25010-25792 Unassigned
vocaltec-hos 25793/udp # Vocaltec Address Server
-vocaltec-hos 25793/tcp # Vocaltec Address Server
+vocaltec-hos 25793/tcp # Vocaltec Address Server
# Scott Petrack <Scott_Petrack@vocaltec.com>
# 25794-25900 Unassigned
niobserver 25901/udp # NIObserver
@@ -11683,7 +11683,7 @@ niprobe 25903/tcp # NIProbe
# 25904-25999 Unassigned
quake 26000/udp # quake
quake 26000/tcp # quake
-# Yasunari Gon Yamasita <yamasita@omronsoft.co.jp>
+# Yasunari Gon Yamasita <yamasita@omronsoft.co.jp>
# 26001-26207 Unassigned
wnn6-ds 26208/udp # wnn6-ds
wnn6-ds 26208/tcp # wnn6-ds
@@ -11700,8 +11700,8 @@ k3software-cli 26263/udp # K3 Software-Client
k3software-cli 26263/tcp # K3 Software-Client
# Jim Baldridge <jimb@rpower.com>
gserver 26264/udp # Gserver
-gserver 26264/tcp # Gserver
-# Szanto Gabor <sgabor90@hotmail.com>
+gserver 26264/tcp # Gserver
+# Szanto Gabor <sgabor90@hotmail.com>
# 26265-26999 Unassigned
# Daniel Birns <daniel@globes.com>
# 27010-27344 Unassigned
@@ -11714,14 +11714,14 @@ kopek-httphead 27504/tcp # Kopek HTTP Head Port
# Sten H. Danielsen <shd@kopek.net> July 2002
# 27505-27998 Unassigned
tw-auth-key 27999/udp # Attribute Certificate Services
-tw-auth-key 27999/tcp # TW Authentication/Key Distribution and
-# Alex Duncan <Alex.Duncan@sse.ie>
+tw-auth-key 27999/tcp # TW Authentication/Key Distribution and
+# Alex Duncan <Alex.Duncan@sse.ie>
# 28000-30000 Unassigned
pago-services1 30001/udp # Pago Services 1
pago-services1 30001/tcp # Pago Services 1
pago-services2 30002/udp # Pago Services 2
pago-services2 30002/tcp # Pago Services 2
-# Balduin Mueller-Platz
+# Balduin Mueller-Platz
# <balduin.mueller-platz@pago.de> March 2002
# 30003-31415 Unassigned
xqosd 31416/udp # XQoS network monitor
@@ -11747,7 +11747,7 @@ filenet-rmi 32771/udp # FileNet RMI
filenet-rmi 32771/tcp # FileNET RMI
# Chris Adkins <cadkins@filenet.com>
filenet-pa 32772/udp # FileNET Process Analyzer
-filenet-pa 32772/tcp # FileNET Process Analyzer
+filenet-pa 32772/tcp # FileNET Process Analyzer
# Chris Adkins <cadkins@filenet.com> January 2003
# 32773-32895 Unassigned
idmgratm 32896/udp # Attachmate ID Manager
@@ -11784,7 +11784,7 @@ turbonote-1 39681/tcp # TurboNote Default Port
# 39682-40840 Unassigned
cscp 40841/udp # CSCP
cscp 40841/tcp # CSCP
-# Michael Dodge <sarge@centerspan.com>
+# Michael Dodge <sarge@centerspan.com>
csccredir 40842/udp # CSCCREDIR
csccredir 40842/tcp # CSCCREDIR
csccfirewall 40843/udp # CSCCFIREWALL
@@ -11818,7 +11818,7 @@ rockwell-encap 44818/tcp # Rockwell Encapsulation
# Brian Batke <babatke@ra.rockwell.com>
# 44819-45053 Unassigned
invision-ag 45054/udp # InVision AG
-invision-ag 45054/tcp # InVision AG
+invision-ag 45054/tcp # InVision AG
# Matthias Schroer <matthias.schroer@invision.de>
# 45055-45677 Unassigned
eba 45678/udp # EBA PRISE
@@ -11831,7 +11831,7 @@ ssr-servermgr 45966/tcp # SSRServerMgr
# 45967-46999 Unassigned
mbus 47000/udp # Message Bus
mbus 47000/tcp # Message Bus
-# Dirk Kutscher <dku@informatik.uni-bremen.de>
+# Dirk Kutscher <dku@informatik.uni-bremen.de>
# 47001-47556 Unassigned
dbbrowse 47557/udp # Databeam Corporation
dbbrowse 47557/tcp # Databeam Corporation
@@ -11862,5 +11862,5 @@ nimgtw 48003/tcp # Nimbus Gateway
com-bardac-dw 48556/udp # com-bardac-dw
com-bardac-dw 48556/tcp # com-bardac-dw
# Nicholas J Howes <nick@ghostwood.org>
-# 48557-49150 Unassigned
+# 48557-49150 Unassigned
# 49151 IANA Reserved
diff --git a/test/language/ast/resource_reference.rb b/test/language/ast/resource_reference.rb
index 44c23fd2b..47b49d1e0 100755
--- a/test/language/ast/resource_reference.rb
+++ b/test/language/ast/resource_reference.rb
@@ -12,7 +12,7 @@ class TestASTResourceReference < Test::Unit::TestCase
include PuppetTest
include PuppetTest::ParserTesting
AST = Puppet::Parser::AST
-
+
def newref(type, title)
AST::ResourceReference.new(:type => type, :title => AST::String.new(:value => title))
end
diff --git a/test/language/ast/selector.rb b/test/language/ast/selector.rb
index 0c9a6e675..d2b1622d2 100755
--- a/test/language/ast/selector.rb
+++ b/test/language/ast/selector.rb
@@ -12,26 +12,26 @@ class TestSelector < Test::Unit::TestCase
include PuppetTest
include PuppetTest::ParserTesting
AST = Puppet::Parser::AST
-
+
def test_evaluate
scope = mkscope
upperparam = nameobj("MYPARAM")
lowerparam = nameobj("myparam")
-
+
should = {"MYPARAM" => "upper", "myparam" => "lower"}
-
+
maker = Proc.new do
{
:default => AST::ResourceParam.new(:param => AST::Default.new(:value => "default"), :value => FakeAST.new("default")),
:lower => AST::ResourceParam.new(:param => FakeAST.new("myparam"), :value => FakeAST.new("lower")),
:upper => AST::ResourceParam.new(:param => FakeAST.new("MYPARAM"), :value => FakeAST.new("upper")),
}
-
+
end
-
+
# Start out case-sensitive
Puppet[:casesensitive] = true
-
+
%w{MYPARAM myparam}.each do |str|
param = nameobj(str)
params = maker.call()
@@ -40,10 +40,10 @@ class TestSelector < Test::Unit::TestCase
assert_nothing_raised { result = sel.evaluate(scope) }
assert_equal(should[str], result, "did not case-sensitively match %s" % str)
end
-
+
# then insensitive
Puppet[:casesensitive] = false
-
+
%w{MYPARAM myparam}.each do |str|
param = nameobj(str)
params = maker.call()
diff --git a/test/language/ast/variable.rb b/test/language/ast/variable.rb
index 7aef2a8c2..17e078b32 100755
--- a/test/language/ast/variable.rb
+++ b/test/language/ast/variable.rb
@@ -12,7 +12,7 @@ class TestVariable < Test::Unit::TestCase
include PuppetTest
include PuppetTest::ParserTesting
AST = Puppet::Parser::AST
-
+
def setup
super
@interp = mkinterp
diff --git a/test/language/functions.rb b/test/language/functions.rb
index 7e153ec3d..030928618 100755
--- a/test/language/functions.rb
+++ b/test/language/functions.rb
@@ -388,17 +388,17 @@ class TestLangFunctions < Test::Unit::TestCase
def test_realize
scope = mkscope
parser = scope.compiler.parser
-
+
realize = Puppet::Parser::Functions.function(:realize)
# Make a definition
parser.newdefine("mytype")
-
+
[%w{file /tmp/virtual}, %w{mytype yay}].each do |type, title|
# Make a virtual resource
virtual = mkresource(:type => type, :title => title,
:virtual => true, :params => {}, :scope => scope)
-
+
scope.compiler.add_resource(scope, virtual)
ref = Puppet::Parser::Resource::Reference.new(
@@ -442,39 +442,39 @@ class TestLangFunctions < Test::Unit::TestCase
assert_equal([none.to_s], scope.compiler.collections[0].resources,
"Did not set resources in collection")
end
-
+
def test_defined
scope = mkscope
parser = scope.compiler.parser
defined = Puppet::Parser::Functions.function(:defined)
-
+
parser.newclass("yayness")
parser.newdefine("rahness")
-
+
assert_nothing_raised do
assert(scope.function_defined("yayness"), "yayness class was not considered defined")
assert(scope.function_defined("rahness"), "rahness definition was not considered defined")
assert(scope.function_defined("service"), "service type was not considered defined")
assert(! scope.function_defined("fakness"), "fakeness was considered defined")
end
-
+
# Now make sure any match in a list will work
assert(scope.function_defined(["booness", "yayness", "fakeness"]),
"A single answer was not sufficient to return true")
-
+
# and make sure multiple falses are still false
assert(! scope.function_defined(%w{no otherno stillno}),
"Multiple falses were somehow true")
-
+
# Now make sure we can test resources
scope.compiler.add_resource(scope, mkresource(:type => "file", :title => "/tmp/rahness",
:scope => scope, :source => scope.source,
:params => {:owner => "root"}))
-
+
yep = Puppet::Parser::Resource::Reference.new(:type => "file", :title => "/tmp/rahness")
nope = Puppet::Parser::Resource::Reference.new(:type => "file", :title => "/tmp/fooness")
-
+
assert(scope.function_defined([yep]), "valid resource was not considered defined")
assert(! scope.function_defined([nope]), "invalid resource was considered defined")
end
@@ -482,7 +482,7 @@ class TestLangFunctions < Test::Unit::TestCase
def test_search
parser = mkparser
scope = mkscope(:parser => parser)
-
+
fun = parser.newdefine("yay::ness")
foo = parser.newdefine("foo::bar")
diff --git a/test/language/parser.rb b/test/language/parser.rb
index 01b18acd9..acb20c985 100755
--- a/test/language/parser.rb
+++ b/test/language/parser.rb
@@ -308,7 +308,7 @@ class TestParser < Test::Unit::TestCase
f.puts %{
node nodeA, nodeB {
file { "#{other}": ensure => file }
-
+
}
}
end
@@ -403,7 +403,7 @@ file { "/tmp/yayness":
}
sub = parser.classes["container::deep::sub"]
assert(sub, "Could not find sub")
-
+
# Now try it with a parent class being a fq class
assert_nothing_raised {
parser.parse "class container::one inherits container::deep::sub {}"
@@ -411,7 +411,7 @@ file { "/tmp/yayness":
sub = parser.classes["container::one"]
assert(sub, "Could not find one")
assert_equal("container::deep::sub", sub.parentclass)
-
+
# Finally, try including a qualified class
assert_nothing_raised("Could not include fully qualified class") {
parser.parse "include container::deep::sub"
@@ -635,7 +635,7 @@ file { "/tmp/yayness":
assert(code.length == 1, "Did not get the file")
assert_instance_of(Puppet::TransObject, code[0])
end
-
+
def test_fully_qualified_definitions
parser = mkparser
@@ -643,7 +643,7 @@ file { "/tmp/yayness":
parser.parse %{define one::two { }}
}
assert(parser.definitions["one::two"], "Could not find one::two with no namespace")
-
+
# Now try using the definition
assert_nothing_raised("Could not parse fully-qualified definition usage") {
parser.parse %{one::two { yayness: }}
@@ -792,7 +792,7 @@ file { "/tmp/yayness":
def test_parse
parser = mkparser
- str = "file { '/tmp/yay': ensure => file }\nclass yay {}\nnode foo {}\ndefine bar {}\n"
+ str = "file { '/tmp/yay': ensure => file }\nclass yay {}\nnode foo {}\ndefine bar {}\n"
result = nil
assert_nothing_raised("Could not parse") do
result = parser.parse(str)
@@ -1004,7 +1004,7 @@ file { "/tmp/yayness":
end
end
end
-
+
# Now make sure we get appropriate behaviour with parent class conflicts.
def test_newclass_parentage
parser = mkparser
@@ -1199,17 +1199,17 @@ file { "/tmp/yayness":
assert_instance_of(AST::Definition, klass, "Did not autoload definition from its own file")
assert_equal("mymod::mydefine", klass.classname, "Incorrect definition was returned")
end
-
+
# Make sure class, node, and define methods are case-insensitive
def test_structure_case_insensitivity
parser = mkparser
-
+
result = nil
assert_nothing_raised do
result = parser.newclass "Yayness"
end
assert_equal(result, parser.findclass("", "yayNess"))
-
+
assert_nothing_raised do
result = parser.newdefine "FunTest"
end
@@ -1225,7 +1225,7 @@ file { "/tmp/yayness":
Puppet::Parser::Files.expects(:find_manifests).with("test", {:cwd => ".", :environment => "something"}).returns([])
assert_raise(Puppet::ImportError) do
- parser.import("test")
+ parser.import("test")
end
end
diff --git a/test/language/scope.rb b/test/language/scope.rb
index 32e1802a8..debef44bf 100755
--- a/test/language/scope.rb
+++ b/test/language/scope.rb
@@ -96,7 +96,7 @@ class TestScope < Test::Unit::TestCase
scope.setvar("var", "yep")
assert_equal("yep", scope.lookupvar("var"), "did not retrieve value correctly")
- # Now test the parent lookups
+ # Now test the parent lookups
subscope = mkscope :parser => parser
subscope.parent = scope
assert_equal("", subscope.lookupvar("nope"), "scope did not default to string with parent")
@@ -216,7 +216,7 @@ class TestScope < Test::Unit::TestCase
assert_equal(top, sub.parent, "Did not find parent scope correctly")
assert_equal(top, sub.parent, "Did not find parent scope on second call")
end
-
+
def test_strinterp
# Make and evaluate our classes so the qualified lookups work
parser = mkparser
diff --git a/test/language/snippets.rb b/test/language/snippets.rb
index 64681d6f9..87ad9e770 100755
--- a/test/language/snippets.rb
+++ b/test/language/snippets.rb
@@ -50,7 +50,7 @@ class TestSnippets < Test::Unit::TestCase
def snippet(name)
File.join(self.class.snippetdir, name)
end
-
+
def file2ast(file)
parser = Puppet::Parser::Parser.new()
parser.file = file
@@ -142,7 +142,7 @@ class TestSnippets < Test::Unit::TestCase
def disabled_test_defaults
Puppet::Type.eachtype { |type|
next if type.name == :puppet or type.name == :component
-
+
rands = randeach(type)
name = type.name.to_s.capitalize
@@ -417,7 +417,7 @@ class TestSnippets < Test::Unit::TestCase
assert_file("/tmp/virtualtest#{num}")
end
end
-
+
def snippet_componentrequire
%w{1 2}.each do |num|
assert_file("/tmp/testing_component_requires#{num}",
@@ -470,7 +470,7 @@ class TestSnippets < Test::Unit::TestCase
assert_file("/tmp/multipleclassone", "one")
assert_file("/tmp/multipleclasstwo", "two")
end
-
+
def snippet_multilinecomments
assert_not_file("/tmp/multilinecomments","Did create a commented resource");
end
diff --git a/test/lib/puppettest.rb b/test/lib/puppettest.rb
index 8c1eed910..786c37074 100755
--- a/test/lib/puppettest.rb
+++ b/test/lib/puppettest.rb
@@ -8,7 +8,7 @@ $LOAD_PATH.unshift(mainlib) unless $LOAD_PATH.include?(mainlib)
require 'puppet'
# include any gems in vendor/gems
-Dir["#{mainlib}/../vendor/gems/**"].each do |path|
+Dir["#{mainlib}/../vendor/gems/**"].each do |path|
libpath = File.join(path, "lib")
if File.directory?(libpath)
$LOAD_PATH.unshift(libpath)
@@ -138,7 +138,7 @@ module PuppetTest
ENV["RUBYLIB"] = curlibs.join(":")
end
-
+
def logcollector
collector = []
Puppet::Util::Log.newdestination(collector)
@@ -217,7 +217,7 @@ module PuppetTest
end
Puppet::Util::Log.level = :debug
#$VERBOSE = 1
- #else
+ #else
# Puppet::Util::Log.close
# Puppet::Util::Log.newdestination(@logs)
# Puppet[:httplog] = tempfile()
@@ -240,7 +240,7 @@ module PuppetTest
@@tmpfiles << f
return f
end
-
+
def textmate?
if ENV["TM_FILENAME"]
return true
diff --git a/test/lib/puppettest/certificates.rb b/test/lib/puppettest/certificates.rb
index fbd18e997..3ba052505 100644
--- a/test/lib/puppettest/certificates.rb
+++ b/test/lib/puppettest/certificates.rb
@@ -42,9 +42,9 @@ module PuppetTest::Certificates
cert = Puppet::SSLCertificates::Certificate.new(:name => hostname)
cert.mkcsr
}
-
+
return cert
- end
+ end
def mksignedcert(ca = nil, hostname = nil)
ca ||= mkCA()
diff --git a/test/lib/puppettest/fakes.rb b/test/lib/puppettest/fakes.rb
index 739b098bc..db6ca4d80 100644
--- a/test/lib/puppettest/fakes.rb
+++ b/test/lib/puppettest/fakes.rb
@@ -153,7 +153,7 @@ module PuppetTest
end
return ret
- end
+ end
def store(hash)
hash.each do |n, v|
diff --git a/test/lib/puppettest/parsertesting.rb b/test/lib/puppettest/parsertesting.rb
index 1a08ecbae..666de076a 100644
--- a/test/lib/puppettest/parsertesting.rb
+++ b/test/lib/puppettest/parsertesting.rb
@@ -14,7 +14,7 @@ module PuppetTest::ParserTesting
def evaluated?
defined? @evaluated and @evaluated
end
-
+
def evaluate(*args)
@evaluated = true
return @evaluate
@@ -25,7 +25,7 @@ module PuppetTest::ParserTesting
@evaluate = val
end
end
-
+
def reset
@evaluated = nil
end
@@ -34,7 +34,7 @@ module PuppetTest::ParserTesting
evaluate()
end
end
-
+
def astarray(*args)
AST::ASTArray.new(
:children => args
diff --git a/test/lib/puppettest/railstesting.rb b/test/lib/puppettest/railstesting.rb
index a9d8601f3..fb5c15f51 100644
--- a/test/lib/puppettest/railstesting.rb
+++ b/test/lib/puppettest/railstesting.rb
@@ -26,7 +26,7 @@ module PuppetTest::RailsTesting
def railsresource(type = "file", title = "/tmp/testing", params = {})
railsteardown
railsinit
-
+
# We need a host for resources
#host = Puppet::Rails::Host.new(:name => Facter.value("hostname"))
@@ -39,12 +39,12 @@ module PuppetTest::RailsTesting
facts = Facter.to_hash
# Now try storing our crap
- host = nil
+ host = nil
node = mknode(facts["hostname"])
node.parameters = facts
assert_nothing_raised {
host = Puppet::Rails::Host.store(node, resources)
- }
+ }
# Now save the whole thing
host.save
diff --git a/test/lib/puppettest/servertest.rb b/test/lib/puppettest/servertest.rb
index 11c24f5b4..d658ddba7 100644
--- a/test/lib/puppettest/servertest.rb
+++ b/test/lib/puppettest/servertest.rb
@@ -63,7 +63,7 @@ module PuppetTest::ServerTest
@@tmppids << spid
# give the server a chance to do its thing
- sleep 1
+ sleep 1
return spid
end
diff --git a/test/lib/puppettest/support/assertions.rb b/test/lib/puppettest/support/assertions.rb
index 2159c8d3e..052c6b42d 100644
--- a/test/lib/puppettest/support/assertions.rb
+++ b/test/lib/puppettest/support/assertions.rb
@@ -15,7 +15,7 @@ module PuppetTest
def assert_uid_gid(uid, gid, filename)
flunk "Must be uid 0 to run these tests" unless Process.uid == 0
- fork do
+ fork do
Puppet::Util::SUIDManager.gid = gid
Puppet::Util::SUIDManager.uid = uid
# FIXME: use the tempfile method from puppettest.rb
@@ -30,7 +30,7 @@ module PuppetTest
f = File.open(filename, "r")
- a = f.readlines
+ a = f.readlines
assert_equal(uid, a[0].chomp.to_i, "UID was incorrect")
assert_equal(gid, a[1].chomp.to_i, "GID was incorrect")
FileUtils.rm(filename)
diff --git a/test/lib/puppettest/support/resources.rb b/test/lib/puppettest/support/resources.rb
index a2beee98d..865995507 100755
--- a/test/lib/puppettest/support/resources.rb
+++ b/test/lib/puppettest/support/resources.rb
@@ -7,14 +7,14 @@ module PuppetTest::Support::Resources
def tree_resource(name)
Puppet::Type.type(:file).new :title => name, :path => "/tmp/#{name}", :mode => 0755
end
-
+
def tree_container(name)
Puppet::Type::Component.create :name => name, :type => "yay"
end
-
+
def treenode(config, name, *resources)
comp = tree_container name
- resources.each do |resource|
+ resources.each do |resource|
if resource.is_a?(String)
resource = tree_resource(resource)
end
@@ -23,7 +23,7 @@ module PuppetTest::Support::Resources
end
return comp
end
-
+
def mktree
catalog = Puppet::Resource::Catalog.new do |config|
one = treenode(config, "one", "a", "b")
@@ -31,7 +31,7 @@ module PuppetTest::Support::Resources
middle = treenode(config, "middle", "e", "f", two)
top = treenode(config, "top", "g", "h", middle, one)
end
-
+
return catalog
end
end
diff --git a/test/network/handler/bucket.rb b/test/network/handler/bucket.rb
index 1a7063366..24e70cf01 100755
--- a/test/network/handler/bucket.rb
+++ b/test/network/handler/bucket.rb
@@ -106,7 +106,7 @@ class TestBucket < Test::Unit::TestCase
end
%w{
- who bash sh uname /etc/passwd /etc/syslog.conf /etc/hosts
+ who bash sh uname /etc/passwd /etc/syslog.conf /etc/hosts
}.each { |file|
# if it's fully qualified, just add it
if file =~ /^\//
@@ -251,7 +251,7 @@ class TestBucket < Test::Unit::TestCase
dir = File.join(@bucket, dirs, md5)
filedir, contents, paths = bucket.class.paths(@bucket, md5)
- assert_equal(dir, filedir, "did not use a deeper file structure")
+ assert_equal(dir, filedir, "did not use a deeper file structure")
assert_equal(File.join(dir, "contents"), contents,
"content path is not the deeper version")
assert_equal(File.join(dir, "paths"), paths,
diff --git a/test/network/handler/fileserver.rb b/test/network/handler/fileserver.rb
index 47f848ed2..a6c678683 100755
--- a/test/network/handler/fileserver.rb
+++ b/test/network/handler/fileserver.rb
@@ -50,7 +50,7 @@ class TestFileServer < Test::Unit::TestCase
File.open(name, "w") { |f|
f.puts rand(100)
}
-
+
name
}
@@ -463,7 +463,7 @@ class TestFileServer < Test::Unit::TestCase
File.open(conffile, "w") { |f|
f.print "# a test config file
-
+
[thing]
path #{basedir}/thing
allow 192.168.0.*
@@ -481,7 +481,7 @@ class TestFileServer < Test::Unit::TestCase
"
}
-
+
# create a server with the file
assert_nothing_raised {
@@ -593,7 +593,7 @@ class TestFileServer < Test::Unit::TestCase
File.open(conffile, "w") { |f|
f.print text
}
-
+
# create a server with the file
server = nil
@@ -614,7 +614,7 @@ class TestFileServer < Test::Unit::TestCase
File.open(conffile, "w") { |f|
f.print text
}
-
+
# create a server with the file
server = nil
@@ -638,13 +638,13 @@ class TestFileServer < Test::Unit::TestCase
files = mktestfiles(dir)
File.open(conffile, "w") { |f|
f.print "# a test config file
-
+
[thing]
path #{dir}
allow test1.domain.com
"
}
-
+
# Reset the timeout, so we reload faster
Puppet[:filetimeout] = 0.5
@@ -671,13 +671,13 @@ class TestFileServer < Test::Unit::TestCase
sleep 1
File.open(conffile, "w") { |f|
f.print "# a test config file
-
+
[thing]
path #{dir}
allow test2.domain.com
"
}
-
+
assert_raise(Puppet::AuthorizationError, "List allowed invalid host") {
list = server.list("/thing/", :manage, false, false,
"test1.domain.com", "127.0.0.1")
@@ -773,12 +773,12 @@ class TestFileServer < Test::Unit::TestCase
client1_hostdir => "client1\n",
client2_fqdndir => client2 + "\n"
}
- [fsdir, hostdir, fqdndir,
+ [fsdir, hostdir, fqdndir,
client1_hostdir, client2_fqdndir].each { |d| Dir.mkdir(d) }
-
+
[client1_hostdir, client2_fqdndir].each do |d|
- File.open(File.join(d, "file.txt"), "w") do |f|
- f.print contents[d]
+ File.open(File.join(d, "file.txt"), "w") do |f|
+ f.print contents[d]
end
end
conffile = tempfile()
@@ -946,7 +946,7 @@ allow *
result = check.call(client, pat, repl)
end
- # Now, check that they use Facter info
+ # Now, check that they use Facter info
Puppet.notice "The following messages are normal"
client = nil
Facter.stubs(:value).with(:ipaddress).returns("127.0.0.1")
diff --git a/test/network/server/webrick.rb b/test/network/server/webrick.rb
index 8b637c39f..5a930848d 100755
--- a/test/network/server/webrick.rb
+++ b/test/network/server/webrick.rb
@@ -65,7 +65,7 @@ class TestWebrickServer < Test::Unit::TestCase
}
assert_equal(1, retval)
end
-
+
def mk_status_client
client = nil
diff --git a/test/other/dsl.rb b/test/other/dsl.rb
index 3ef21a372..deafca791 100755
--- a/test/other/dsl.rb
+++ b/test/other/dsl.rb
@@ -75,7 +75,7 @@ class TestDSL < Test::Unit::TestCase
def test_evaluate
parent = child = nil
parenteval = childeval = nil
-
+
assert_nothing_raised do
parent = aspect :parent do
if parenteval
diff --git a/test/other/events.rb b/test/other/events.rb
index a954cd7f6..052afc0c9 100755
--- a/test/other/events.rb
+++ b/test/other/events.rb
@@ -107,14 +107,14 @@ class TestEvents < Test::Unit::TestCase
execs = [exec1, exec2, exec3]
config = mk_catalog(exec1,exec2,exec3)
-
+
trans = Puppet::Transaction.new(config)
execs.each do |e| assert(config.vertex?(e), "%s is not in graph" % e.title) end
trans.prepare
execs.each do |e| assert(config.vertex?(e), "%s is not in relgraph" % e.title) end
reverse = trans.relationship_graph.reversal
execs.each do |e| assert(reverse.vertex?(e), "%s is not in reversed graph" % e.title) end
-
+
config.apply
assert(FileTest.exists?(file), "File does not exist")
diff --git a/test/other/puppet.rb b/test/other/puppet.rb
index 2dcd7e576..1839333e5 100755
--- a/test/other/puppet.rb
+++ b/test/other/puppet.rb
@@ -9,7 +9,7 @@ require 'puppettest'
class TestPuppetModule < Test::Unit::TestCase
include PuppetTest
include SignalObserver
-
+
def mkfakeclient
Class.new(Puppet::Network::Client) do
def initialize
diff --git a/test/other/relationships.rb b/test/other/relationships.rb
index 976d6d894..b15ff5062 100755
--- a/test/other/relationships.rb
+++ b/test/other/relationships.rb
@@ -11,7 +11,7 @@ class TestRelationships < Test::Unit::TestCase
super
Puppet::Type.type(:exec)
end
-
+
def newfile
assert_nothing_raised() {
return Puppet::Type.type(:file).new(
@@ -20,7 +20,7 @@ class TestRelationships < Test::Unit::TestCase
)
}
end
-
+
def check_relationship(sources, targets, out, refresher)
if out
deps = sources.builddepends
@@ -31,17 +31,17 @@ class TestRelationships < Test::Unit::TestCase
end
assert_instance_of(Array, deps)
assert(! deps.empty?, "Did not receive any relationships")
-
+
deps.each do |edge|
assert_instance_of(Puppet::Relationship, edge)
end
-
+
sources.each do |source|
targets.each do |target|
edge = deps.find { |e| e.source == source and e.target == target }
assert(edge, "Could not find edge for %s => %s" %
[source.ref, target.ref])
-
+
if refresher
assert_equal(:ALL_EVENTS, edge.event)
assert_equal(:refresh, edge.callback)
@@ -56,12 +56,12 @@ class TestRelationships < Test::Unit::TestCase
def test_autorequire
# We know that execs autorequire their cwd, so we'll use that
path = tempfile()
-
+
file = Puppet::Type.type(:file).new(:title => "myfile", :path => path,
:ensure => :directory)
exec = Puppet::Type.newexec(:title => "myexec", :cwd => path,
:command => "/bin/echo")
-
+
catalog = mk_catalog(file, exec)
reqs = nil
assert_nothing_raised do
@@ -70,18 +70,18 @@ class TestRelationships < Test::Unit::TestCase
assert_instance_of(Puppet::Relationship, reqs[0], "Did not return a relationship edge")
assert_equal(file, reqs[0].source, "Did not set the autorequire source correctly")
assert_equal(exec, reqs[0].target, "Did not set the autorequire target correctly")
-
- # Now make sure that these relationships are added to the
+
+ # Now make sure that these relationships are added to the
# relationship graph
catalog.apply do |trans|
assert(catalog.relationship_graph.edge?(file, exec), "autorequire edge was not created")
end
end
-
+
# Testing #411. It was a problem with builddepends.
def test_missing_deps
file = Puppet::Type.type(:file).new :path => tempfile, :require => Puppet::Resource::Reference.new("file", "/no/such/file")
-
+
assert_raise(Puppet::Error) do
file.builddepends
end
diff --git a/test/other/report.rb b/test/other/report.rb
index a77c48362..692ed54b6 100755
--- a/test/other/report.rb
+++ b/test/other/report.rb
@@ -80,7 +80,7 @@ class TestReports < Test::Unit::TestCase
def test_store_report
# Create a bunch of log messages in an array.
report = Puppet::Transaction::Report.new
-
+
# We have to reuse reporting here because of something going on in the
# server/report.rb file
Puppet.settings.use(:main, :puppetmasterd)
@@ -143,31 +143,31 @@ class TestReports < Test::Unit::TestCase
else
$stderr.puts "Install RRD for metric reporting tests"
end
-
+
def test_tagmail_parsing
report = Object.new
report.extend(Puppet::Reports.report(:tagmail))
-
+
passers = File.join(datadir, "reports", "tagmail_passers.conf")
assert(FileTest.exists?(passers), "no passers file %s" % passers)
-
+
File.readlines(passers).each do |line|
assert_nothing_raised("Could not parse %s" % line.inspect) do
report.parse(line)
end
end
-
+
# Now make sure the failers fail
failers = File.join(datadir, "reports", "tagmail_failers.conf")
assert(FileTest.exists?(failers), "no failers file %s" % failers)
-
+
File.readlines(failers).each do |line|
assert_raise(ArgumentError, "Parsed %s" % line.inspect) do
report.parse(line)
end
end
end
-
+
def test_tagmail_parsing_results
report = Object.new
report.extend(Puppet::Reports.report(:tagmail))
@@ -179,27 +179,27 @@ class TestReports < Test::Unit::TestCase
"tag, !other: abuse@domain.com" => [%w{abuse@domain.com}, %w{tag}, %w{other}],
"tag, !other, one, !two: abuse@domain.com" => [%w{abuse@domain.com}, %w{tag one}, %w{other two}],
"tag: abuse@domain.com, other@domain.com" => [%w{abuse@domain.com other@domain.com}, %w{tag}, []]
-
+
}.each do |line, results|
assert_nothing_raised("Failed to parse %s" % line.inspect) do
assert_equal(results, report.parse(line).shift, "line %s returned incorrect results %s" % [line.inspect, results.inspect])
end
end
end
-
+
def test_tagmail_matching
report = Puppet::Transaction::Report.new
Puppet::Util::Log.close
[%w{one}, %w{one two}, %w{one two three}, %w{one two three four}].each do |tags|
log = Puppet::Util::Log.new(:level => :notice, :message => tags.join(" "), :tags => tags)
-
+
report << log
end
-
+
list = report.logs.collect { |l| l.to_report }
-
+
report.extend(Puppet::Reports.report(:tagmail))
-
+
{
[%w{abuse@domain.com}, %w{all}, []] => list,
[%w{abuse@domain.com}, %w{all}, %w{three}] => list[0..1],
@@ -212,7 +212,7 @@ class TestReports < Test::Unit::TestCase
assert_nothing_raised("Could not match with %s" % args.inspect) do
results = report.match([args])
end
-
+
if expected
assert_equal([args[0], expected.join("\n")], results[0], "did get correct results for %s" % args.inspect)
else
diff --git a/test/other/transactions.rb b/test/other/transactions.rb
index 8375145f9..6cb772d88 100755
--- a/test/other/transactions.rb
+++ b/test/other/transactions.rb
@@ -33,12 +33,12 @@ class TestTransactions < Test::Unit::TestCase
def log(msg)
end
end
-
-
+
+
def mkgenerator(&block)
$finished = []
cleanup { $finished = nil }
-
+
# Create a bogus type that generates new instances with shorter
type = Puppet::Type.newtype(:generator) do
newparam(:name, :namevar => true)
@@ -52,10 +52,10 @@ class TestTransactions < Test::Unit::TestCase
cleanup do
Puppet::Type.rmtype(:generator)
end
-
+
return type
end
-
+
# Create a new type that generates instances with shorter names.
def mkreducer(&block)
type = mkgenerator() do
@@ -69,11 +69,11 @@ class TestTransactions < Test::Unit::TestCase
ret
end
end
-
+
if block
type.class_eval(&block)
end
-
+
return type
end
@@ -126,7 +126,7 @@ class TestTransactions < Test::Unit::TestCase
type = Puppet::Type.newtype(name) do
newparam(:name) {}
end
-
+
cleanup do
Puppet::Type.rmtype(name)
end
@@ -140,7 +140,7 @@ class TestTransactions < Test::Unit::TestCase
# Now create an instance
inst = type.new :name => "yay"
-
+
# Create a transaction
trans = Puppet::Transaction.new(mk_catalog(inst))
@@ -545,17 +545,17 @@ class TestTransactions < Test::Unit::TestCase
config = mk_catalog(yay, rah)
trans = Puppet::Transaction.new(config)
-
+
assert_nothing_raised do
trans.generate
end
-
+
%w{ya ra y r}.each do |name|
assert(trans.catalog.vertex?(Puppet::Type.type(:generator)[name]),
"Generated %s was not a vertex" % name)
assert($finished.include?(name), "%s was not finished" % name)
end
-
+
# Now make sure that cleanup gets rid of those generated types.
assert_nothing_raised do
trans.cleanup
@@ -572,7 +572,7 @@ class TestTransactions < Test::Unit::TestCase
transaction = Puppet::Transaction.new(config)
assert(transaction.ignore_tags?, "Not ignoring tags when applying a non-host catalog")
end
-
+
def test_missing_tags?
resource = stub 'resource', :tagged? => true
config = Puppet::Resource::Catalog.new
@@ -588,7 +588,7 @@ class TestTransactions < Test::Unit::TestCase
transaction = Puppet::Transaction.new(config)
assert(! transaction.missing_tags?(resource), "Considered a resource to be missing tags when not running a host catalog")
- #
+ #
config.host_config = true
transaction = Puppet::Transaction.new(config)
assert(! transaction.missing_tags?(resource), "Considered a resource to be missing tags when running a host catalog and all tags are present")
@@ -597,7 +597,7 @@ class TestTransactions < Test::Unit::TestCase
resource.stubs :tagged? => false
assert(transaction.missing_tags?(resource), "Considered a resource not to be missing tags when running a host catalog and tags are missing")
end
-
+
# Make sure changes generated by eval_generated resources have proxies
# set to the top-level resource.
def test_proxy_resources
@@ -607,7 +607,7 @@ class TestTransactions < Test::Unit::TestCase
:path => :path, :is => "start_value", :should => "desired_value", :name => self.name, :resource => "fake_parent"), :is)
end
end
-
+
resource = type.new :name => "test"
config = mk_catalog(resource)
trans = Puppet::Transaction.new(config)
@@ -618,14 +618,14 @@ class TestTransactions < Test::Unit::TestCase
end
changes = trans.instance_variable_get("@changes")
-
+
assert(changes.length > 0, "did not get any changes")
-
+
changes.each do |change|
assert_equal(resource.object_id, change.resource.object_id, "change did not get proxy set correctly")
end
end
-
+
# Make sure changes in contained files still generate callback events.
def test_generated_callbacks
dir = tempfile()
@@ -635,12 +635,12 @@ class TestTransactions < Test::Unit::TestCase
File.open(file, "w") { |f| f.puts "" }
File.chmod(0644, file)
File.chmod(0755, dir) # So only the child file causes a change
-
+
dirobj = Puppet::Type.type(:file).new :mode => "755", :recurse => true, :path => dir
exec = Puppet::Type.type(:exec).new :title => "make",
:command => "touch #{maker}", :path => ENV['PATH'], :refreshonly => true,
:subscribe => dirobj
-
+
assert_apply(dirobj, exec)
assert(FileTest.exists?(maker), "Did not make callback file")
end
@@ -719,29 +719,29 @@ class TestTransactions < Test::Unit::TestCase
assert(trans.triggered?(c, :refresh),
"Transaction did not store the trigger")
end
-
+
def test_set_target
file = Puppet::Type.type(:file).new(:path => tempfile(), :content => "yay")
exec1 = Puppet::Type.type(:exec).new :command => "/bin/echo exec1"
exec2 = Puppet::Type.type(:exec).new :command => "/bin/echo exec2"
trans = Puppet::Transaction.new(mk_catalog(file, exec1, exec2))
-
+
# First try it with an edge that has no callback
edge = Puppet::Relationship.new(file, exec1)
assert_nothing_raised { trans.set_trigger(edge) }
assert(! trans.targeted?(exec1), "edge with no callback resulted in a target")
-
+
# Now with an edge that has an unsupported callback
edge = Puppet::Relationship.new(file, exec1, :callback => :nosuchmethod, :event => :ALL_EVENTS)
assert_nothing_raised { trans.set_trigger(edge) }
assert(! trans.targeted?(exec1), "edge with invalid callback resulted in a target")
-
+
# Lastly, with an edge with a supported callback
edge = Puppet::Relationship.new(file, exec1, :callback => :refresh, :event => :ALL_EVENTS)
assert_nothing_raised { trans.set_trigger(edge) }
assert(trans.targeted?(exec1), "edge with valid callback did not result in a target")
end
-
+
# Testing #401 -- transactions are calling refresh() on classes that don't support it.
def test_callback_availability
$called = []
@@ -758,9 +758,9 @@ class TestTransactions < Test::Unit::TestCase
file = Puppet::Type.type(:file).new :path => tempfile(), :content => "yay"
one = klass.new :name => "one", :subscribe => file
-
+
assert_apply(file, one)
-
+
assert(! $called.include?(:refresh), "Called refresh when it wasn't set as a method")
end
@@ -794,7 +794,7 @@ class TestTransactions < Test::Unit::TestCase
assert_apply(obj)
end
-
+
def test_self_refresh_causes_triggering
type = Puppet::Type.newtype(:refresher, :self_refresh => true) do
attr_accessor :refreshed, :testing
@@ -814,16 +814,16 @@ class TestTransactions < Test::Unit::TestCase
end
end
cleanup { Puppet::Type.rmtype(:refresher)}
-
+
obj = type.new(:name => "yay", :testing => "cool")
-
+
assert(! obj.insync?(obj.retrieve), "fake object is already in sync")
-
+
# Now make sure it gets refreshed when the change happens
assert_apply(obj)
assert(obj.refreshed, "object was not refreshed during transaction")
end
-
+
# Testing #433
def test_explicit_dependencies_beat_automatic
# Create a couple of different resource sets that have automatic relationships and make sure the manual relationships win
@@ -831,7 +831,7 @@ class TestTransactions < Test::Unit::TestCase
# First users and groups
group = Puppet::Type.type(:group).new(:name => nonrootgroup.name, :ensure => :present)
user = Puppet::Type.type(:user).new(:name => nonrootuser.name, :ensure => :present, :gid => group.title)
-
+
# Now add the explicit relationship
group[:require] = user
rels[group] = user
@@ -840,17 +840,17 @@ class TestTransactions < Test::Unit::TestCase
f = File.join(d, "file")
file = Puppet::Type.type(:file).new(:path => f, :content => "yay")
dir = Puppet::Type.type(:file).new(:path => d, :ensure => :directory, :require => file)
-
+
rels[dir] = file
rels.each do |after, before|
config = mk_catalog(before, after)
trans = Puppet::Transaction.new(config)
str = "from %s to %s" % [before, after]
-
+
assert_nothing_raised("Failed to create graph %s" % str) do
trans.prepare
end
-
+
graph = trans.relationship_graph
assert(graph.edge?(before, after), "did not create manual relationship %s" % str)
assert(! graph.edge?(after, before), "created automatic relationship %s" % str)
diff --git a/test/puppet/tc_suidmanager.rb b/test/puppet/tc_suidmanager.rb
index 08d957cc0..2e4a13c72 100755
--- a/test/puppet/tc_suidmanager.rb
+++ b/test/puppet/tc_suidmanager.rb
@@ -84,7 +84,7 @@ class TestSUIDManager < Test::Unit::TestCase
).returns('output')
- output = Puppet::Util::SUIDManager.run_and_capture 'yay',
+ output = Puppet::Util::SUIDManager.run_and_capture 'yay',
@user.uid,
@user.gid
diff --git a/test/rails/railsparameter.rb b/test/rails/railsparameter.rb
index aaa88e505..60bbdc06c 100755
--- a/test/rails/railsparameter.rb
+++ b/test/rails/railsparameter.rb
@@ -11,7 +11,7 @@ require 'puppettest/railstesting'
if defined? ::ActiveRecord::Base
class TestRailsParameter < Test::Unit::TestCase
include PuppetTest::RailsTesting
-
+
def params
{"myname" => "myval", "multiple" => %w{one two three}}
end
@@ -27,9 +27,9 @@ class TestRailsParameter < Test::Unit::TestCase
host = Puppet::Rails::Host.new(:name => "myhost")
host.save
-
+
resource = host.resources.create(
- :title => "/tmp/to_resource",
+ :title => "/tmp/to_resource",
:restype => "file",
:exported => true)
diff --git a/test/ral/manager/attributes.rb b/test/ral/manager/attributes.rb
index ab5ba85d1..cf8f2f9ae 100755
--- a/test/ral/manager/attributes.rb
+++ b/test/ral/manager/attributes.rb
@@ -144,7 +144,7 @@ class TestTypeAttributes < Test::Unit::TestCase
type.newparam(:name) {}
type.newparam(:one) {}
type.newproperty(:two) {}
-
+
aliases = {
:three => :one,
:four => :two
diff --git a/test/ral/manager/manager.rb b/test/ral/manager/manager.rb
index 8f7e74d4d..8efea128d 100755
--- a/test/ral/manager/manager.rb
+++ b/test/ral/manager/manager.rb
@@ -9,19 +9,19 @@ require 'puppettest'
class TestTypeManager < Test::Unit::TestCase
include PuppetTest
-
+
class FakeManager
extend Puppet::MetaType::Manager
def self.clear
@types = {}
end
end
-
+
def teardown
super
FakeManager.clear
end
-
+
# Make sure we can remove defined types
def test_rmtype
assert_nothing_raised {
@@ -30,22 +30,22 @@ class TestTypeManager < Test::Unit::TestCase
end
}
assert(FakeManager.type(:testing), "Did not get fake type")
-
+
assert_nothing_raised do
FakeManager.rmtype(:testing)
end
-
+
assert_nil(FakeManager.type(:testing), "Type was not removed")
assert(! defined?(FakeManager::Testing), "Constant was not removed")
end
-
+
def test_newtype
assert_nothing_raised do
FakeManager.newtype(:testing, :self_refresh => true) do
newparam(:name, :namevar => true)
end
end
-
+
test = FakeManager.type(:testing)
assert(test, "did not get type")
assert(test.self_refresh, "did not set attribute")
diff --git a/test/ral/manager/type.rb b/test/ral/manager/type.rb
index 7923610b3..2624e26ea 100755
--- a/test/ral/manager/type.rb
+++ b/test/ral/manager/type.rb
@@ -278,7 +278,7 @@ class TestType < Test::Unit::TestCase
# Make sure the title is sufficiently differentiated from the namevar.
def test_title_at_creation_with_hash
file = nil
- fileclass = Puppet::Type.type(:file)
+ fileclass = Puppet::Type.type(:file)
path = tempfile()
assert_nothing_raised do
@@ -415,7 +415,7 @@ class TestType < Test::Unit::TestCase
exec = Puppet::Type.newexec(:title => "yay", :command => "/bin/echo yay")
assert_equal("Exec[yay]", exec.ref)
end
-
+
def test_path
config = mk_catalog
@@ -434,33 +434,33 @@ class TestType < Test::Unit::TestCase
end
res
end
-
+
exec = mk.call(1, {})
-
+
assert_equal("/Exec[exec1]", exec.path)
-
+
comp = Puppet::Type.newcomponent :title => "My[component]", :type => "Yay"
config.add_resource comp
-
+
exec = mk.call(2, :parent => comp)
-
+
assert_equal("/My[component]/Exec[exec2]", exec.path)
-
+
comp = Puppet::Type.newcomponent :name => "Other[thing]"
config.add_resource comp
exec = mk.call(3, :parent => comp)
assert_equal("/Other[thing]/Exec[exec3]", exec.path)
-
+
comp = Puppet::Type.newcomponent :type => "server", :name => "server"
config.add_resource comp
exec = mk.call(4, :parent => comp)
assert_equal("/server/Exec[exec4]", exec.path)
-
+
comp = Puppet::Type.newcomponent :type => "whatever", :name => "class[main]"
config.add_resource comp
exec = mk.call(5, :parent => comp)
assert_equal("//Exec[exec5]", exec.path)
-
+
newcomp = Puppet::Type.newcomponent :type => "yay", :name => "Good[bad]"
config.add_resource newcomp
config.add_edge comp, newcomp
diff --git a/test/ral/providers/cron/crontab.rb b/test/ral/providers/cron/crontab.rb
index d52105ce3..6a745a10c 100755
--- a/test/ral/providers/cron/crontab.rb
+++ b/test/ral/providers/cron/crontab.rb
@@ -21,7 +21,7 @@ class TestCronParsedProvider < Test::Unit::TestCase
# These are potentially multi-line records; there's no one-to-one map, but they model
# a full cron job. These tests assume individual record types will always be correctly
- # parsed, so all they
+ # parsed, so all they
def sample_crons
unless defined? @sample_crons
@sample_crons = YAML.load(File.read(File.join(@crondir, "crontab_collections.yaml")))
@@ -221,7 +221,7 @@ class TestCronParsedProvider < Test::Unit::TestCase
assert_nothing_raised("could not load %s" % file) do
str, args = YAML.load(File.read(file))
end
-
+
# Stupid old yaml
args.each do |hash|
hash.each do |param, value|
@@ -298,7 +298,7 @@ class TestCronParsedProvider < Test::Unit::TestCase
assert_equal("# Puppet Name: #{name}\n30 * * * * date > /dev/null", str,
"Cron did not generate correctly")
end
-
+
# Test that comments are correctly retained
def test_retain_comments
str = "# this is a comment\n#and another comment\n"
@@ -380,7 +380,7 @@ class TestCronParsedProvider < Test::Unit::TestCase
setme
target = @provider.target_object(@me)
-
+
[
"* * * * * /some/command",
"0,30 * * * * /some/command",
@@ -522,7 +522,7 @@ class TestCronParsedProvider < Test::Unit::TestCase
setme
target = @provider.target_object(@me)
-
+
[
"@daily /some/command",
"@daily /some/command more"
diff --git a/test/ral/providers/group.rb b/test/ral/providers/group.rb
index c5956bd78..8e62d7b1e 100755
--- a/test/ral/providers/group.rb
+++ b/test/ral/providers/group.rb
@@ -237,7 +237,7 @@ class TestGroupProvider < Test::Unit::TestCase
else
$stderr.puts "Not running as root; skipping group creation tests."
end
-
+
def test_autogen
provider = nil
group = Puppet::Type.type(:group).new(:name => nonrootgroup.name)
diff --git a/test/ral/providers/host/netinfo.rb b/test/ral/providers/host/netinfo.rb
index 131b32eec..0329edcd9 100755
--- a/test/ral/providers/host/netinfo.rb
+++ b/test/ral/providers/host/netinfo.rb
@@ -31,20 +31,20 @@ class TestNetinfoHostProvider < Test::Unit::TestCase
assert(list.detect { |provider| provider.name == "localhost"}, "Could not find localhost")
end
-
+
if Process.uid == 0
def test_simple
localhost = nil
assert_nothing_raised do
localhost = @host.create :name => "localhost", :check => [:ip], :provider => :netinfo
end
-
+
assert_nothing_raised do
localhost.retrieve
end
-
+
prov = localhost.provider
-
+
assert_nothing_raised do
assert(prov.ip, "Did not find value for ip")
assert(prov.ip != :absent, "Netinfo thinks the localhost is missing")
diff --git a/test/ral/providers/mailalias/aliases.rb b/test/ral/providers/mailalias/aliases.rb
index d938fbeef..6406e83e9 100755
--- a/test/ral/providers/mailalias/aliases.rb
+++ b/test/ral/providers/mailalias/aliases.rb
@@ -24,7 +24,7 @@ class TestMailaliasAliasesProvider < Test::Unit::TestCase
@provider.clear
super
end
-
+
def mkalias(name = "me")
if defined? @pcount
@pcount += 1
diff --git a/test/ral/providers/mount/netinfo.rb b/test/ral/providers/mount/netinfo.rb
index 7a9703c1b..2474cbdf7 100755
--- a/test/ral/providers/mount/netinfo.rb
+++ b/test/ral/providers/mount/netinfo.rb
@@ -6,7 +6,7 @@
require File.dirname(__FILE__) + '/../../../lib/puppettest'
require 'puppettest'
-#
+#
# if Puppet::Type.type(:mount).provider(:netinfo).suitable?
# class TestNetinfoMountProvider < Test::Unit::TestCase
# include PuppetTest
@@ -15,7 +15,7 @@ require 'puppettest'
# super
# @mount = Puppet::Type.type(:mount)
# end
-#
+#
# if Process.uid == 0 and Facter.value(:hostname) == "midden"
# def test_mount_nfs
# culain = nil
@@ -23,36 +23,36 @@ require 'puppettest'
# culain = @mount.create :name => "/mnt", :device => "culain:/home/luke", :options => "-o -P", :ensure => :present,
# :fstype => "nfs"
# end
-#
+#
# assert(culain, "Did not create fs")
-#
+#
# assert_apply(culain)
-#
+#
# assert_nothing_raised do
# culain.provider.mount
# end
-#
+#
# assert(culain.provider.mounted?, "fs is not considered mounted")
# assert_nothing_raised() { culain.provider.unmount }
-#
+#
# culain[:ensure] = :absent
-#
+#
# assert_apply(culain)
# end
# end
-#
+#
# def test_simple
# root = nil
# assert_nothing_raised do
# root = @mount.create :name => "/", :check => @mount.validproperties
# end
-#
+#
# assert_nothing_raised do
# root.retrieve
# end
-#
+#
# prov = root.provider
-#
+#
# assert_nothing_raised do
# assert(prov.device, "Did not value for device")
# assert(prov.device != :absent, "Netinfo thinks the root device is missing")
@@ -71,7 +71,7 @@ require 'puppettest'
# p obj
# assert(obj.is(:device), "Did not get value for device in %s" % obj[:name])
# end
-#
+#
# assert(list.detect { |m| m[:name] == "/"}, "Could not find root fs")
# end
# end
diff --git a/test/ral/providers/package.rb b/test/ral/providers/package.rb
index 8af5108cc..e7f930096 100755
--- a/test/ral/providers/package.rb
+++ b/test/ral/providers/package.rb
@@ -127,7 +127,7 @@ class TestPackageProvider < Test::Unit::TestCase
return
end
end
-
+
if cleancmd = hash[:cleanup]
hash.delete(:cleanup)
end
diff --git a/test/ral/providers/package/aptitude.rb b/test/ral/providers/package/aptitude.rb
index 5e4749333..6e94f0ab8 100755
--- a/test/ral/providers/package/aptitude.rb
+++ b/test/ral/providers/package/aptitude.rb
@@ -41,7 +41,7 @@ class AptitudePackageProviderTest < PuppetTest::TestCase
).returns(0)
pkg.evaluate.each { |state|
- state.forward
+ state.forward
}
end
diff --git a/test/ral/providers/package/aptrpm.rb b/test/ral/providers/package/aptrpm.rb
index 8a107c4d7..a3010cc92 100755
--- a/test/ral/providers/package/aptrpm.rb
+++ b/test/ral/providers/package/aptrpm.rb
@@ -12,7 +12,7 @@ class AptrpmPackageProviderTest < PuppetTest::TestCase
super
@type = Puppet::Type.type(:package)
end
-
+
def test_install
pkg = @type.new :name => 'faff',
:provider => :aptrpm,
@@ -38,10 +38,10 @@ class AptrpmPackageProviderTest < PuppetTest::TestCase
"install",
'faff'
).returns(0)
-
+
pkg.evaluate.each { |state| state.forward }
end
-
+
def test_uninstall
pkg = @type.new :name => 'faff', :provider => :aptrpm, :ensure => :absent
@@ -65,7 +65,7 @@ class AptrpmPackageProviderTest < PuppetTest::TestCase
'remove',
'faff'
).returns(0)
-
+
pkg.evaluate.each { |state| state.forward }
end
diff --git a/test/ral/providers/parsedfile.rb b/test/ral/providers/parsedfile.rb
index 8a9fa89d2..f0f47dc1f 100755
--- a/test/ral/providers/parsedfile.rb
+++ b/test/ral/providers/parsedfile.rb
@@ -587,14 +587,14 @@ class TestParsedFile < Test::Unit::TestCase
bills_values = bill.retrieve
end
- assert(bills_values[bill.property(:one)],
+ assert(bills_values[bill.property(:one)],
"Bill does not have a value for 'one'")
- assert(bills_values[bill.property(:one)],
+ assert(bills_values[bill.property(:one)],
"Bill does not have a value for 'one' on second try")
assert_nothing_raised do
bill.retrieve
end
- assert(bills_values[bill.property(:one)],
+ assert(bills_values[bill.property(:one)],
"bill's value for 'one' disappeared")
end
diff --git a/test/ral/providers/port/parsed.rb b/test/ral/providers/port/parsed.rb
index 41da17993..154d21260 100755
--- a/test/ral/providers/port/parsed.rb
+++ b/test/ral/providers/port/parsed.rb
@@ -24,7 +24,7 @@ require 'puppettest'
# @provider.clear
# super
# end
-#
+#
# # Generate a line from a hash. The line might include '\n'.
# def genline(hash)
# line = [hash[:name], "#{hash[:number]}/%s"].join("\t\t")
@@ -60,7 +60,7 @@ require 'puppettest'
# assert_equal("53", dns[:number], "dns number is wrong")
#
# text = nil
-# assert_nothing_raised("failed to generate %s" % file) do
+# assert_nothing_raised("failed to generate %s" % file) do
# text = @provider.to_file(@provider.target_records(file))
# end
#
@@ -68,7 +68,7 @@ require 'puppettest'
# newlines = text.chomp.split "\n"
# regex = /^(\S+)\s+(\d+)\/(\w+)/
# oldlines.zip(newlines).each do |old, new|
-# if omatch = regex.match(old)
+# if omatch = regex.match(old)
# assert(newmatch = regex.match(new),
# "Lines were not equivalent: %s vs %s" %
# [old.inspect, new.inspect]
diff --git a/test/ral/providers/provider.rb b/test/ral/providers/provider.rb
index 9e5e585dc..79535bef2 100755
--- a/test/ral/providers/provider.rb
+++ b/test/ral/providers/provider.rb
@@ -453,7 +453,7 @@ class TestProviderFeatures < Test::Unit::TestCase
define_method(:one) {}
define_method(:two) {}
end
-
+
# Another with the numbers and a declaration
@type.provide(:both) do
define_method(:one) {}
@@ -461,7 +461,7 @@ class TestProviderFeatures < Test::Unit::TestCase
has_feature :alpha
end
-
+
# And just the declaration
@type.provide(:letters) do
has_feature :alpha
@@ -484,7 +484,7 @@ class TestProviderFeatures < Test::Unit::TestCase
features.sort! { |a,b| a.to_s <=> b.to_s }
assert_equal(features, provider.features, "Got incorrect feature list for provider instance %s" % name)
assert_equal(features, provider_class.features, "Got incorrect feature list for provider class %s" % name)
- features.each do |feat|
+ features.each do |feat|
assert(provider.feature?(feat), "Provider instance %s did not have feature %s" % [name, feat])
assert(provider_class.feature?(feat), "Provider class %s did not have feature %s" % [name, feat])
end
diff --git a/test/ral/providers/service/base.rb b/test/ral/providers/service/base.rb
index 03ecca59d..e23e2fd11 100755
--- a/test/ral/providers/service/base.rb
+++ b/test/ral/providers/service/base.rb
@@ -47,7 +47,7 @@ class TestBaseServiceProvider < Test::Unit::TestCase
assert_equal(:stopped, provider.status, "status was not returned correctly")
end
end
-
+
# Testing #454
def test_that_failures_propagate
nope = "/no/such/command"
diff --git a/test/ral/providers/sshkey/parsed.rb b/test/ral/providers/sshkey/parsed.rb
index f2992386d..868640a10 100755
--- a/test/ral/providers/sshkey/parsed.rb
+++ b/test/ral/providers/sshkey/parsed.rb
@@ -22,7 +22,7 @@ class TestParsedSSHKey < Test::Unit::TestCase
@provider.clear
super
end
-
+
def mkkey(name = "host.domain.com")
if defined? @pcount
@pcount += 1
@@ -52,39 +52,39 @@ class TestParsedSSHKey < Test::Unit::TestCase
fakedataparse(file)
}
end
-
+
def test_simplekey
@provider.filetype = :ram
file = @provider.default_target
-
+
key = nil
assert_nothing_raised do
key = mkkey
end
-
+
assert(key, "did not create key")
-
+
assert_nothing_raised do
key.flush
end
-
+
assert(key.alias, "No alias set for key")
-
+
hash = key.property_hash.dup
text = @provider.target_object(file).read
names = [key.name, key.alias].flatten.join(",")
-
+
assert_equal("#{names} #{key.type} #{key.key}\n", text)
-
+
assert_nothing_raised do
@provider.prefetch
end
-
+
hash.each do |p, v|
next unless key.respond_to?(p)
assert_equal(v, key.send(p), "%s did not match" % p)
end
-
+
assert(key.name !~ /,/, "Aliases were not split out during parsing")
end
diff --git a/test/ral/providers/user.rb b/test/ral/providers/user.rb
index 3f68469c1..a5d8e9210 100755
--- a/test/ral/providers/user.rb
+++ b/test/ral/providers/user.rb
@@ -535,16 +535,16 @@ class TestUserProvider < Test::Unit::TestCase
assert_equal("-s", user.send(:flag, :shell),
"Incorrect shell flag")
end
-
+
def test_autogen
provider = nil
user = Puppet::Type.type(:user).new(:name => nonrootuser.name)
provider = user.provider
assert(provider, "did not get provider")
-
+
# Everyone should be able to autogenerate a uid
assert_instance_of(Fixnum, provider.autogen(:uid))
-
+
# If we're Darwin, then we should get results, but everyone else should
# get nil
darwin = (Facter.value(:operatingsystem) == "Darwin")
@@ -554,7 +554,7 @@ class TestUserProvider < Test::Unit::TestCase
:home => "/var/empty",
:shell => "/usr/bin/false"
}
-
+
should.each do |param, value|
if darwin
assert_equal(value, provider.autogen(param), "did not autogen %s for darwin correctly" % param)
diff --git a/test/ral/type/cron.rb b/test/ral/type/cron.rb
index 2e25d82df..89c5583e0 100755
--- a/test/ral/type/cron.rb
+++ b/test/ral/type/cron.rb
@@ -152,7 +152,7 @@ class TestCron < Test::Unit::TestCase
cron = mkcron(name)
catalog = mk_catalog(name, cron)
trans = assert_events([:cron_created], catalog, name)
-
+
cron.provider.class.prefetch
cron = nil
@@ -342,7 +342,7 @@ class TestCron < Test::Unit::TestCase
unless param =~ /=$/
param = "%s=" % param
end
-
+
cron.provider.send(param, value)
end
diff --git a/test/ral/type/exec.rb b/test/ral/type/exec.rb
index 9384d09db..6c1a82a20 100755
--- a/test/ral/type/exec.rb
+++ b/test/ral/type/exec.rb
@@ -240,7 +240,7 @@ class TestExec < Test::Unit::TestCase
)
catalog = mk_catalog(file, baseobj, ofile, exec, cat)
-
+
rels = nil
assert_nothing_raised do
rels = exec.autorequire
@@ -312,7 +312,7 @@ class TestExec < Test::Unit::TestCase
# Verify that we can execute commands as a special user
def mknverify(file, user, group = nil, id = true)
File.umask(0022)
-
+
args = {
:command => "touch %s" % file,
:path => "/usr/bin:/bin:/usr/sbin:/sbin",
@@ -541,7 +541,7 @@ class TestExec < Test::Unit::TestCase
assert_raise(ArgumentError, "Missing command did not raise error") {
exec.run("/bin/nosuchthingexists")
- }
+ }
end
def test_envparam
@@ -583,7 +583,7 @@ and stuff"
}
assert_equal("A B\n", output)
end
-
+
def test_environmentparam
exec = Puppet::Type.newexec(
:command => "echo $environmenttest",
@@ -627,13 +627,13 @@ and stuff"
def test_timeout
exec = Puppet::Type.type(:exec).new(:command => "sleep 1", :path => ENV["PATH"], :timeout => "0.2")
time = Time.now
-
+
assert_raise(Timeout::Error) {
exec.run("sleep 1")
}
Puppet.info "%s seconds, vs a timeout of %s" % [Time.now.to_f - time.to_f, exec[:timeout]]
-
-
+
+
assert_apply(exec)
end
diff --git a/test/ral/type/file.rb b/test/ral/type/file.rb
index 63d2a5270..8db306c32 100755
--- a/test/ral/type/file.rb
+++ b/test/ral/type/file.rb
@@ -385,24 +385,24 @@ class TestFile < Test::Unit::TestCase
Puppet::Type.allclear
}
end
-
+
def test_recurse?
file = Puppet::Type.type(:file).new :path => tempfile
-
+
# Make sure we default to false
assert(! file.recurse?, "Recurse defaulted to true")
-
+
[true, "true", 10, "inf", "remote"].each do |value|
file[:recurse] = value
assert(file.recurse?, "%s did not cause recursion" % value)
end
-
+
[false, "false", 0].each do |value|
file[:recurse] = value
assert(! file.recurse?, "%s caused recursion" % value)
end
end
-
+
def test_recursion
basedir = tempfile()
subdir = File.join(basedir, "subdir")
@@ -420,23 +420,23 @@ class TestFile < Test::Unit::TestCase
}
config = mk_catalog dir
transaction = Puppet::Transaction.new(config)
-
+
children = nil
assert_nothing_raised {
children = transaction.eval_generate(dir)
}
-
+
assert_equal([subdir], children.collect {|c| c.title },
"Incorrect generated children")
-
- # Remove our subdir resource,
+
+ # Remove our subdir resource,
subdir_resource = config.resource(:file, subdir)
config.remove_resource(subdir_resource)
# Create the test file
File.open(tmpfile, "w") { |f| f.puts "yayness" }
-
+
assert_nothing_raised {
children = transaction.eval_generate(dir)
}
@@ -444,7 +444,7 @@ class TestFile < Test::Unit::TestCase
# And make sure we get both resources back.
assert_equal([subdir, tmpfile].sort, children.collect {|c| c.title }.sort,
"Incorrect generated children when recurse == %s" % value.inspect)
-
+
File.unlink(tmpfile)
end
end
@@ -678,7 +678,7 @@ class TestFile < Test::Unit::TestCase
def test_backupmodes
File.umask(0022)
-
+
file = tempfile()
newfile = tempfile()
@@ -793,7 +793,7 @@ class TestFile < Test::Unit::TestCase
)
comp = mk_catalog(user, group, home)
}
-
+
# Now make sure we get a relationship for each of these
rels = nil
assert_nothing_raised { rels = home.autorequire }
@@ -932,23 +932,23 @@ class TestFile < Test::Unit::TestCase
end
end
end
-
+
if Process.uid == 0
# Testing #364.
def test_writing_in_directories_with_no_write_access
# Make a directory that our user does not have access to
dir = tempfile()
Dir.mkdir(dir)
-
+
# Get a fake user
user = nonrootuser
# and group
group = nonrootgroup
-
+
# First try putting a file in there
path = File.join(dir, "file")
file = Puppet::Type.newfile :path => path, :owner => user.name, :group => group.name, :content => "testing"
-
+
# Make sure we can create it
assert_apply(file)
assert(FileTest.exists?(path), "File did not get created")
@@ -957,7 +957,7 @@ class TestFile < Test::Unit::TestCase
assert_equal(group.gid, File.stat(path).gid, "File has the wrong group")
assert_equal("testing", File.read(path), "file has the wrong content")
-
+
# Now make a dir
subpath = File.join(dir, "subdir")
subdir = Puppet::Type.newfile :path => subpath, :owner => user.name, :group => group.name, :ensure => :directory
@@ -971,7 +971,7 @@ class TestFile < Test::Unit::TestCase
assert_equal("testing", File.read(path), "file has the wrong content")
end
end
-
+
# #366
def test_replace_aliases
file = Puppet::Type.newfile :path => tempfile()
@@ -980,14 +980,14 @@ class TestFile < Test::Unit::TestCase
file[:replace] = :no
assert_equal(:false, file[:replace], ":replace did not alias :false to :no")
end
-
+
def test_backup
path = tempfile()
file = Puppet::Type.newfile :path => path, :content => "yay"
catalog = mk_catalog(file)
catalog.finalize # adds the default resources.
-
+
[false, :false, "false"].each do |val|
assert_nothing_raised do
file[:backup] = val
@@ -1000,32 +1000,32 @@ class TestFile < Test::Unit::TestCase
end
assert_equal(".puppet-bak", file[:backup], "%s did not translate" % val.inspect)
end
-
+
# Now try a non-bucket string
assert_nothing_raised do
file[:backup] = ".bak"
end
assert_equal(".bak", file[:backup], ".bak did not translate")
-
+
# Now try a non-existent bucket
assert_nothing_raised do
file[:backup] = "main"
end
assert_equal("main", file[:backup], "bucket name was not retained")
assert_equal("main", file.bucket, "file's bucket was not set")
-
+
# And then an existing bucket
obj = Puppet::Type.type(:filebucket).new :name => "testing"
catalog.add_resource(obj)
bucket = obj.bucket
-
+
assert_nothing_raised do
file[:backup] = "testing"
end
assert_equal("testing", file[:backup], "backup value was reset")
assert_equal(obj.bucket, file.bucket, "file's bucket was not set")
end
-
+
def test_pathbuilder
dir = tempfile()
Dir.mkdir(dir)
@@ -1034,25 +1034,25 @@ class TestFile < Test::Unit::TestCase
obj = Puppet::Type.newfile :path => dir, :recurse => true, :mode => 0755
catalog = mk_catalog obj
transaction = Puppet::Transaction.new(catalog)
-
+
assert_equal("/%s" % obj.ref, obj.path)
-
+
list = transaction.eval_generate(obj)
fileobj = catalog.resource(:file, file)
assert(fileobj, "did not generate file object")
assert_equal("/%s" % fileobj.ref, fileobj.path, "did not generate correct subfile path")
end
-
+
# Testing #403
def test_removal_with_content_set
path = tempfile()
File.open(path, "w") { |f| f.puts "yay" }
file = Puppet::Type.newfile(:name => path, :ensure => :absent, :content => "foo")
-
+
assert_apply(file)
assert(! FileTest.exists?(path), "File was not removed")
end
-
+
# Testing #438
def test_creating_properties_conflict
file = tempfile()
@@ -1114,7 +1114,7 @@ class TestFile < Test::Unit::TestCase
else
raise "invalid attr %s" % attr
end
-
+
# Run it again
run.call(file, "after modification with %s" % attr)
diff --git a/test/ral/type/fileignoresource.rb b/test/ral/type/fileignoresource.rb
index 2c36bd3c6..ad68f703c 100755
--- a/test/ral/type/fileignoresource.rb
+++ b/test/ral/type/fileignoresource.rb
@@ -10,7 +10,7 @@ require 'fileutils'
class TestFileIgnoreSources < Test::Unit::TestCase
include PuppetTest::Support::Utils
include PuppetTest::FileTesting
-
+
def setup
super
begin
@@ -56,33 +56,33 @@ class TestFileIgnoreSources < Test::Unit::TestCase
#create source files
- File.open(File.join(frompath,sourcefile1),
+ File.open(File.join(frompath,sourcefile1),
File::WRONLY|File::CREAT|File::APPEND) { |of|
of.puts "yayness"
}
-
- File.open(File.join(frompath,sourcefile2),
+
+ File.open(File.join(frompath,sourcefile2),
File::WRONLY|File::CREAT|File::APPEND) { |of|
of.puts "even yayer"
}
-
+
#makes Puppet file Object
assert_nothing_raised {
tofile = Puppet::Type.type(:file).new(
:name => topath,
:source => frompath,
- :recurse => true,
- :ignore => "sourcefile2"
+ :recurse => true,
+ :ignore => "sourcefile2"
)
}
config = mk_catalog(tofile)
config.apply
-
-
+
+
#topath should exist as a directory with sourcedir as a directory
-
+
#This file should exist
assert(FileTest.exists?(File.join(topath,sourcefile1)))
@@ -104,7 +104,7 @@ class TestFileIgnoreSources < Test::Unit::TestCase
frompath = File.join(path,sourcedir)
FileUtils.mkdir_p frompath
-
+
FileUtils.mkdir_p(File.join(frompath, subdir))
FileUtils.mkdir_p(File.join(frompath, subdir2))
dir = Dir.glob(File.join(path,"**/*"))
@@ -117,18 +117,18 @@ class TestFileIgnoreSources < Test::Unit::TestCase
trans = nil
#create source files
-
- dir.each { |dir|
- File.open(File.join(dir,sourcefile1),
+
+ dir.each { |dir|
+ File.open(File.join(dir,sourcefile1),
File::WRONLY|File::CREAT|File::APPEND) { |of|
of.puts "yayness"
}
-
- File.open(File.join(dir,sourcefile2),
+
+ File.open(File.join(dir,sourcefile2),
File::WRONLY|File::CREAT|File::APPEND) { |of|
of.puts "even yayer"
}
-
+
}
#makes Puppet file Object
@@ -136,16 +136,16 @@ class TestFileIgnoreSources < Test::Unit::TestCase
tofile = Puppet::Type.type(:file).new(
:name => topath,
:source => frompath,
- :recurse => true,
- :ignore => "*2"
+ :recurse => true,
+ :ignore => "*2"
)
}
config = mk_catalog(tofile)
config.apply
-
+
#topath should exist as a directory with sourcedir as a directory
-
+
#This file should exist
assert(FileTest.exists?(File.join(topath,sourcefile1)))
assert(FileTest.exists?(File.join(topath,subdir)))
@@ -172,7 +172,7 @@ class TestFileIgnoreSources < Test::Unit::TestCase
frompath = File.join(path,sourcedir)
FileUtils.mkdir_p frompath
-
+
FileUtils.mkdir_p(File.join(frompath, subdir))
FileUtils.mkdir_p(File.join(frompath, subdir2))
FileUtils.mkdir_p(File.join(frompath, subdir3))
@@ -186,20 +186,20 @@ class TestFileIgnoreSources < Test::Unit::TestCase
trans = nil
#create source files
-
-
- sourcedir.each { |dir|
- File.open(File.join(dir,sourcefile1),
+
+
+ sourcedir.each { |dir|
+ File.open(File.join(dir,sourcefile1),
File::WRONLY|File::CREAT|File::APPEND) { |of|
of.puts "yayness"
}
-
- File.open(File.join(dir,sourcefile2),
+
+ File.open(File.join(dir,sourcefile2),
File::WRONLY|File::CREAT|File::APPEND) { |of|
of.puts "even yayer"
}
-
+
}
@@ -209,8 +209,8 @@ class TestFileIgnoreSources < Test::Unit::TestCase
:name => topath,
:source => frompath,
:recurse => true,
- :ignore => ["*2", "an*"]
- # :ignore => ["*2", "an*", "nomatch"]
+ :ignore => ["*2", "an*"]
+ # :ignore => ["*2", "an*", "nomatch"]
)
}
@@ -224,7 +224,7 @@ class TestFileIgnoreSources < Test::Unit::TestCase
assert(FileTest.exists?(File.join(topath,sourcefile1)), "file1 not in destdir")
assert(FileTest.exists?(File.join(topath,subdir)), "subdir1 not in destdir")
assert(FileTest.exists?(File.join(File.join(topath,subdir),sourcefile1)), "file1 not in subdir")
- # proper files in source
+ # proper files in source
assert(FileTest.exists?(File.join(frompath,subdir)), "subdir not in source")
assert(FileTest.exists?(File.join(frompath,subdir2)), "subdir2 not in source")
assert(FileTest.exists?(File.join(frompath,subdir3)), "subdir3 not in source")
diff --git a/test/ral/type/filesources.rb b/test/ral/type/filesources.rb
index 573bcb2ce..a39176121 100755
--- a/test/ral/type/filesources.rb
+++ b/test/ral/type/filesources.rb
@@ -20,7 +20,7 @@ class TestFileSources < Test::Unit::TestCase
end
@file = Puppet::Type.type(:file)
Puppet[:filetimeout] = -1
- Puppet::Util::SUIDManager.stubs(:asuser).yields
+ Puppet::Util::SUIDManager.stubs(:asuser).yields
Facter.stubs(:to_hash).returns({})
end
@@ -28,7 +28,7 @@ class TestFileSources < Test::Unit::TestCase
super
Puppet::Network::HttpPool.clear_http_instances
end
-
+
def use_storage
begin
initstorage
@@ -41,14 +41,14 @@ class TestFileSources < Test::Unit::TestCase
Puppet::Util::Storage.init
Puppet::Util::Storage.load
end
-
+
# Make a simple recursive tree.
def mk_sourcetree
source = tempfile()
sourcefile = File.join(source, "file")
Dir.mkdir source
File.open(sourcefile, "w") { |f| f.puts "yay" }
-
+
dest = tempfile()
destfile = File.join(dest, "file")
return source, dest, sourcefile, destfile
@@ -131,7 +131,7 @@ class TestFileSources < Test::Unit::TestCase
# and make sure they're still equal
assert_trees_equal(fromdir,todir)
-
+
# Now try it with the directory being read-only
File.chmod(0111, todir)
recursive_source_test(fromdir, todir)
@@ -144,7 +144,7 @@ class TestFileSources < Test::Unit::TestCase
fromdir, todir, one, two = run_complex_sources
assert(FileTest.exists?(todir))
-
+
# Modify a dest file
File.open(two, "w") { |f| f.puts "something else" }
@@ -199,7 +199,7 @@ class TestFileSources < Test::Unit::TestCase
:mode => 0755
)
}
-
+
assert_apply(rootobj)
assert_equal(0755, filemode(file1))
@@ -269,9 +269,9 @@ class TestFileSources < Test::Unit::TestCase
:name => name
)
- assert_raise Puppet::Error do
+ assert_raise Puppet::Error do
file.retrieve
- end
+ end
comp = mk_catalog(file)
comp.apply
@@ -299,7 +299,7 @@ class TestFileSources < Test::Unit::TestCase
currentvalue = file.retrieve
- assert(currentvalue[file.property(:checksum)],
+ assert(currentvalue[file.property(:checksum)],
"File does not have a checksum property")
assert_equal(0, file.evaluate.length, "File produced changes")
@@ -307,7 +307,7 @@ class TestFileSources < Test::Unit::TestCase
def test_sourcepaths
files = []
- 3.times {
+ 3.times {
files << tempfile()
}
@@ -489,7 +489,7 @@ class TestFileSources < Test::Unit::TestCase
assert(FileTest.exists?(file3), "File from source 1 was not copied")
assert_equal("0", File.read(file3), "file3 got wrong contents")
end
-
+
def test_recursive_sourceselect
dest = tempfile()
source1 = tempfile()
@@ -506,15 +506,15 @@ class TestFileSources < Test::Unit::TestCase
File.open(file, "w") { |f| f.puts "yaysecond-%s" % i}
files << file
end
-
+
obj = Puppet::Type.newfile(:path => dest, :source => [source1, source2], :sourceselect => :all, :recurse => true)
-
+
assert_apply(obj)
-
+
["file0", "file1", "second-file0", "second-file1", "subdir/file2", "subdir/second-file2", "subdir/file3", "subdir/second-file3"].each do |file|
path = File.join(dest, file)
assert(FileTest.exists?(path), "did not create %s" % file)
-
+
assert_equal("yay%s\n" % File.basename(file).sub("file", ''), File.read(path), "file was not copied correctly")
end
end
diff --git a/test/ral/type/group.rb b/test/ral/type/group.rb
index c6d6c5ee6..f1264116f 100755
--- a/test/ral/type/group.rb
+++ b/test/ral/type/group.rb
@@ -129,7 +129,7 @@ class TestGroup < Test::Unit::TestCase
current_values = gobj.retrieve
}
- assert(current_values[gobj.property(:gid)],
+ assert(current_values[gobj.property(:gid)],
"Failed to retrieve gid")
}
end
diff --git a/test/ral/type/host.rb b/test/ral/type/host.rb
index 95f698157..ef5472030 100755
--- a/test/ral/type/host.rb
+++ b/test/ral/type/host.rb
@@ -112,7 +112,7 @@ class TestHost < Test::Unit::TestCase
assert_events([:host_created], host)
- current_values = nil
+ current_values = nil
assert_nothing_raised {
current_values = host.retrieve
}
@@ -128,13 +128,13 @@ class TestHost < Test::Unit::TestCase
current_values = host.retrieve
}
- assert_equal(%w{madstop kirby yayness},
+ assert_equal(%w{madstop kirby yayness},
current_values[host.property(:alias)])
-
+
host[:ensure] = :absent
assert_events([:host_removed], host)
end
-
+
def test_invalid_ipaddress
host = mkhost()
@@ -195,7 +195,7 @@ class TestHost < Test::Unit::TestCase
}
end
- end
+ end
def test_aliasisproperty
assert_equal(:property, @hosttype.attrtype(:alias))
end
diff --git a/test/ral/type/resources.rb b/test/ral/type/resources.rb
index 426e76b0e..8d9f09204 100755
--- a/test/ral/type/resources.rb
+++ b/test/ral/type/resources.rb
@@ -18,7 +18,7 @@ class TestResources < Test::Unit::TestCase
end
end
end
-
+
def mk_purger(managed = false)
@purgenum ||= 0
@purgenum += 1
@@ -62,35 +62,35 @@ class TestResources < Test::Unit::TestCase
def test_purge
# Create a purgeable type
mkpurgertype
-
+
purger = nil
assert_nothing_raised do
purger = @type.new :name => "purgetest", :noop => true, :loglevel => :warning
end
assert(purger, "did not get purger manager")
add_purge_lister()
-
+
assert_equal($purgemembers.values.sort, @purgetype.instances.sort)
-
+
# and it should now succeed
assert_nothing_raised do
purger[:purge] = true
end
assert(purger.purge?, "purge boolean was not enabled")
-
+
# Okay, now let's try doing some purging, yo
managed = []
unmanned = []
3.times { managed << mk_purger(true) } # 3 managed
3.times { unmanned << mk_purger(false) } # 3 unmanaged
-
+
managed.each do |m|
assert(m.managed?, "managed resource was not considered managed")
end
unmanned.each do |u|
assert(! u.managed?, "unmanaged resource was considered managed")
end
-
+
# First make sure we get nothing back when purge is false
genned = nil
purger[:purge] = false
@@ -98,7 +98,7 @@ class TestResources < Test::Unit::TestCase
genned = purger.generate
end
assert_equal([], genned, "Purged even when purge is false")
-
+
# Now make sure we can purge
purger[:purge] = true
assert_nothing_raised do
@@ -110,11 +110,11 @@ class TestResources < Test::Unit::TestCase
assert(res.purging, "did not mark resource for purging")
end
assert(! genned.empty?, "generated resource list was empty")
-
+
# Now make sure the generate method only finds the unmanaged resources
assert_equal(unmanned.collect { |r| r.title }.sort, genned.collect { |r| r.title },
"Did not return correct purge list")
-
+
# Now make sure our metaparams carried over
genned.each do |res|
[:noop, :loglevel].each do |param|
@@ -122,33 +122,33 @@ class TestResources < Test::Unit::TestCase
end
end
end
-
+
# Part of #408.
def test_check
# First check a non-user
res = Puppet::Type.type(:resources).new :name => :package
assert_nil(res[:unless_system_user], "got bad default for package")
-
-
+
+
assert_nothing_raised {
assert(res.check("A String"), "String failed check")
assert(res.check(Puppet::Type.type(:file).new(:path => tempfile())), "File failed check")
assert(res.check(Puppet::Type.type(:user).new(:name => "yayness")), "User failed check in package")
}
-
+
# Now create a user manager
res = Puppet::Type.type(:resources).new :name => :user
-
+
# Make sure the default is 500
assert_equal(500, res[:unless_system_user], "got bad default")
-
+
# Now make sure root fails the test
@user = Puppet::Type.type(:user)
assert_nothing_raised {
assert(! res.check(@user.create(:name => "root")), "root passed check")
assert(! res.check(@user.create(:name => "nobody")), "nobody passed check")
}
-
+
# Now find a user between 0 and the limit
low = high = nil
Etc.passwd { |entry|
@@ -163,7 +163,7 @@ class TestResources < Test::Unit::TestCase
end
end
}
-
+
if low
assert(! res.check(@user.create(:name => low)), "low user %s passed check" % low)
end
@@ -172,16 +172,16 @@ class TestResources < Test::Unit::TestCase
assert(res.check(@user.create(:name => high)), "high user %s failed check" % high)
end
end
-
+
# The other half of #408.
def test_check_is_called
res = Puppet::Type.type(:resources).new :name => :user, :purge => true
-
+
list = nil
assert_nothing_raised { list = res.generate }
-
+
assert(! list.empty?, "did not get any users")
-
+
bad = list.find_all { |u|
%w{root bin nobody}.include?(u[:name]) or (cv = u.retrieve and cv[u.property(:uid)] < 500)
}
diff --git a/test/ral/type/sshkey.rb b/test/ral/type/sshkey.rb
index 981079e92..a3d7cb656 100755
--- a/test/ral/type/sshkey.rb
+++ b/test/ral/type/sshkey.rb
@@ -82,20 +82,20 @@ class TestSSHKey < Test::Unit::TestCase
key[:provider] = :parsed
assert_apply(key)
-
+
assert_events([], key, "created events on in-sync key")
-
+
assert(key.provider.exists?, "Key did not get created")
-
+
# Now create a new key object
name = key.name
key = nil
-
+
key = @sshkeytype.new :name => name, :target => file, :provider => :parsed
key.retrieve
-
+
assert(key.provider.exists?, "key thinks it does not exist")
-
+
end
def test_moddingkey
diff --git a/test/ral/type/user.rb b/test/ral/type/user.rb
index 7cceef710..611201a64 100755
--- a/test/ral/type/user.rb
+++ b/test/ral/type/user.rb
@@ -345,7 +345,7 @@ class TestUser < Test::Unit::TestCase
)
comp = mk_catalog(user, group, home, ogroup)
}
-
+
rels = nil
assert_nothing_raised() { rels = user.autorequire }
@@ -401,12 +401,12 @@ class TestUser < Test::Unit::TestCase
user[:ensure] = :absent
assert_apply(user)
end
-
+
# Testing #455
def test_autorequire_with_no_group_should
user = Puppet::Type.type(:user).new(:name => "yaytest", :check => :all)
catalog = mk_catalog(user)
-
+
assert_nothing_raised do
user.autorequire
end
diff --git a/test/ral/type/yumrepo.rb b/test/ral/type/yumrepo.rb
index f3221fb84..e1ac53820 100755
--- a/test/ral/type/yumrepo.rb
+++ b/test/ral/type/yumrepo.rb
@@ -67,7 +67,7 @@ class TestYumRepo < Test::Unit::TestCase
def test_absent
copy_datafiles
baseurl = 'http://example.com/'
- devel = make_repo("development",
+ devel = make_repo("development",
{ :mirrorlist => 'absent',
:baseurl => baseurl })
devel.retrieve
@@ -97,7 +97,7 @@ class TestYumRepo < Test::Unit::TestCase
FileUtils::copy(src, dst)
}
end
-
+
CREATE_EXP = <<'EOF'
[base]
name=Fedora Core $releasever - $basearch - Base
@@ -110,4 +110,4 @@ proxy_username=username
proxy_password=password
EOF
-end
+end
diff --git a/test/ral/type/zone.rb b/test/ral/type/zone.rb
index 59447d74b..a784b8bcf 100755
--- a/test/ral/type/zone.rb
+++ b/test/ral/type/zone.rb
@@ -344,7 +344,7 @@ end
currentvalues = zone.retrieve
- assert_equal(:absent, currentvalues[zone.property(:ensure)],
+ assert_equal(:absent, currentvalues[zone.property(:ensure)],
"Zone is not absent")
end
@@ -411,7 +411,7 @@ end
currentvalues = zone.retrieve
- assert_equal(:absent, currentvalues[zone.property(:ensure)],
+ assert_equal(:absent, currentvalues[zone.property(:ensure)],
"Zone is not absent")
end
end
diff --git a/test/test b/test/test
index 98c504a8d..097885751 100755
--- a/test/test
+++ b/test/test
@@ -132,7 +132,7 @@ def resolve(dir)
if dir.include?(File::SEPARATOR)
basedir = dir.split(File::SEPARATOR)[0]
if dirs.include?(basedir)
- dirs.delete(basedir)
+ dirs.delete(basedir)
dirs << basedir
end
end
@@ -236,6 +236,6 @@ end
# load file unless file =~ /^-/
#end
#
-#runner = Test::Unit::AutoRunner.new(false)
+#runner = Test::Unit::AutoRunner.new(false)
#runner.process_args
#runner.run
diff --git a/test/util/features.rb b/test/util/features.rb
index ef69ad72b..8788599ce 100755
--- a/test/util/features.rb
+++ b/test/util/features.rb
@@ -26,12 +26,12 @@ class TestFeatures < Test::Unit::TestCase
raise ArgumentError, "nopes"
end
end
-
+
assert(@features.respond_to?(:failer?), "Feature method did not get added")
assert_nothing_raised("failure propagated outside of feature") do
assert(! @features.failer?, "failure was considered true")
end
-
+
# Now make one that succeeds
$succeeds = nil
assert_nothing_raised("Failed to add normal feature") do
@@ -40,22 +40,22 @@ class TestFeatures < Test::Unit::TestCase
end
end
assert($succeeds, "Block was not called on initialization")
-
+
assert(@features.respond_to?(:succeeds?), "Did not add succeeding feature")
assert_nothing_raised("Failed to call succeeds") { assert(@features.succeeds?, "Feature was not true") }
end
-
+
def test_libs
assert_nothing_raised do
@features.add(:puppet, :libs => %w{puppet})
end
-
+
assert(@features.puppet?)
-
+
assert_nothing_raised do
@features.add(:missing, :libs => %w{puppet no/such/library/okay})
end
-
+
assert(! @features.missing?, "Missing lib was considered true")
end
diff --git a/test/util/fileparsing.rb b/test/util/fileparsing.rb
index d7c196cdb..c88bcb23a 100755
--- a/test/util/fileparsing.rb
+++ b/test/util/fileparsing.rb
@@ -72,7 +72,7 @@ class TestUtilFileParsing < Test::Unit::TestCase
# Make sure it matches
assert_nothing_raised do
- assert_equal({:record_type => :comment, :line => comment},
+ assert_equal({:record_type => :comment, :line => comment},
@parser.parse_line(comment))
end
@@ -88,13 +88,13 @@ class TestUtilFileParsing < Test::Unit::TestCase
# The comment should still match
assert_nothing_raised do
- assert_equal({:record_type => :comment, :line => comment},
+ assert_equal({:record_type => :comment, :line => comment},
@parser.parse_line(comment))
end
# As should our new line type
assert_nothing_raised do
- assert_equal({:record_type => :blank, :line => ""},
+ assert_equal({:record_type => :blank, :line => ""},
@parser.parse_line(""))
end
@@ -141,12 +141,12 @@ class TestUtilFileParsing < Test::Unit::TestCase
end
assert_nothing_raised("Did not parse old comment") do
- assert_equal({:record_type => :comment, :line => comment},
+ assert_equal({:record_type => :comment, :line => comment},
@parser.parse_line(comment))
end
comment = '" another type of comment'
assert_nothing_raised("Did not parse new comment") do
- assert_equal({:record_type => :comment2, :line => comment},
+ assert_equal({:record_type => :comment2, :line => comment},
@parser.parse_line(comment))
end
@@ -318,7 +318,7 @@ class TestUtilFileParsing < Test::Unit::TestCase
# Check parsing first
result = @parser.parse_line(start)
[:one, :two].each do |param|
- assert_equal(record[param], result[param],
+ assert_equal(record[param], result[param],
"Did not correctly parse %s" % start.inspect)
end
diff --git a/test/util/inifile.rb b/test/util/inifile.rb
index 50075fa92..8ce52ee8d 100755
--- a/test/util/inifile.rb
+++ b/test/util/inifile.rb
@@ -13,7 +13,7 @@ class TestFileType < Test::Unit::TestCase
super
@file = Puppet::Util::IniConfig::File.new
end
-
+
def teardown
@file = nil
super
@@ -43,7 +43,7 @@ class TestFileType < Test::Unit::TestCase
@file.read(fsub)
}
main = get_section('main')
- assert_entries(main,
+ assert_entries(main,
{ 'key1' => 'main.value1', 'key2' => 'main.value2' })
sub1 = get_section('sub1')
assert_entries(sub1, { 'key1' => 'sub1 value1' })
@@ -106,9 +106,9 @@ class TestFileType < Test::Unit::TestCase
end
def assert_entries(section, hash)
- hash.each do |k, v|
- assert_equal(v, section[k],
- "Expected <#{v}> for #{section.name}[#{k}] " +
+ hash.each do |k, v|
+ assert_equal(v, section[k],
+ "Expected <#{v}> for #{section.name}[#{k}] " +
"but got <#{section[k]}>")
end
end
diff --git a/test/util/log.rb b/test/util/log.rb
index 74bb1faa1..00db10e61 100755
--- a/test/util/log.rb
+++ b/test/util/log.rb
@@ -195,7 +195,7 @@ class TestLog < Test::Unit::TestCase
Puppet.warning "A test"
assert(File.read(file) =~ /A test/,
"File did not flush")
- # Rename the file
+ # Rename the file
newfile = file + ".old"
File.rename(file, newfile)
diff --git a/test/util/package.rb b/test/util/package.rb
index 8d4fbc8e8..b77850d4b 100755
--- a/test/util/package.rb
+++ b/test/util/package.rb
@@ -11,7 +11,7 @@ class TestPuppetUtilPackage < Test::Unit::TestCase
include Puppet::Util::Package
def test_versioncmp
- ary = %w{ 1.1.6 2.3 1.1a 3.0 1.5 1 2.4 1.1-4
+ ary = %w{ 1.1.6 2.3 1.1a 3.0 1.5 1 2.4 1.1-4
2.3.1 1.2 2.3.0 1.1-3 2.4b 2.4 2.40.2 2.3a.1 3.1 0002 1.1-5 1.1.a 1.06}
newary = nil
diff --git a/test/util/settings.rb b/test/util/settings.rb
index 1fdd425e6..6d5f6382a 100755
--- a/test/util/settings.rb
+++ b/test/util/settings.rb
@@ -205,7 +205,7 @@ yay = /a/path
file = tempfile()
File.open(file, "w") { |f| f.puts text }
-
+
result = nil
assert_nothing_raised {
result = @config.send(:parse_file, file)
@@ -348,7 +348,7 @@ yay = /a/path
# already stored in a config
def test_writingfiles
File.umask(0022)
-
+
path = tempfile()
mode = 0644
@@ -374,7 +374,7 @@ yay = /a/path
assert_equal(mode, filemode(path), "Modes are not equal")
- # OS X is broken in how it chgrps files
+ # OS X is broken in how it chgrps files
if Puppet::Util::SUIDManager.uid == 0
assert_equal(user.uid, File.stat(path).uid, "UIDS are not equal")
@@ -388,7 +388,7 @@ yay = /a/path
def test_mkdir
File.umask(0022)
-
+
path = tempfile()
mode = 0755
@@ -413,7 +413,7 @@ yay = /a/path
assert_equal(mode, filemode(path), "Modes are not equal")
- # OS X and *BSD is broken in how it chgrps files
+ # OS X and *BSD is broken in how it chgrps files
if Puppet::Util::SUIDManager.uid == 0
assert_equal(user.uid, File.stat(path).uid, "UIDS are not equal")
@@ -448,7 +448,7 @@ yay = /a/path
def test_configs_replace_in_url
config = mkconfig
-
+
config.setdefaults(:mysection, :name => ["yayness", "yay"])
config.setdefaults(:mysection, :url => ["http://$name/rahness", "yay"])
@@ -610,15 +610,15 @@ yay = /a/path
# assert(! yay.find { |o| o.class.name == :group and o.name == "root" },
# "Found root group")
end
-
+
# #415
def test_remove_trailing_spaces
config = mkconfig()
file = tempfile()
File.open(file, "w") { |f| f.puts "rah = something " }
-
+
config.setdefaults(:yay, :config => [file, "eh"], :rah => ["testing", "a desc"])
-
+
assert_nothing_raised { config.parse }
assert_equal("something", config[:rah], "did not remove trailing whitespace in parsing")
end
@@ -701,7 +701,7 @@ yay = /a/path
def test_get_getopt_args
element = CElement.new :name => "foo", :desc => "anything", :settings => Puppet::Util::Settings.new
assert_equal([["--foo", GetoptLong::REQUIRED_ARGUMENT]], element.getopt_args, "Did not produce appropriate getopt args")
-
+
element.short = "n"
assert_equal([["--foo", "-n", GetoptLong::REQUIRED_ARGUMENT]], element.getopt_args, "Did not produce appropriate getopt args")
diff --git a/test/util/storage.rb b/test/util/storage.rb
index 89c3b13f8..e2c4dce59 100755
--- a/test/util/storage.rb
+++ b/test/util/storage.rb
@@ -74,7 +74,7 @@ class TestStorage < Test::Unit::TestCase
assert_same Hash, state.class
assert_equal 0, state.size
end
-
+
def test_caching
hash = nil
one = Puppet::Type.type(:exec).new :title => "/bin/echo one"
@@ -83,7 +83,7 @@ class TestStorage < Test::Unit::TestCase
hash = Puppet::Util::Storage.cache(object)
end
assert_equal({}, hash, "Did not get empty hash back for %s" % object)
-
+
hash[:testing] = true
assert_nothing_raised do
hash = Puppet::Util::Storage.cache(object)
diff --git a/test/util/utiltest.rb b/test/util/utiltest.rb
index 41c9b517a..62179084f 100755
--- a/test/util/utiltest.rb
+++ b/test/util/utiltest.rb
@@ -119,7 +119,7 @@ class TestPuppetUtil < Test::Unit::TestCase
assert_equal(nil, ret)
end
-
+
def test_execute
command = tempfile()
File.open(command, "w") { |f|
@@ -131,13 +131,13 @@ class TestPuppetUtil < Test::Unit::TestCase
output = Puppet::Util.execute([command, "yaytest", "funtest"])
end
assert_equal("yaytest\nfuntest\n", output)
-
+
# Now try it with a single quote
assert_nothing_raised do
output = Puppet::Util.execute([command, "yay'test", "funtest"])
end
assert_equal("yay'test\nfuntest\n", output)
-
+
# Now make sure we can squelch output (#565)
assert_nothing_raised do
output = Puppet::Util.execute([command, "yay'test", "funtest"], :squelch => true)
@@ -148,12 +148,12 @@ class TestPuppetUtil < Test::Unit::TestCase
assert_raise(Puppet::ExecutionFailure) do
out = Puppet::Util.execute(["touch", "/no/such/file/could/exist"])
end
-
+
# And that we can tell it not to fail
assert_nothing_raised() do
out = Puppet::Util.execute(["touch", "/no/such/file/could/exist"], :failonfail => false)
end
-
+
if Process.uid == 0
# Make sure we correctly set our uid and gid
user = nonrootuser
@@ -164,13 +164,13 @@ class TestPuppetUtil < Test::Unit::TestCase
end
assert(FileTest.exists?(file), "file was not created")
assert_equal(user.uid, File.stat(file).uid, "uid was not set correctly")
-
+
# We can't really check the gid, because it just behaves too
# inconsistently everywhere.
# assert_equal(group.gid, File.stat(file).gid,
# "gid was not set correctly")
end
-
+
# (#565) Test the case of patricide.
patricidecommand = tempfile()
File.open(patricidecommand, "w") { |f|
@@ -202,7 +202,7 @@ class TestPuppetUtil < Test::Unit::TestCase
ENV["LC_MESSAGES"] = orig_lc_messages
ENV["LANGUAGE"] = orig_lc_messages
end
-
+
# Mmm, we love gettext(3)
ENV["LANG"] = "en_US"
ENV["LC_ALL"] = "en_US"
@@ -213,12 +213,12 @@ class TestPuppetUtil < Test::Unit::TestCase
assert_equal('C',
Puppet::Util.execute(['ruby', '-e', "print ENV['#{env}']"]),
"Environment var #{env} wasn't set to 'C'")
-
+
assert_equal 'en_US', ENV[env], "Environment var #{env} not set back correctly"
end
end
-
+
# Check whether execute() accepts strings in addition to arrays.
def test_string_exec
cmd = "/bin/echo howdy"