Bug 146291 - sysutils/ldap-account-manager: fix bug "Samba 3 domain SID is invalid!" when creating domain record
Summary: sysutils/ldap-account-manager: fix bug "Samba 3 domain SID is invalid!" when ...
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Sylvio Cesar Teixeira
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2010-05-04 08:40 UTC by basil
Modified: 2010-06-01 02:40 UTC (History)
0 users

See Also:


Attachments
file.txt (2.57 KB, text/plain)
2010-05-04 08:40 UTC, basil
no flags Details

Note You need to log in before you can comment on or make changes to this bug.
Description basil 2010-05-04 08:40:00 UTC
- fix bug "Samba 3 domain SID is invalid!" when creating domain record

Fix: ===> Generating patch
===> Viewing diff with more
Files /usr/ports/sysutils/ldap-account-manager/Makefile and /root/ldap-account-manager/Makefile differ
diff -ruN --exclude=CVS /usr/ports/sysutils/ldap-account-manager/files/patch-account.inc /root/ldap-account-manager/files/patch-account.inc
--- /usr/ports/sysutils/ldap-account-manager/files/patch-account.inc	1970-01-01 03:00:00.000000000 +0300
+++ /root/ldap-account-manager/files/patch-account.inc	2010-05-01 11:34:31.000000000 +0300
@@ -0,0 +1,42 @@
+--- lib/account.inc.orig	2010-03-24 20:22:38.000000000 +0200
++++ lib/account.inc	2010-05-01 11:21:49.000000000 +0300
+@@ -1,6 +1,6 @@
+ <?php
+ /*
+-$Id: account.inc,v 1.247 2010/02/14 18:01:19 gruberroland Exp $
++$Id: account.inc,v 1.250 2010/04/30 21:07:47 gruberroland Exp $
+ 
+   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
+   Copyright (C) 2003 - 2006  Tilo Lutz
+@@ -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 -ruN --exclude=CVS /usr/ports/sysutils/ldap-account-manager/pkg-plist /root/ldap-account-manager/pkg-plist
--- /usr/ports/sysutils/ldap-account-manager/pkg-plist	2010-04-30 17:58:13.000000000 +0300
+++ /root/ldap-account-manager/pkg-plist	2010-05-01 12:11:01.000000000 +0300
@@ -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
===> Done

Patch attached with submission follows:
Comment 1 Sylvio Cesar Teixeira freebsd_committer freebsd_triage 2010-05-06 00:29:39 UTC
Responsible Changed
From-To: freebsd-ports-bugs->sylvio

I'll take it.
Comment 2 Sylvio César Teixeira Amorim 2010-05-08 16:12:37 UTC
Please, send again. This patch is wrong. It's duplicate and file of
patch is into of pkg-plist. Fix it please.
Comment 3 Sylvio Cesar Teixeira freebsd_committer freebsd_triage 2010-05-10 23:02:38 UTC
State Changed
From-To: open->feedback

- Waiting feedback of submitter.
Comment 4 Sylvio Cesar Teixeira freebsd_committer freebsd_triage 2010-06-01 02:26:59 UTC
State Changed
From-To: feedback->closed

Committed. Thanks!
Comment 5 dfilter service freebsd_committer freebsd_triage 2010-06-01 02:34:16 UTC
sylvio      2010-06-01 01:34:00 UTC

  FreeBSD ports repository

  Modified files:
    sysutils/ldap-account-manager Makefile pkg-plist 
  Added files:
    sysutils/ldap-account-manager/files patch-account.inc 
  Log:
  - 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>
  
  Revision  Changes    Path
  1.47      +1 -1      ports/sysutils/ldap-account-manager/Makefile
  1.1       +34 -0     ports/sysutils/ldap-account-manager/files/patch-account.inc (new)
  1.27      +1 -0      ports/sysutils/ldap-account-manager/pkg-plist
_______________________________________________
cvs-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/cvs-all
To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"