verdnatura-mirror
/
node-ldapjs
mirror of https://github.com/ldapjs/node-ldapjs.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

more dn/server cleanup

This commit is contained in:
Mark Cavage 2011-11-07 17:23:38 -08:00
parent 28ddaaad69
commit 8c212908a0
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/dn.js
View File

@ -222,12 +222,16 @@ DN.prototype.childOf = function(dn) {
var diff = this.rdns.length - dn.rdns.length;
for (var i = dn.rdns.length - 1; i >= 0; i--) {
var rdn = dn.rdns[i];
for (var k in rdn) {
if (rdn.hasOwnProperty(k)) {
var keys = Object.keys(rdn);
if (!keys.length)
return false;
for (var j = 0; j < keys.length; j++) {
var k = keys[j];
var ourRdn = this.rdns[i + diff];
if (ourRdn[k] !== rdn[k])
return false;
}
}
}
@ -245,12 +249,16 @@ DN.prototype.parentOf = function(dn) {
var diff = dn.rdns.length - this.rdns.length;
for (var i = this.rdns.length - 1; i >= 0; i--) {
var rdn = this.rdns[i];
for (var k in rdn) {
if (rdn.hasOwnProperty(k)) {
var theirRdn = dn.rdns[i + diff];
if (theirRdn[k] !== rdn[k])
return false;
}
var keys = Object.keys(rdn);
if (!keys.length)
return false;
for (var j = 0; j < keys.length; j++) {
var k = keys[j];
var theirRdn = dn.rdns[i + diff];
if (theirRdn[k] !== rdn[k])
return false;
}
}

1
lib/server.js
View File

@ -789,6 +789,7 @@ Server.prototype._getHandlerChain = function(req) {
if (!route.dn.equals(req.dn) && !route.dn.parentOf(req.dn))
continue;
console.log(route.dn.parentOf(req.dn) + ' -> ' + req.dn)
// We should be good to go.
req.suffix = route.dn;