[debian-edu-commits] debian-edu/pkg-team/ 01/01: debian/patches: Improve 1007_gen-uids-like-gosa26.patch. Handle situations where attribute values are shorter than the minimal length required. Use the complete attribute's value then, if even not long enough.

[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 450d4cd23a80bb2eb203b1ff4a3d82b903fb93f1
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Aug 26 09:35:16 2015 +0200

    debian/patches: Improve 1007_gen-uids-like-gosa26.patch. Handle situations where attribute values are shorter than the minimal length required. Use the complete attribute's value then, if even not long enough.
---
 debian/patches/1007_gen-uids-like-gosa26.patch | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/debian/patches/1007_gen-uids-like-gosa26.patch b/debian/patches/1007_gen-uids-like-gosa26.patch
index 097be2a..f5af795 100644
--- a/debian/patches/1007_gen-uids-like-gosa26.patch
+++ b/debian/patches/1007_gen-uids-like-gosa26.patch
@@ -5,7 +5,7 @@ Abstract:
 
 --- a/gosa-core/include/functions.inc
 +++ b/gosa-core/include/functions.inc
-@@ -3831,7 +3831,7 @@
+@@ -3831,10 +3831,16 @@
              for($i=$match[5]; $i<= $match[7]; $i++){
                  if(isset($attributes[$match[2]][$i])){
                      $tmp = " ".$attributes[$match[2]];
@@ -14,3 +14,12 @@ Abstract:
                      $replacements[$match[0]][] = trim($str);
                  }
              }
++
++            // if a given attribute's value is shorter than required, use the
++            // full length of the attribute's value
++            if (!$replacements[$match[0]]) {
++                $replacements[$match[0]][] = $attributes[$match[2]];
++            }
+         }
+     }
+ 

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