From e401ce0e08358eb9af37cc58630ad5471e048faf Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Fri, 25 Jul 2003 14:12:07 +0000 Subject: [PATCH] added suffix for domains and mappings --- lam/lib/config.inc | 82 +++++++++++++++++++++++++++++++++++------ lam/tests/conf-test.php | 10 ++++- 2 files changed, 79 insertions(+), 13 deletions(-) diff --git a/lam/lib/config.inc b/lam/lib/config.inc index e64629b7..c5924f12 100644 --- a/lam/lib/config.inc +++ b/lam/lib/config.inc @@ -84,6 +84,12 @@ class Config { // suffix for Samba hosts var $Suff_hosts; + // suffix for domains (Samba 3) + var $Suff_domains; + + // suffix for user/group mappings (Samba 3) + var $Suff_map; + // minimum/maximum numbers for UID, GID and UID of Samba Hosts var $MinUID; var $MaxUID; @@ -162,6 +168,14 @@ class Config { $this->Suff_hosts = chop(substr($line, 12, strlen($line)-12)); continue; } + if (substr($line, 0, 14) == "domainsuffix: ") { + $this->Suff_domains = chop(substr($line, 14, strlen($line)-14)); + continue; + } + if (substr($line, 0, 11) == "mapsuffix: ") { + $this->Suff_map = chop(substr($line, 11, strlen($line)-11)); + continue; + } if (substr($line, 0, 8) == "minUID: ") { $this->MinUID = chop(substr($line, 8, strlen($line)-8)); continue; @@ -238,7 +252,8 @@ 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 = False; + $save_scriptPath = $save_scriptServer = $save_samba3 = $save_domainSID = $save_suffdom = + $save_suffmap = False; $file = fopen($conffile, "r"); $file_array = array(); // read config file @@ -280,6 +295,16 @@ class Config { $save_suffhst = True; continue; } + if (substr($file_array[$i], 0, 14) == "domainsuffix: ") { + $file_array[$i] = "domainsuffix: " . $this->Suff_domains . "\n"; + $save_suffdom = True; + continue; + } + if (substr($file_array[$i], 0, 11) == "mapsuffix: ") { + $file_array[$i] = "mapsuffix: " . $this->Suff_map . "\n"; + $save_suffmap = True; + continue; + } if (substr($file_array[$i], 0, 8) == "minUID: ") { $file_array[$i] = "minUID: " . $this->MinUID . "\n"; $save_minUID = True; @@ -368,6 +393,10 @@ class Config { "# e.g. ou=Groups,dc=yourdomain,dc=org\n" . "groupsuffix: " . $this->Suff_groups . "\n"); if (!$save_suffhst == True) array_push($file_array, "\n\n# suffix of Samba hosts\n" . "# e.g. ou=machines,dc=yourdomain,dc=org\n" . "hostsuffix: " . $this->Suff_hosts . "\n"); + if (!$save_suffdom == True) array_push($file_array, "\n\n# suffix of Samba 3 domains\n" . + "# e.g. ou=domains,dc=yourdomain,dc=org\n" . "domainsuffix: " . $this->Suff_domains . "\n"); + if (!$save_suffmap == True) array_push($file_array, "\n\n# suffix of Samba 3 user/group mappings\n" . + "# e.g. ou=mappings,dc=yourdomain,dc=org\n" . "mapsuffix: " . $this->Suff_map . "\n"); if (!$save_minUID == True) array_push($file_array, "\n\n# minimum UID number\n" . "minUID: " . $this->MinUID . "\n"); if (!$save_maxUID == True) array_push($file_array, "\n\n# maximum UID number\n" . "maxUID: " . $this->MaxUID . "\n"); if (!$save_minGID == True) array_push($file_array, "\n\n# minimum GID number\n" . "minGID: " . $this->MinGID . "\n"); @@ -406,6 +435,8 @@ class Config { echo "" . _("UserSuffix") . ": " . $this->Suff_users . "
"; echo "" . _("GroupSuffix") . ": " . $this->Suff_groups . "
"; echo "" . _("HostSuffix") . ": " . $this->Suff_hosts . "
"; + echo "" . _("DomainSuffix") . ": " . $this->Suff_domains . "
"; + echo "" . _("MappingSuffix") . ": " . $this->Suff_map . "
"; echo "" . _("Minimum UID number") . ": " . $this->MinUID . "
"; echo "" . _("Maximum UID number") . ": " . $this->MaxUID . "
"; echo "" . _("Minimum GID number") . ": " . $this->MinGID . "
"; @@ -507,18 +538,46 @@ class Config { else StatusMessage("WARN", "", _("Config->set_GroupSuffix failed!") . " (" . $value . ")"); } - // returns the LDAP suffix where hosts are saved - function get_HostSuffix() { - return $this->Suff_hosts; - } + // returns the LDAP suffix where hosts are saved + function get_HostSuffix() { + return $this->Suff_hosts; + } - // sets the LDAP suffix where hosts are saved - function set_HostSuffix($value) { - if (is_string($value) && (eregi("^(([a-z]|-|[0-9])*=([a-z]|-|[0-9])*)(,([a-z]|-|[0-9])*=([a-z]|-|[0-9])*)*$", $value))) { + // sets the LDAP suffix where hosts are saved + function set_HostSuffix($value) { + if (is_string($value) && (eregi("^(([a-z]|-|[0-9])*=([a-z]|-|[0-9])*)(,([a-z]|-|[0-9])*=([a-z]|-|[0-9])*)*$", $value))) { $this->Suff_hosts = $value; } - else StatusMessage("WARN", "", _("Config->set_HostSuffix failed!") . " (" . $value . ")"); - } + else StatusMessage("WARN", "", _("Config->set_HostSuffix failed!") . " (" . $value . ")"); + } + + // returns the LDAP suffix where domains are saved + function get_DomainSuffix() { + return $this->Suff_domains; + } + + // sets the LDAP suffix where domains are saved + function set_DomainSuffix($value) { + if (!$value && ($this->get_Samba3() == "no")) $this->Suff_domains = ""; + elseif (is_string($value) && (eregi("^(([a-z]|-|[0-9])*=([a-z]|-|[0-9])*)(,([a-z]|-|[0-9])*=([a-z]|-|[0-9])*)*$", $value))) { + $this->Suff_domains = $value; + } + else StatusMessage("WARN", "", _("Config->set_DomainSuffix failed!") . " (" . $value . ")"); + } + + // returns the LDAP suffix where mappings are saved + function get_MapSuffix() { + return $this->Suff_map; + } + + // sets the LDAP suffix where mappings are saved + function set_MapSuffix($value) { + if (!$value) $this->Suff_map = ""; // optional parameter + elseif (is_string($value) && (eregi("^(([a-z]|-|[0-9])*=([a-z]|-|[0-9])*)(,([a-z]|-|[0-9])*=([a-z]|-|[0-9])*)*$", $value))) { + $this->Suff_map = $value; + } + else StatusMessage("WARN", "", _("Config->set_MappingSuffix failed!") . " (" . $value . ")"); + } // returns the minimum UID to use when creating new users function get_minUID() { @@ -694,8 +753,7 @@ class Config { // sets the Samba domain SID (Samba 3 only) function set_domainSID($value) { if (!$value) { // optional parameter - $value = ""; - $this->domainSID = $value; + $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; diff --git a/lam/tests/conf-test.php b/lam/tests/conf-test.php index 52c9e29f..afb7c898 100644 --- a/lam/tests/conf-test.php +++ b/lam/tests/conf-test.php @@ -24,7 +24,7 @@ $Id$ */ include ("../lib/config.inc"); -$conf = new Config('default'); +$conf = new Config(); echo ""; echo (" Current Config

"); $conf->printconf(); @@ -38,6 +38,8 @@ $Adminstring = $conf->get_Adminstring(); $Suff_users = $conf->get_UserSuffix(); $Suff_groups = $conf->get_GroupSuffix(); $Suff_hosts = $conf->get_HostSuffix(); +$Suff_domains = $conf->get_DomainSuffix(); +$Suff_map = $conf->get_MapSuffix(); $MinUID = $conf->get_minUID(); $MaxUID = $conf->get_maxUID(); $MinGID = $conf->get_minGID(); @@ -63,6 +65,8 @@ $conf->set_Adminstring("uid=test,o=test,dc=org;uid=root,o=test2,c=de"); $conf->set_UserSuffix("ou=test,o=test,c=de"); $conf->set_GroupSuffix("ou=testgrp,o=test,c=de"); $conf->set_HostSuffix("ou=testhst,o=test,c=de"); +$conf->set_DomainSuffix("ou=testdom,o=test,c=de"); +$conf->set_MapSuffix("ou=testmap,o=test,c=de"); $conf->set_minUID("25"); $conf->set_maxUID("254"); $conf->set_minGID("253"); @@ -92,6 +96,8 @@ if ($conf->get_Adminstring() != "uid=test,o=test,dc=org;uid=root,o=test2,c=de") if ($conf->get_UserSuffix() != "ou=test,o=test,c=de") echo ("
Saving user suffix failed!
"); if ($conf->get_GroupSuffix() != "ou=testgrp,o=test,c=de") echo ("
Saving group suffix failed!
"); if ($conf->get_HostSuffix() != "ou=testhst,o=test,c=de") echo ("
Saving host suffix failed!
"); +if ($conf->get_DomainSuffix() != "ou=testdom,o=test,c=de") echo ("
Saving domain suffix failed!
"); +if ($conf->get_MapSuffix() != "ou=testmap,o=test,c=de") echo ("
Saving mapping suffix failed!
"); if ($conf->get_minUID() != "25") echo ("
Saving minUID failed!
"); if ($conf->get_maxUID() != "254") echo ("
Saving maxUID failed!
"); if ($conf->get_minGID() != "253") echo ("
Saving minGID failed!
"); @@ -117,6 +123,8 @@ $conf->set_Adminstring($Adminstring); $conf->set_UserSuffix($Suff_users); $conf->set_GroupSuffix($Suff_groups); $conf->set_HostSuffix($Suff_hosts); +$conf->set_DomainSuffix($Suff_domains); +$conf->set_MapSuffix($Suff_map); $conf->set_minUID($MinUID); $conf->set_maxUID($MaxUID); $conf->set_minGID($MinGID);