[debian-edu-commits] debian-edu/pkg-team/ 01/01: debian/patches: Fix 1007_gen-uids-like-gosa26.patch. If a placeholder operator specifies no start and end, but only one value (e.g., %{givenName[12]}), then always use the complete string. (Closes: #803540).

[Mike Gabriel]

This is an automated email from the git hooks/post-receive script.

sunweaver pushed a commit to branch master
in repository gosa.

commit 743c959716f3ed24d103b78f8d68f6ae45e5c42c
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Nov 3 13:43:50 2015 +0100

    debian/patches: Fix 1007_gen-uids-like-gosa26.patch. If a placeholder operator specifies no start and end, but only one value (e.g., %{givenName[12]}), then always use the complete string. (Closes: #803540).
---
 debian/patches/1007_gen-uids-like-gosa26.patch | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/debian/patches/1007_gen-uids-like-gosa26.patch b/debian/patches/1007_gen-uids-like-gosa26.patch
index f5af795..d6f0f0b 100644
--- a/debian/patches/1007_gen-uids-like-gosa26.patch
+++ b/debian/patches/1007_gen-uids-like-gosa26.patch
@@ -5,6 +5,15 @@ Abstract:
 
 --- a/gosa-core/include/functions.inc
 +++ b/gosa-core/include/functions.inc
+@@ -3815,7 +3815,7 @@
+     foreach($matches as $match){
+         
+         // No start position given, then add the complete value
+-        if(!isset($match[5])){
++        if(!isset($match[7])){
+             $replacements[$match[0]][] = $attributes[$match[2]];
+     
+         // Start given but no end, so just add a single character
 @@ -3831,10 +3831,16 @@
              for($i=$match[5]; $i<= $match[7]; $i++){
                  if(isset($attributes[$match[2]][$i])){

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/gosa.git