r12703: Fix handling of short passdb backends (also reported by Steinar Gunderson)

(This used to be commit 4c562c42b43d98f4c6bdbacc5cb1dd5e65bc3418)

diff --git a/source4/scripting/libjs/upgrade.js b/source4/scripting/libjs/upgrade.js
index 0ffb790d5f42f8e337431b3a6c770cd2c7a27bb2..51818487eb6b93767c52a2d0112df95da13fab89 100644 (file)
--- 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) {
        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);
+                               }

                        }
                }
        }
                        }
                }
        }