[debian-edu-commits] debian-edu/pkg-team/ 01/04: debian/patches: Rebase 0006_code-injection-in-samba-hash-generation.patch.

[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 3d3c1c645ed90fb12dcf0c069e5a66c17fd04ba2
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Mar 1 16:53:07 2018 +0100

    debian/patches: Rebase 0006_code-injection-in-samba-hash-generation.patch.
---
 .../patches/0006_code-injection-in-samba-hash-generation.patch   | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/debian/patches/0006_code-injection-in-samba-hash-generation.patch b/debian/patches/0006_code-injection-in-samba-hash-generation.patch
index edef03a..5816154 100644
--- a/debian/patches/0006_code-injection-in-samba-hash-generation.patch
+++ b/debian/patches/0006_code-injection-in-samba-hash-generation.patch
@@ -15,11 +15,9 @@ git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@21280 594d385d-05f5-0
  include/functions.inc  | 4 ++--
  2 files changed, 3 insertions(+), 3 deletions(-)
 
-diff --git a/gosa-core/include/class_core.inc b/gosa-core/include/class_core.inc
-index 510bc5e..d3acf5b 100644
 --- a/gosa-core/include/class_core.inc
 +++ b/gosa-core/include/class_core.inc
-@@ -582,7 +582,7 @@ DEBUG_SI      = 256"),
+@@ -582,7 +582,7 @@
                          array(
                                  "name"          => "sambaHashHook",
                                  "type"          => "command",
@@ -28,11 +26,9 @@ index 510bc5e..d3acf5b 100644
                                  "description"   => _("Command to create Samba NT/LM hashes. Required for password synchronization if you don't use supplementary services."),
                                  "check"         => "gosaProperty::isCommand",
                                  "migrate"       => "",
-diff --git a/gosa-core/include/functions.inc b/gosa-core/include/functions.inc
-index 7f84043..0385edf 100644
 --- a/gosa-core/include/functions.inc
 +++ b/gosa-core/include/functions.inc
-@@ -3101,8 +3101,8 @@ function generate_smb_nt_hash($password)
+@@ -3086,8 +3086,8 @@
        $password = addcslashes($password, '$'); 
        $password = addcslashes($password, '$'); // <- And again once, to be able to use it as parameter for the perl script.
  	  $tmp = $config->get_cfg_value("core",'sambaHashHook');
@@ -43,4 +39,3 @@ index 7f84043..0385edf 100644
  	  @DEBUG (DEBUG_LDAP, __LINE__, __FUNCTION__, __FILE__, $tmp, "Execute");
  
   	  exec($tmp, $ar);
-

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