git.samba.org
/
jelmer
/
samba4-debian.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8b86a5d
)
r10515: Handle replacement of "domain logons" and "domain master" by "server role"
author
Jelmer Vernooij
<jelmer@samba.org>
Mon, 26 Sep 2005 18:15:24 +0000
(18:15 +0000)
committer
Gerald (Jerry) Carter
<jerry@samba.org>
Wed, 10 Oct 2007 18:38:59 +0000
(13:38 -0500)
source/scripting/libjs/upgrade.js
patch
|
blob
|
history
diff --git
a/source/scripting/libjs/upgrade.js
b/source/scripting/libjs/upgrade.js
index 62556ed8d9a68e9cef712e5a991a307608af41c0..6109371338ad624b678c33d3aa3db0e2eb104eb8 100644
(file)
--- a/
source/scripting/libjs/upgrade.js
+++ b/
source/scripting/libjs/upgrade.js
@@
-387,11
+387,9
@@
smbconf_keep = new Array(
"map system",
"map hidden",
"map archive",
"map system",
"map hidden",
"map archive",
- "domain logons",
"preferred master",
"prefered master",
"local master",
"preferred master",
"prefered master",
"local master",
- "domain master",
"browseable",
"browsable",
"wins server",
"browseable",
"browsable",
"wins server",
@@
-444,6
+442,20
@@
function upgrade_smbconf(oldconf,mark)
}
}
}
}
+ if (oldconf.get("domain logons") == "True") {
+ if (oldconf.get("domain master") == "True") {
+ newconf.set("role", "pdc");
+ } else {
+ newconf.set("role", "bdc");
+ }
+ } else {
+ if (oldconf.get("domain master") == "True") {
+ newconf.set("role", "standalone");
+ } else {
+ newconf.set("role", "member server");
+ }
+ }
+
return newconf;
}
return newconf;
}