From owner-freebsd-ports-bugs@FreeBSD.ORG Tue May 4 07:40:01 2010 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 50CAB106566C for ; Tue, 4 May 2010 07:40:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.freebsd.org (Postfix) with ESMTP id E0F768FC13 for ; Tue, 4 May 2010 07:40:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id o447e0f1072490 for ; Tue, 4 May 2010 07:40:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id o447e0Ct072489; Tue, 4 May 2010 07:40:00 GMT (envelope-from gnats) Resent-Date: Tue, 4 May 2010 07:40:00 GMT Resent-Message-Id: <201005040740.o447e0Ct072489@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Vasiliy P. Melnik" Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 03E4E106566B for ; Tue, 4 May 2010 07:30:42 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [69.147.83.33]) by mx1.freebsd.org (Postfix) with ESMTP id E753D8FC08 for ; Tue, 4 May 2010 07:30:41 +0000 (UTC) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.3/8.14.3) with ESMTP id o447UfKn048192 for ; Tue, 4 May 2010 07:30:41 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.3/8.14.3/Submit) id o447UfKp048191; Tue, 4 May 2010 07:30:41 GMT (envelope-from nobody) Message-Id: <201005040730.o447UfKp048191@www.freebsd.org> Date: Tue, 4 May 2010 07:30:41 GMT From: "Vasiliy P. Melnik" To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/146291: - fix bug "Samba 3 domain SID is invalid!" when creating domain record X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 May 2010 07:40:01 -0000 >Number: 146291 >Category: ports >Synopsis: - fix bug "Samba 3 domain SID is invalid!" when creating domain record >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue May 04 07:40:00 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Vasiliy P. Melnik >Release: 8.0-RELEASE-p2 >Organization: na >Environment: FreeBSD monkey.home 8.0-RELEASE-p2 FreeBSD 8.0-RELEASE-p2 #0: Sat Mar 27 03:57:42 EET 2010 root@monkey.home:/usr/obj/usr/src/sys/monkey i386 >Description: - fix bug "Samba 3 domain SID is invalid!" when creating domain record >How-To-Repeat: >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 @@ + $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: ===> 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 @@ + $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 >Release-Note: >Audit-Trail: >Unformatted: