diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-01-03 20:26:57 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:49:43 -0500 |
| commit | 65bf7621d9cb40650478bb126332c5d5cf2301f1 (patch) | |
| tree | 59c74a02fd6088a3ca20c56246f623b2e6036ada | |
| parent | 733dc7b07380b55e6ce84d9aa4405ef1a40b9c97 (diff) | |
| download | samba-65bf7621d9cb40650478bb126332c5d5cf2301f1.tar.gz samba-65bf7621d9cb40650478bb126332c5d5cf2301f1.tar.bz2 samba-65bf7621d9cb40650478bb126332c5d5cf2301f1.zip | |
r12703: Fix handling of short passdb backends (also reported by Steinar Gunderson)
(This used to be commit 4c562c42b43d98f4c6bdbacc5cb1dd5e65bc3418)
| -rw-r--r-- | source4/scripting/libjs/upgrade.js | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source4/scripting/libjs/upgrade.js b/source4/scripting/libjs/upgrade.js index 0ffb790d5f..51818487eb 100644 --- a/source4/scripting/libjs/upgrade.js +++ b/source4/scripting/libjs/upgrade.js @@ -605,8 +605,10 @@ data: %d var pdb = samba3.configuration.get_list("passdb backend"); if (pdb != undefined) { for (var b in pdb) { - if (substr(pdb[b], 0, 7) == "ldapsam") { - ldapurl = substr(pdb[b], 8); + if (strlen(pdb[b]) >= 7) { + if (substr(pdb[b], 0, 7) == "ldapsam") { + ldapurl = substr(pdb[b], 8); + } } } } |