diff options
| author | Sylvio Cesar Teixeira <sylvio@FreeBSD.org> | 2010-06-01 01:34:00 +0000 |
|---|---|---|
| committer | Sylvio Cesar Teixeira <sylvio@FreeBSD.org> | 2010-06-01 01:34:00 +0000 |
| commit | 93b1be403c95c4a3e035704d880b473781af09b8 (patch) | |
| tree | 5e5649810f6a7bac67efe4f1d9220b6fbbffbb0a /sysutils | |
| parent | b384f93556bea05d928b4c84e6a29405c228d38f (diff) | |
| download | ports-93b1be403c95c4a3e035704d880b473781af09b8.tar.gz ports-93b1be403c95c4a3e035704d880b473781af09b8.zip | |
- Fix bug "Samba 3 domain SID is invalid!" when creating domain record
- BUMP PORTREVISION
PR: ports/146291
Submitted by: Vasiliy P. Melnik <basil@vpm.net.ua>
Notes
Notes:
svn path=/head/; revision=255427
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/ldap-account-manager/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/ldap-account-manager/files/patch-account.inc | 34 | ||||
| -rw-r--r-- | sysutils/ldap-account-manager/pkg-plist | 1 |
3 files changed, 36 insertions, 1 deletions
diff --git a/sysutils/ldap-account-manager/Makefile b/sysutils/ldap-account-manager/Makefile index 391dbb08502a..285f5e61c1e9 100644 --- a/sysutils/ldap-account-manager/Makefile +++ b/sysutils/ldap-account-manager/Makefile @@ -7,7 +7,7 @@ PORTNAME= ldap-account-manager PORTVERSION= 3.0.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils www MASTER_SITES= SF/${PNAME}/LAM/${PORTVERSION} DISTNAME= ${PORTNAME:L}-${PORTVERSION} diff --git a/sysutils/ldap-account-manager/files/patch-account.inc b/sysutils/ldap-account-manager/files/patch-account.inc new file mode 100644 index 000000000000..d5fd085a6841 --- /dev/null +++ b/sysutils/ldap-account-manager/files/patch-account.inc @@ -0,0 +1,34 @@ +--- lib/account.inc.orig 2010-03-24 15:22:38.000000000 -0300 ++++ lib/account.inc 2010-05-31 16:30:07.000000000 -0300 +@@ -39,10 +39,10 @@ + * @return array list of shell names + */ + function getshells() { +- if (!isset($_SESSION['lampath'])) return array(); ++ $shellPath = dirname(__FILE__) . '/../config/shells'; + // Load shells from file +- if (file_exists($_SESSION['lampath'] . 'config/shells')) { +- $shells = file($_SESSION['lampath'] . 'config/shells'); ++ if (file_exists($shellPath)) { ++ $shells = file($shellPath); + $i = 0; + while (count($shells) > $i) { + // remove whitespaces +@@ -386,6 +386,9 @@ + case 'hostname': + $pregexpr = '/^([[:alnum:]@\\.\\ \\_\\$-])+$/u'; + break; ++ case 'hostObject': ++ $pregexpr = '/^[!]?([[:alnum:]@\\.\\ \\_\\$\\*-])+$/u'; ++ break; + case 'usernameList': // comma separated list of user names + case 'groupnameList': // comma separated list of group names + $pregexpr = '/^([[:alnum:]@\\.\\ \\_-])+(,([[:alnum:]@\\.\\ \\_-])+)*$/u'; +@@ -467,6 +470,7 @@ + break; + case 'domainSID': // Samba domain SID + $pregexpr = "/^S\\-[0-9]\\-[0-9]\\-[0-9]{2,2}\\-[0-9]+\\-[0-9]+\\-[0-9]+$/"; ++ break; + case 'ip': // IP address + $pregexpr = '/^[0-9]{1,3}[.][0-9]{1,3}[.][0-9]{1,3}[.][0-9]{1,3}$/'; + break; diff --git a/sysutils/ldap-account-manager/pkg-plist b/sysutils/ldap-account-manager/pkg-plist index 3ee432f5d6f3..92f549fe2212 100644 --- a/sysutils/ldap-account-manager/pkg-plist +++ b/sysutils/ldap-account-manager/pkg-plist @@ -137,6 +137,7 @@ %%WWWDIR%%/lib/.htaccess %%WWWDIR%%/lib/tools.inc %%WWWDIR%%/lib/account.inc +%%WWWDIR%%/lib/account.inc.orig %%WWWDIR%%/lib/baseModule.inc %%WWWDIR%%/lib/baseType.inc %%WWWDIR%%/lib/cache.inc |