* HKPT
*/
-function upgrade_registry(regdb,prefix)
+function upgrade_registry(regdb,prefix,ldb)
{
assert(regdb != undefined);
var prefix_up = strupper(prefix);
-
- var ldif = "";
+ var ldif = new Array();
for (var i in regdb.keys) {
var rk = regdb.keys[i];
var pts = split("/", rk.name);
/* Convert key name to dn */
- ldif = ldif + sprintf("
+ ldif[rk.name] = sprintf("
dn: %s
name: %s
for (var j in rk.values) {
var rv = rk.values[j];
- ldif = ldif + sprintf("
+ ldif[rk.name + " (" + rv.name + ")"] = sprintf("
dn: %s,value=%s
value: %s
type: %d
-data:: %s", keydn, rv.value, rv.type, base64(rv.data));
+data:: %s", keydn, rv.name, rv.name, rv.type, ldb.encode(rv.data));
}
}
var ldb = ldb_init();
var ldif = sprintf(
"dn: cn=%s,%s
-objectClass: top
-objectClass: person
objectClass: user
lastLogon: %d
lastLogoff: %d
var lp = loadparm_init();
var rdn_list;
- var domainname = samba3.get_param("global", "workgroup");
-
+ var domainname = samba3.configuration.get("workgroup");
+
if (domainname == undefined) {
domainname = samba3.secrets.domains[0].name;
println("No domain specified in smb.conf file, assuming '" + domainname + "'");
var domsec = samba3.find_domainsecrets(domainname);
var hostsec = samba3.find_domainsecrets(hostname());
- var realm = samba3.get_param("global", "realm");
+ var realm = samba3.configuration.get("realm");
if (realm == undefined) {
realm = domainname;
return subobj;
}
-var keep = new Array(
+smbconf_keep = new Array(
"dos charset",
"unix charset",
"display charset",
"host msdfs",
"winbind separator");
-function upgrade_smbconf(samba3)
-{
- //FIXME
-}
-
-function save_smbconf(path,smbconf)
+/*
+ Remove configuration variables not present in Samba4
+ oldconf: Old configuration structure
+ mark: Whether removed configuration variables should be
+ kept in the new configuration as "samba3:<name>"
+ */
+function upgrade_smbconf(oldconf,mark)
{
- var data = "
-# Generated by upgrade.js";
-
- for (var i in smbconf.shares) {
- var s = smbconf.shares[i];
- data = data + "\n[" + s.name + "]\n";
- for (var j in s.parameters) {
- var p = s.parameters[j];
- data = data + "\t" + p.name + " = " + p + "\n";
+ var data = oldconf.data();
+ var newconf = param_init();
+
+ for (var s in data) {
+ for (var p in data[s]) {
+ var keep = false;
+ for (var k in smbconf_keep) {
+ if (smbconf_keep[k] == p) {
+ keep = true;
+ break;
+ }
+ }
+
+ if (keep) {
+ newconf.set(s, p, oldconf.get(s, p));
+ } else if (mark) {
+ newconf.set(s, "samba3:"+p, oldconf.get(s,p));
+ }
}
}
-
- sys.file_save(path,data);
+
+ return newconf;
}
-function upgrade(subobj, samba3, message)
+function upgrade(subobj, samba3, message, paths)
{
+ var ret = 0;
+ var lp = loadparm_init();
var samdb = ldb_init();
- var ok = samdb.connect("sam.ldb");
+ var ok = samdb.connect(paths.samdb);
assert(ok);
+ message("Writing configuration\n");
+ var newconf = upgrade_smbconf(samba3.configuration,true);
+ newconf.save(paths.smbconf);
+
message("Importing account policies\n");
var ldif = upgrade_sam_policy(samba3,subobj.BASEDN);
ok = samdb.modify(ldif);
assert(ok);
+ // figure out ldapurl, if applicable
var ldapurl = undefined;
+ 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);
+ }
+ }
+ }
- // FIXME: figure out ldapurl
+ // URL was not specified in passdb backend but ldap /is/ used
+ if (ldapurl == "") {
+ ldapurl = "ldap://" + samba3.configuration.get("ldap server");
+ }
// Enable samba3sam module if original passdb backend was ldap
if (ldapurl != undefined) {
+ message("Enabling Samba3 LDAP mappings for SAM database\n");
var ldif = sprintf("
dn: @MAP=samba3sam
@MAP_URL: %s", ldapurl);
samdb.add(ldif);
samdb.modify("dn: @MODULES
-@LIST: samldb,timestamps,objectguid,rdn_name");
+@LIST: samldb,timestamps,objectguid,rdn_name,samba3sam");
}
message("Importing users\n");
for (var i in samba3.samaccounts) {
- message("... " + samba3.samaccounts[i].username);
+ var msg = "... " + samba3.samaccounts[i].username;
var ldif = upgrade_sam_account(samba3.samaccounts[i],subobj.BASEDN);
ok = samdb.add(ldif);
- if (!ok) { message("... error!"); }
- message("\n");
+ if (!ok) {
+ msg = msg + "... error: " + samdb.errstring();
+ ret = ret + 1;
+ }
+ message(msg + "\n");
}
message("Importing groups\n");
for (var i in samba3.groupmappings) {
- message("... " + samba3.groupmappings[i].nt_name);
+ var msg = "... " + samba3.groupmappings[i].nt_name;
var ldif = upgrade_sam_group(samba3.groupmappings[i],subobj.BASEDN);
ok = samdb.add(ldif);
- if (!ok) { message("... error!"); }
- message("\n");
+ if (!ok) {
+ msg = msg + "... error: " + samdb.errstring();
+ ret = ret + 1;
+ }
+ message(msg + "\n");
}
message("Importing registry data\n");
var hives = new Array("hkcr","hkcu","hklm","hkpd","hku","hkpt");
for (var i in hives) {
- message("... " + hives[i] + "\n");
+ var hn = hives[i];
+ message("... " + hn + "\n");
var regdb = ldb_init();
- ok = regdb.connect(hives[i] + ".ldb");
- assert(ok);
- var ldif = upgrade_registry(samba3.registry, hives[i]);
- ok = regdb.add(ldif);
+ ok = regdb.connect(paths[hn]);
assert(ok);
+ var ldif = upgrade_registry(samba3.registry, hn, regdb);
+ for (var j in ldif) {
+ var msg = "... ... " + j;
+ ok = regdb.add(ldif[j]);
+ if (!ok) {
+ msg = msg + "... error: " + regdb.errstring();
+ ret = ret + 1;
+ }
+ message(msg + "\n");
+ }
}
message("Importing WINS data\n");
var winsdb = ldb_init();
- ok = winsdb.connect("wins.ldb");
+ ok = winsdb.connect(paths.winsdb);
assert(ok);
+ ldb_erase(winsdb);
var ldif = upgrade_wins(samba3);
ok = winsdb.add(ldif);
assert(ok);
- return ok;
+ return ret;
+}
+
+function upgrade_verify(subobj, samba3,paths,message)
+{
+ message("Verifying account policies\n");
+ var samldb = ldb_init();
+ var ne = 0;
+
+ var ok = samldb.connect(paths.samdb);
+ assert(ok);
+
+ // FIXME
}
git.samba.org / samba.git / blobdiff