From: Pierangelo Masarati <ando@openldap.org>
Date: Wed, 20 Jul 2005 11:17:06 +0000 (+0000)
Subject: Under some circumstances, port 9010 is already in use and may cause problems to refer... 
X-Git-Tag: OPENLDAP_AC_BP~309
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=6f3363f0d9e4e99e80efefab0fa1bce1e569004f;p=openldap

Under some circumstances, port 9010 is already in use and may cause problems to referrals whose server is supposed to be unavailable
---

diff --git a/servers/slapd/back-sql/rdbms_depend/ibmdb2/testdb_data.sql b/servers/slapd/back-sql/rdbms_depend/ibmdb2/testdb_data.sql
index c204ecd8ce..7bef37495a 100644
--- a/servers/slapd/back-sql/rdbms_depend/ibmdb2/testdb_data.sql
+++ b/servers/slapd/back-sql/rdbms_depend/ibmdb2/testdb_data.sql
@@ -15,4 +15,4 @@ insert into authors_docs (pers_id,doc_id) values (1,1);
 insert into authors_docs (pers_id,doc_id) values (1,2);
 insert into authors_docs (pers_id,doc_id) values (2,1);
 
-insert into referrals (id,name,url) values (1,'Referral','ldap://localhost:9010/');
+insert into referrals (id,name,url) values (1,'Referral','ldap://localhost:9012/');
diff --git a/servers/slapd/back-sql/rdbms_depend/mssql/testdb_metadata.sql b/servers/slapd/back-sql/rdbms_depend/mssql/testdb_metadata.sql
index 9a9582d177..e08752343a 100644
--- a/servers/slapd/back-sql/rdbms_depend/mssql/testdb_metadata.sql
+++ b/servers/slapd/back-sql/rdbms_depend/mssql/testdb_metadata.sql
@@ -99,7 +99,7 @@ insert into ldap_entry_objclasses (entry_id,oc_name)
 values (4,'referral');
 
 insert into ldap_referrals (entry_id,url)
-values (4,'ldap://localhost:9010/');
+values (4,'ldap://localhost:9012/');
 
 -- support procedures
 
diff --git a/servers/slapd/back-sql/rdbms_depend/mysql/testdb_data.sql b/servers/slapd/back-sql/rdbms_depend/mysql/testdb_data.sql
index c204ecd8ce..7bef37495a 100644
--- a/servers/slapd/back-sql/rdbms_depend/mysql/testdb_data.sql
+++ b/servers/slapd/back-sql/rdbms_depend/mysql/testdb_data.sql
@@ -15,4 +15,4 @@ insert into authors_docs (pers_id,doc_id) values (1,1);
 insert into authors_docs (pers_id,doc_id) values (1,2);
 insert into authors_docs (pers_id,doc_id) values (2,1);
 
-insert into referrals (id,name,url) values (1,'Referral','ldap://localhost:9010/');
+insert into referrals (id,name,url) values (1,'Referral','ldap://localhost:9012/');
diff --git a/servers/slapd/back-sql/rdbms_depend/oracle/testdb_metadata.sql b/servers/slapd/back-sql/rdbms_depend/oracle/testdb_metadata.sql
index f6c8d14acc..354d7bd592 100644
--- a/servers/slapd/back-sql/rdbms_depend/oracle/testdb_metadata.sql
+++ b/servers/slapd/back-sql/rdbms_depend/oracle/testdb_metadata.sql
@@ -115,7 +115,7 @@ values (4,'referral');
 --	entry_id	the "ldap_entries.id" of the entry that should be treated as a referral
 --	url		the URI of the referral
 insert into ldap_referrals (entry_id,url)
-values (4,'ldap://localhost:9010/');
+values (4,'ldap://localhost:9012/');
 
 
 -- procedures
diff --git a/servers/slapd/back-sql/rdbms_depend/pgsql/testdb_data.sql b/servers/slapd/back-sql/rdbms_depend/pgsql/testdb_data.sql
index c204ecd8ce..7bef37495a 100644
--- a/servers/slapd/back-sql/rdbms_depend/pgsql/testdb_data.sql
+++ b/servers/slapd/back-sql/rdbms_depend/pgsql/testdb_data.sql
@@ -15,4 +15,4 @@ insert into authors_docs (pers_id,doc_id) values (1,1);
 insert into authors_docs (pers_id,doc_id) values (1,2);
 insert into authors_docs (pers_id,doc_id) values (2,1);
 
-insert into referrals (id,name,url) values (1,'Referral','ldap://localhost:9010/');
+insert into referrals (id,name,url) values (1,'Referral','ldap://localhost:9012/');
diff --git a/servers/slapd/back-sql/rdbms_depend/timesten/testdb_metadata.sql b/servers/slapd/back-sql/rdbms_depend/timesten/testdb_metadata.sql
index 40e8001a8c..f9e341906a 100644
--- a/servers/slapd/back-sql/rdbms_depend/timesten/testdb_metadata.sql
+++ b/servers/slapd/back-sql/rdbms_depend/timesten/testdb_metadata.sql
@@ -105,4 +105,4 @@ insert into ldap_entry_objclasses (entry_id,oc_name)
 values (4,'referral');
 
 insert into ldap_referrals (entry_id,url)
-values (4,'ldap://localhost:9010');
+values (4,'ldap://localhost:9012');
diff --git a/tests/data/meta.out b/tests/data/meta.out
index e44390989c..817440d020 100644
--- a/tests/data/meta.out
+++ b/tests/data/meta.out
@@ -427,7 +427,7 @@ pager: +1 313 555 2844
 facsimileTelephoneNumber: +1 313 555 9700
 telephoneNumber: +1 313 555 5331
 
-# refldap://:9010/cn=Somewhere,ou=Meta,dc=example,dc=com??sub
+# refldap://localhost:9016/cn=Somewhere,ou=Meta,dc=example,dc=com??sub
 
 # searching base="o=Example,c=US"...
 dn: cn=Added Group,ou=Groups,o=Example,c=US
@@ -890,7 +890,7 @@ pager: +1 313 555 2844
 facsimileTelephoneNumber: +1 313 555 9700
 telephoneNumber: +1 313 555 5331
 
-# refldap://:9010/cn=Somewhere,ou=Meta,dc=example,dc=com??sub
+# refldap://localhost:9016/cn=Somewhere,ou=Meta,dc=example,dc=com??sub
 
 # 	base="o=Example,c=US"...
 dn: cn=Added Group,ou=Groups,o=Example,c=US
@@ -1342,7 +1342,7 @@ dn: cn=Somewhere,ou=Meta,o=Example,c=US
 objectClass: referral
 objectClass: extensibleObject
 cn: Somewhere
-ref: ldap://:9010
+ref: ldap://localhost:9016
 
 dn: cn=Ursula Hampster,ou=Alumni Association,ou=People,o=Example,c=US
 objectClass: OpenLDAPperson
@@ -1395,12 +1395,12 @@ seeAlso: cn=All Staff,ou=Groups,o=Example,c=US
 dn: cn=Ursula Hampster,ou=Alumni Association,ou=People,o=Example,c=US
 seeAlso: cn=All Staff,ou=Groups,o=Example,c=US
 
-# refldap://:9010/cn=Somewhere,ou=Meta,dc=example,dc=com??sub
+# refldap://localhost:9016/cn=Somewhere,ou=Meta,dc=example,dc=com??sub
 
 # searching filter="(uid=example)"
 # 	attrs="uid"
 # 	base="o=Example,c=US"...
-# refldap://:9010/cn=Somewhere,ou=Meta,dc=example,dc=com??sub
+# refldap://localhost:9016/cn=Somewhere,ou=Meta,dc=example,dc=com??sub
 
 # searching filter="(member=cn=Another Added Group,ou=Groups,o=Example,c=US)"
 # 	attrs="member"
@@ -1409,5 +1409,5 @@ dn: cn=Another Added Group,ou=Groups,o=Example,c=US
 member: cn=Added Group,ou=Groups,o=Example,c=US
 member: cn=Another Added Group,ou=Groups,o=Example,c=US
 
-# refldap://:9010/cn=Somewhere,ou=Meta,dc=example,dc=com??sub
+# refldap://localhost:9016/cn=Somewhere,ou=Meta,dc=example,dc=com??sub
 
diff --git a/tests/data/metaconcurrency.out b/tests/data/metaconcurrency.out
index ca8d796b8f..07fc3a6677 100644
--- a/tests/data/metaconcurrency.out
+++ b/tests/data/metaconcurrency.out
@@ -426,5 +426,5 @@ pager: +1 313 555 2844
 facsimileTelephoneNumber: +1 313 555 9700
 telephoneNumber: +1 313 555 5331
 
-# refldap://:9010/cn=Somewhere,ou=Meta,dc=example,dc=com??sub
+# refldap://localhost:9016/cn=Somewhere,ou=Meta,dc=example,dc=com??sub
 
diff --git a/tests/data/relay.out b/tests/data/relay.out
index c88d78591d..ed7b8333c7 100644
--- a/tests/data/relay.out
+++ b/tests/data/relay.out
@@ -2052,7 +2052,7 @@ mail: auser@mail.alumni.example.com
 telephoneNumber: +49 1234-567-890
 description: Just added in o=Beispiel,c=DE naming context
 
-# refldap://localhost:9010/ou=Referrals,o=Beispiel,c=DE??sub
+# refldap://localhost:9012/ou=Referrals,o=Beispiel,c=DE??sub
 
 dn: cn=Added Group,ou=Groups,o=Example,c=US
 objectClass: groupOfNames
@@ -2477,7 +2477,7 @@ mail: auser@mail.alumni.example.com
 telephoneNumber: +49 1234-567-890
 description: Just added in o=Beispiel,c=DE naming context
 
-# refldap://localhost:9010/ou=Referrals,o=Beispiel,c=DE??sub
+# refldap://localhost:9012/ou=Referrals,o=Beispiel,c=DE??sub
 
 dn: cn=Added Group,ou=Groups,o=Esempio,c=IT
 objectClass: groupOfUniqueNames
@@ -2501,9 +2501,9 @@ objectClass: extensibleObject
 ou: Referrals
 description: Just added as ldap://localhost.localdomain:389/ou=Referrals,o=Bei
  spiel,c=DE
-description: ...and modified as ldap://localhost:9010/ou=Referrals,o=Beispiel,
+description: ...and modified as ldap://localhost:9012/ou=Referrals,o=Beispiel,
  c=DE
-ref: ldap://localhost:9010/ou=Referrals,o=Beispiel,c=DE
+ref: ldap://localhost:9012/ou=Referrals,o=Beispiel,c=DE
 
 # 	base="o=Example,c=US"...
 dn: ou=Referrals,o=Example,c=US
@@ -2512,9 +2512,9 @@ objectClass: extensibleObject
 ou: Referrals
 description: Just added as ldap://localhost.localdomain:389/ou=Referrals,o=Bei
  spiel,c=DE
-description: ...and modified as ldap://localhost:9010/ou=Referrals,o=Beispiel,
+description: ...and modified as ldap://localhost:9012/ou=Referrals,o=Beispiel,
  c=DE
-ref: ldap://localhost:9010/ou=Referrals,o=Beispiel,c=DE
+ref: ldap://localhost:9012/ou=Referrals,o=Beispiel,c=DE
 
 # 	base="o=Esempio,c=IT"...
 dn: ou=Referrals,o=Esempio,c=IT
@@ -2523,9 +2523,9 @@ objectClass: extensibleObject
 ou: Referrals
 description: Just added as ldap://localhost.localdomain:389/ou=Referrals,o=Bei
  spiel,c=DE
-description: ...and modified as ldap://localhost:9010/ou=Referrals,o=Beispiel,
+description: ...and modified as ldap://localhost:9012/ou=Referrals,o=Beispiel,
  c=DE
-ref: ldap://localhost:9010/ou=Referrals,o=Beispiel,c=DE
+ref: ldap://localhost:9012/ou=Referrals,o=Beispiel,c=DE
 
 # searching filter="(seeAlso=cn=all staff,ou=Groups,o=Example,c=US)"
 # 	attrs="seeAlso"
@@ -2564,7 +2564,7 @@ seeAlso: cn=Ursula Hampster,ou=Alumni Association,ou=People,o=Example,c=US
 dn: cn=Added User,ou=Alumni Association,ou=People,o=Example,c=US
 seeAlso: cn=All Staff,ou=Groups,o=Example,c=US
 
-# refldap://localhost:9010/ou=Referrals,o=Beispiel,c=DE??sub
+# refldap://localhost:9012/ou=Referrals,o=Beispiel,c=DE??sub
 
 # searching filter="(uid=example)"
 # 	attrs="uid"
@@ -2572,12 +2572,12 @@ seeAlso: cn=All Staff,ou=Groups,o=Example,c=US
 dn: o=Example,c=US
 uid: example
 
-# refldap://localhost:9010/ou=Referrals,o=Beispiel,c=DE??sub
+# refldap://localhost:9012/ou=Referrals,o=Beispiel,c=DE??sub
 
 # searching filter="(member=cn=Another Added Group,ou=Groups,o=Example,c=US)"
 # 	attrs="member"
 # 	base="o=Example,c=US"...
-# refldap://localhost:9010/ou=Referrals,o=Beispiel,c=DE??sub
+# refldap://localhost:9012/ou=Referrals,o=Beispiel,c=DE??sub
 
 dn: cn=Another Added Group,ou=Groups,o=Example,c=US
 member: cn=Added Group,ou=Groups,o=Example,c=US
diff --git a/tests/data/sql-read.out b/tests/data/sql-read.out
index 1dd9386354..53fe8c059c 100644
--- a/tests/data/sql-read.out
+++ b/tests/data/sql-read.out
@@ -21,7 +21,7 @@ documentTitle: book2
 documentAuthor: cn=Mitya Kovalev,dc=example,dc=com
 documentIdentifier: document 2
 
-# refldap://localhost:9010/dc=example,dc=com??one
+# refldap://localhost:9012/dc=example,dc=com??one
 
 dn: cn=Mitya Kovalev,dc=example,dc=com
 objectClass: inetOrgPerson
@@ -63,7 +63,7 @@ documentTitle: book2
 documentAuthor: cn=Mitya Kovalev,dc=example,dc=com
 documentIdentifier: document 2
 
-# refldap://localhost:9010/dc=example,dc=com??sub
+# refldap://localhost:9012/dc=example,dc=com??sub
 
 dn: dc=example,dc=com
 objectClass: organization
@@ -115,7 +115,7 @@ dn: ou=Referral,dc=example,dc=com
 objectClass: referral
 objectClass: extensibleObject
 ou: Referral
-ref: ldap://localhost:9010/
+ref: ldap://localhost:9012/
 
 dn: dc=example,dc=com
 objectClass: organization
@@ -149,7 +149,7 @@ givenName: Akakiy
 
 # Testing invalid filter...
 # Testing exact search...
-# refldap://localhost:9010/dc=example,dc=com??sub
+# refldap://localhost:9012/dc=example,dc=com??sub
 
 dn: cn=Mitya Kovalev,dc=example,dc=com
 objectClass: inetOrgPerson
@@ -162,7 +162,7 @@ telephoneNumber: 222-3234
 telephoneNumber: 332-2334
 
 # Testing substrings initial search...
-# refldap://localhost:9010/dc=example,dc=com??sub
+# refldap://localhost:9012/dc=example,dc=com??sub
 
 dn: cn=Mitya Kovalev,dc=example,dc=com
 objectClass: inetOrgPerson
@@ -175,7 +175,7 @@ telephoneNumber: 222-3234
 telephoneNumber: 332-2334
 
 # Testing substrings any search...
-# refldap://localhost:9010/dc=example,dc=com??sub
+# refldap://localhost:9012/dc=example,dc=com??sub
 
 dn: cn=Mitya Kovalev,dc=example,dc=com
 objectClass: inetOrgPerson
@@ -188,7 +188,7 @@ telephoneNumber: 222-3234
 telephoneNumber: 332-2334
 
 # Testing substrings final search...
-# refldap://localhost:9010/dc=example,dc=com??sub
+# refldap://localhost:9012/dc=example,dc=com??sub
 
 dn: cn=Mitya Kovalev,dc=example,dc=com
 objectClass: inetOrgPerson
@@ -201,7 +201,7 @@ telephoneNumber: 222-3234
 telephoneNumber: 332-2334
 
 # Testing approx search...
-# refldap://localhost:9010/dc=example,dc=com??sub
+# refldap://localhost:9012/dc=example,dc=com??sub
 
 dn: cn=Mitya Kovalev,dc=example,dc=com
 objectClass: inetOrgPerson
@@ -214,7 +214,7 @@ telephoneNumber: 222-3234
 telephoneNumber: 332-2334
 
 # Testing extensible filter search...
-# refldap://localhost:9010/dc=example,dc=com??sub
+# refldap://localhost:9012/dc=example,dc=com??sub
 
 dn: cn=Mitya Kovalev,dc=example,dc=com
 objectClass: inetOrgPerson
@@ -227,7 +227,7 @@ telephoneNumber: 222-3234
 telephoneNumber: 332-2334
 
 # Testing search for telephoneNumber...
-# refldap://localhost:9010/dc=example,dc=com??sub
+# refldap://localhost:9012/dc=example,dc=com??sub
 
 dn: cn=Mitya Kovalev,dc=example,dc=com
 objectClass: inetOrgPerson
@@ -240,7 +240,7 @@ telephoneNumber: 222-3234
 telephoneNumber: 332-2334
 
 # Testing AND search...
-# refldap://localhost:9010/dc=example,dc=com??sub
+# refldap://localhost:9012/dc=example,dc=com??sub
 
 dn: cn=Mitya Kovalev,dc=example,dc=com
 objectClass: inetOrgPerson
@@ -260,7 +260,7 @@ o: Example
 dc: example
 
 # Testing OR search...
-# refldap://localhost:9010/dc=example,dc=com??sub
+# refldap://localhost:9012/dc=example,dc=com??sub
 
 dn: cn=Mitya Kovalev,dc=example,dc=com
 objectClass: inetOrgPerson
@@ -325,7 +325,7 @@ documentTitle: book2
 documentAuthor: cn=Mitya Kovalev,dc=example,dc=com
 documentIdentifier: document 2
 
-# refldap://localhost:9010/dc=example,dc=com??sub
+# refldap://localhost:9012/dc=example,dc=com??sub
 
 dn: dc=example,dc=com
 objectClass: organization
@@ -349,7 +349,7 @@ documentTitle: book2
 documentAuthor: cn=Mitya Kovalev,dc=example,dc=com
 documentIdentifier: document 2
 
-# refldap://localhost:9010/dc=example,dc=com??sub
+# refldap://localhost:9012/dc=example,dc=com??sub
 
 dn: cn=Mitya Kovalev,dc=example,dc=com
 objectClass: inetOrgPerson
@@ -415,7 +415,7 @@ o: Example
 dc: example
 
 # Testing hasSubordinates in filter...
-# refldap://localhost:9010/dc=example,dc=com??sub
+# refldap://localhost:9012/dc=example,dc=com??sub
 
 dn: dc=example,dc=com
 objectClass: organization
@@ -435,7 +435,7 @@ telephoneNumber: 222-3234
 telephoneNumber: 332-2334
 
 # Testing attribute inheritance in requested attributes...
-# refldap://localhost:9010/dc=example,dc=com??sub
+# refldap://localhost:9012/dc=example,dc=com??sub
 
 dn: cn=Mitya Kovalev,dc=example,dc=com
 cn: Mitya Kovalev
@@ -449,7 +449,7 @@ objectClass: document
 dn: documentTitle=book2,dc=example,dc=com
 objectClass: document
 
-# refldap://localhost:9010/dc=example,dc=com??sub
+# refldap://localhost:9012/dc=example,dc=com??sub
 
 dn: dc=example,dc=com
 objectClass: organization
@@ -479,7 +479,7 @@ subschemaSubentry: cn=Subschema
 hasSubordinates: FALSE
 entryUUID: 00000002-0000-0002-0000-000000000000
 
-# refldap://localhost:9010/dc=example,dc=com??sub
+# refldap://localhost:9012/dc=example,dc=com??sub
 
 dn: dc=example,dc=com
 structuralObjectClass: organization
diff --git a/tests/data/sql-write.out b/tests/data/sql-write.out
index 4573653d2d..9fb7d5340f 100644
--- a/tests/data/sql-write.out
+++ b/tests/data/sql-write.out
@@ -44,7 +44,7 @@ seeAlso: documentTitle=book1,dc=example,dc=com
 givenName: Torvlobnor
 telephoneNumber: 545-4563
 
-# refldap://localhost:9010/dc=example,dc=com??sub
+# refldap://localhost:9012/dc=example,dc=com??sub
 
 # Using ldapsearch to retrieve all the entries...
 dn: cn=Akakiy Zinberstein,dc=example,dc=com
@@ -139,7 +139,7 @@ documentTitle: War and Peace
 documentAuthor: cn=Lev Tolstoij,dc=example,dc=com
 documentIdentifier: document 3
 
-# refldap://localhost:9010/dc=example,dc=com??sub
+# refldap://localhost:9012/dc=example,dc=com??sub
 
 # Using ldapsearch to retrieve all the entries...
 dn: cn=Akakiy Zinberstein,dc=example,dc=com
@@ -237,7 +237,7 @@ documentTitle: War and Peace
 documentAuthor: cn=Lev Tolstoij,dc=example,dc=com
 documentIdentifier: document 3
 
-# refldap://localhost:9010/dc=example,dc=com??sub
+# refldap://localhost:9012/dc=example,dc=com??sub
 
 # Using ldapsearch to retrieve all the entries...
 dn: cn=Akakiy Zinberstein,dc=example,dc=com
@@ -310,7 +310,7 @@ documentTitle: War and Peace
 documentAuthor: cn=Lev Tolstoij,dc=example,dc=com
 documentIdentifier: document 3
 
-# refldap://localhost:9010/dc=example,dc=com??sub
+# refldap://localhost:9012/dc=example,dc=com??sub
 
 # Using ldapsearch to retrieve all the entries...
 dn: cn=Akakiy Zinberstein,dc=example,dc=com
@@ -383,7 +383,7 @@ documentTitle: War and Peace
 documentAuthor: cn=Lev Tolstoij,dc=subnet,dc=example,dc=com
 documentIdentifier: document 3
 
-# refldap://localhost:9010/dc=example,dc=com??sub
+# refldap://localhost:9012/dc=example,dc=com??sub
 
 # Using ldapsearch to retrieve the modified entry...
 dn: ou=Referral,dc=example,dc=com
diff --git a/tests/data/test-meta.ldif b/tests/data/test-meta.ldif
index 39456f24bb..7b6ae334e4 100644
--- a/tests/data/test-meta.ldif
+++ b/tests/data/test-meta.ldif
@@ -20,5 +20,5 @@ dn: cn=Somewhere,ou=Meta,dc=example,dc=com
 objectClass: referral
 objectClass: extensibleObject
 cn: Somewhere
-ref: ldap://:9010
+ref: ldap://localhost:9016
 
diff --git a/tests/scripts/relay b/tests/scripts/relay
index 638d330b77..a6ae27a4ff 100755
--- a/tests/scripts/relay
+++ b/tests/scripts/relay
@@ -169,10 +169,10 @@ description: Just added as ldap://localhost.localdomain:389/ou=Referrals,$BASEDN
 dn: ou=Referrals,$BASEDN
 changetype: modify
 replace: ref
-ref: ldap://localhost:9010/ou=Referrals,$BASEDN
+ref: ldap://localhost:9012/ou=Referrals,$BASEDN
 -
 add: description
-description: ...and modified as ldap://localhost:9010/ou=Referrals,$BASEDN
+description: ...and modified as ldap://localhost:9012/ou=Referrals,$BASEDN
 -
 EOMODS