WMDE
/
LDAPAccountManager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

removed domain SID from configuration

This commit is contained in:
Roland Gruber 2003-08-13 12:42:33 +00:00
parent 3d2241b4e8
commit a052e6af9b
4 changed files with 1 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
lam/lib/config.inc
View File

@ -117,9 +117,6 @@ class Config {
// if "yes" use the new LDAP schema for Samba 3.x
var $samba3;
// Samba 3 domain SIDs
var $domainSID;
// name of configuration file
var $file;
@ -232,10 +229,6 @@ class Config {
$this->samba3 = chop(substr($line, 8, strlen($line)-8));
continue;
}
if (substr($line, 0, 11) == "domainSID: ") {
$this->domainSID = chop(substr($line, 11, strlen($line)-11));
continue;
}
}
fclose($file);
}
@ -252,7 +245,7 @@ class Config {
$save_serverURL = $save_passwd = $save_admins = $save_suffusr = $save_suffgrp = $save_suffhst =
$save_minUID = $save_maxUID = $save_minGID = $save_maxGID = $save_minMach = $save_maxMach =
$save_usrlstatrr = $save_grplstatrr = $save_hstlstatrr = $save_maxlstent = $save_deflang =
$save_scriptPath = $save_scriptServer = $save_samba3 = $save_domainSID = $save_suffdom =
$save_scriptPath = $save_scriptServer = $save_samba3 = $save_suffdom =
$save_suffmap = False;
$file = fopen($conffile, "r");
$file_array = array();
@ -375,11 +368,6 @@ class Config {
$save_samba3 = True;
continue;
}
if (substr($file_array[$i], 0, 11) == "domainSID: ") {
$file_array[$i] = "domainSID: " . $this->domainSID . "\n";
$save_domainSID = True;
continue;
}
}
// check if we have to add new entries (e.g. if user upgraded LAM and has an old config file)
if (!$save_serverURL == True) array_push($file_array, "\n\n# server address (e.g. ldap://localhost:389 or ldaps://localhost:636)\n" . "serverURL: " . $this->ServerURL . "\n");
@ -414,7 +402,6 @@ class Config {
if (!$save_scriptPath == True) array_push($file_array, "\n\n# Path to external Script\n" . "scriptPath: " . $this->scriptPath . "\n");
if (!$save_scriptServer == True) array_push($file_array, "\n\n# Server of external Script\n" . "scriptServer: " . $this->scriptServer . "\n");
if (!$save_samba3 == True) array_push($file_array, "\n\n# Set to \"yes\" only if you use the new Samba 3.x schema.\n" . "samba3: " . $this->samba3 . "\n");
if (!$save_domainSID == True) array_push($file_array, "\n\n# Samba 3 domain SID. Set only if you use the new Samba 3.x schema.\n" . "domainSID: " . $this->domainSID . "\n");
$file = fopen($conffile, "w");
if ($file) {
for ($i = 0; $i < sizeof($file_array); $i++) fputs($file, $file_array[$i]);
@ -431,7 +418,6 @@ class Config {
function printconf() {
echo "<b>" . _("Server address") . ": </b>" . $this->ServerURL . "<br>";
echo "<b>" . _("Samba 3.x schema") . ": </b>" . $this->samba3 . "<br>";
echo "<b>" . _("Domain SID") . ": </b>" . $this->domainSID . "<br>";
echo "<b>" . _("UserSuffix") . ": </b>" . $this->Suff_users . "<br>";
echo "<b>" . _("GroupSuffix") . ": </b>" . $this->Suff_groups . "<br>";
echo "<b>" . _("HostSuffix") . ": </b>" . $this->Suff_hosts . "<br>";
@ -768,23 +754,6 @@ class Config {
return true;
}
// returns the Samba domain SID (Samba 3 only)
function get_domainSID() {
return $this->domainSID;
}
// sets the Samba domain SID (Samba 3 only)
function set_domainSID($value) {
if (!$value) { // optional parameter
$this->domainSID = "";
}
elseif (is_string($value) && eregi("^S-[0-9]-[0-9]-[0-9]{2,2}-[0-9]*-[0-9]*-[0-9]*$", $value)) {
$this->domainSID = $value;
}
else return false;
return true;
}
}

10
lam/templates/config/confmain.php
View File

@ -60,7 +60,6 @@ if ($_POST['back'] || $_POST['submitconf']){
if ($_POST['maxlistentries']) $_SESSION['maxlistentries'] = $_POST['maxlistentries'];
if ($_POST['lang']) $_SESSION['lang'] = $_POST['lang'];
if ($_POST['samba3']) $_SESSION['samba3'] = $_POST['samba3'];
if ($_POST['domainSID']) $_SESSION['domainSID'] = $_POST['domainSID'];
if ($_POST['scriptpath']) $_SESSION['scriptpath'] = $_POST['scriptpath'];
else $_SESSION['scriptpath'] = "";
if ($_POST['scriptserver']) $_SESSION['scriptserver'] = $_POST['scriptserver'];
@ -162,15 +161,6 @@ if ($conf->get_samba3() == "yes") echo ("<option>yes</option><option>no</option>
else echo ("<option>no</option><option>yes</option></select></td>");
echo ("<td><a href=\"../help.php?HelpNumber=213\" target=\"lamhelp\">" . _("Help") . "</a></td></tr>\n");
// new line
echo ("<tr><td colspan=3>&nbsp</td></tr>");
// Samba domain SID
echo ("<tr><td align=\"right\"><b>".
_("Domain SID") . " **: </b></td>".
"<td><input size=50 type=\"text\" name=\"domainSID\" value=\"" . $conf->get_domainSID() . "\"></td>\n");
echo ("<td><a href=\"../help.php?HelpNumber=214\" target=\"lamhelp\">" . _("Help") . "</a></td></tr>\n");
echo ("</table>");
echo ("</fieldset>");
echo ("<p></p>");

9
lam/templates/config/confsave.php
View File

@ -58,7 +58,6 @@ if ($_SESSION['lang']) $lang = $_SESSION['lang'];
if ($_SESSION['scriptpath']) $scriptpath = $_SESSION['scriptpath'];
if ($_SESSION['scriptserver']) $scriptserver = $_SESSION['scriptserver'];
if ($_SESSION['samba3']) $samba3 = $_SESSION['samba3'];
if ($_SESSION['domainSID']) $domainSID = $_SESSION['domainSID'];
if ($_SESSION['filename']) $filename = $_SESSION['filename'];
// check if password is correct
@ -176,12 +175,6 @@ if (!$samba3) {
exit;
}
if (($samba3 == "yes") && !eregi("^S-[0-9]-[0-9]-[0-9]{2,2}-[0-9]*-[0-9]*-[0-9]*$", $domainSID)) {
echo ("<font color=\"red\"><b>" . _("Samba 3 domain SID is invalid!") . "</b></font>");
echo ("\n<br><br><br><a href=\"javascript:history.back()\">" . _("Back to preferences...") . "</a>");
exit;
}
if ($scriptpath && !eregi("^/[a-z0-9_\\-]+(/[a-z0-9_\\.\\-]+)+$", $scriptpath)) {
echo ("<font color=\"red\"><b>" . _("Script path is invalid!") . "</b></font>");
echo ("\n<br><br><br><a href=\"javascript:history.back()\">" . _("Back to preferences...") . "</a>");
@ -214,7 +207,6 @@ $conf->set_hostlistAttributes($hstlstattr);
$conf->set_MaxListEntries($maxlistentries);
$conf->set_defaultLanguage($lang);
$conf->set_samba3($samba3);
$conf->set_domainSID($domainSID);
$conf->set_scriptpath($scriptpath);
$conf->set_scriptserver($scriptserver);
@ -263,7 +255,6 @@ unset($_SESSION['lang']);
unset($_SESSION['scriptpath']);
unset($_SESSION['scriptserver']);
unset($_SESSION['samba3']);
unset($_SESSION['domainSID']);
unset($_SESSION['filename']);
?>

4
lam/tests/conf-test.php
View File

@ -54,7 +54,6 @@ $defaultlanguage = $conf->get_defaultlanguage();
$scriptpath = $conf->get_scriptPath();
$scriptServer = $conf->get_scriptServer();
$samba3 = $conf->get_samba3();
$domainSID = $conf->get_domainSID();
echo ("done<br>");
// next we modify them and save lam.conf
echo ("Changing preferences...");
@ -81,7 +80,6 @@ $conf->set_defaultlanguage("de_AT:iso639_de:Deutsch (Oesterreich)");
$conf->set_scriptPath("/var/www/lam/lib/script");
$conf->set_scriptServer("127.0.0.1");
$conf->set_samba3("yes");
$conf->set_domainSID("S-0-1-22-1234567890-1234567890-1234567890");
$conf->save();
echo ("done<br>");
// at last all preferences are read from lam.conf and compared
@ -112,7 +110,6 @@ if ($conf->get_defaultlanguage() != "de_AT:iso639_de:Deutsch (Oesterreich)") ech
if ($conf->get_scriptPath() != "/var/www/lam/lib/script") echo ("<br><font color=\"#FF0000\">Saving script path failed!</font><br>");
if ($conf->get_scriptServer() != "127.0.0.1") echo ("<br><font color=\"#FF0000\">Saving script server failed!</font><br>");
if ($conf->get_samba3() != "yes") echo ("<br><font color=\"#FF0000\">Saving samba3 failed!</font><br>");
if ($conf->get_domainSID() != "S-0-1-22-1234567890-1234567890-1234567890") echo ("<br><font color=\"#FF0000\">Saving domainSID failed!</font><br>");
echo ("done<br>");
// restore old values
echo ("Restoring old preferences...");
@ -139,7 +136,6 @@ $conf->set_defaultLanguage($defaultlanguage);
$conf->set_scriptPath($scriptpath);
$conf->set_scriptServer($scriptserver);
$conf->set_samba3($samba3);
$conf->set_domainSID($domainSID);
$conf->save();
echo ("done<br>");
// finished