From a09c2bb165caeea55cbafe7110ed3586203cec21 Mon Sep 17 00:00:00 2001 From: opensides Date: Sun, 25 Jul 2010 07:58:06 +0000 Subject: [PATCH] - Added new copyright files and fixed gosa-si-server from trunk git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.6@19097 594d385d-05f5-0310-b6e9-bd551577e9d8 --- gosa-core/debian/changelog | 6 +++++- gosa-core/debian/copyright | 27 ++++++++++++++++++++++++--- gosa-si/gosa-si-server | 5 +++-- gosa-si/modules/DBmysql.pm | 8 +++++--- 4 files changed, 37 insertions(+), 9 deletions(-) diff --git a/gosa-core/debian/changelog b/gosa-core/debian/changelog index 202395a9c..0abdb0078 100644 --- a/gosa-core/debian/changelog +++ b/gosa-core/debian/changelog @@ -5,8 +5,12 @@ gosa (2.6.10-1) unstable; urgency=low [ Benoit Mortier ] * Switch to dpkg-source 3.0 (quilt) format + * gosa fails with: "Fatal error: Call to undefined function + print_array() (Closes: #573220) + * GOSa fails to add IP and MAC addresses to samba created hosts + (Closes: #582896) - -- Benoit Mortier Sat, 26 Jun 2010 22:48:41 +0200 + -- Benoit Mortier Tue, 20 Jul 2010 12:48:02 +0200 gosa (2.6.9-1) unstable; urgency=low diff --git a/gosa-core/debian/copyright b/gosa-core/debian/copyright index e46552aa3..2a471b346 100644 --- a/gosa-core/debian/copyright +++ b/gosa-core/debian/copyright @@ -5,7 +5,20 @@ It was downloaded from http://www.gosa-project.org Copyright: - Copyright (C) 2001-2008 Cajus Pollmeier + Copyright (C) 2003-2010 GONICUS GmbH + +Upstream Authors: + + Copyright (C) 2003-2008 Cajus Pollmeier + Copyright (C) 2003-2008 Fabian Hickert + Copyright (C) 2003-2005 Alejandro Escanero Blanco + Copyright (c) 2003 Wouter Verhelst + Copyright (C) 2005 Benoit Mortier + Copyright (C) 2005 Guillaume Delecourt + Copyright (C) 2005 Vincent Seynhaeve + Copyright (C) 2006 Bernd Zeimetz + Copyright (C) 2006 Gina Haeussge + Copyright (C) 2006 Jörn Dreyer, based on work by Cajus Pollmeier License: @@ -45,7 +58,7 @@ License: MIT SOFTWARE. Files: controls.js -Copyright: (C) 2005-2009 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us) +Copyright: (C) 2005-2009 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us) (C) 2005-2009 Ivan Krstic (http://blogs.law.harvard.edu/ivan) (C) 2005-2009 Jon Tirsen (http://www.tirsen.com) License: MIT @@ -182,8 +195,16 @@ Licence: MIT OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +SIEVE-PHP.LIB VERSION 0.0.8: + Copyright (C) 2001 Dan Ellis + +Files: gosa-core/include/class_ldap.inc: + Copyright (C) 1998 Eric Kilfoil + Copyright (C) 2003 Alejandro Escanero Blanco + Copyright (C) 2003-2008 GONICUS GmbH + On Debian systems, the complete text of the GNU General Public License can be found in `/usr/share/common-licenses/GPL-2'. -The Debian packaging is Copyright (C) 2010, Cajus Pollmeier and +The Debian packaging is Copyright (C) 2010, Benoit Mortier and is licensed under the GPL, see above. diff --git a/gosa-si/gosa-si-server b/gosa-si/gosa-si-server index f1e33172f..94f568e9e 100755 --- a/gosa-si/gosa-si-server +++ b/gosa-si/gosa-si-server @@ -3473,6 +3473,7 @@ GetOptions("h|help" => \&usage, &read_configfile($cfg_file, %cfg_defaults); &check_pid; +#to prevent sombie child $SIG{CHLD} = 'IGNORE'; # forward error messages to logfile @@ -3488,8 +3489,8 @@ if( ! $foreground ) { $pid = fork; setsid or die "Can't start a new session: $!"; umask 0; -} else { - $pid = $$; +#} else { +# $pid = $$; } # Do something useful - put our PID into the pid_file diff --git a/gosa-si/modules/DBmysql.pm b/gosa-si/modules/DBmysql.pm index 7a7f67f7e..da87a38e1 100644 --- a/gosa-si/modules/DBmysql.pm +++ b/gosa-si/modules/DBmysql.pm @@ -1,11 +1,13 @@ -package GOSA::DBmysql; +package GOsaSI::DBmysql; use strict; use warnings; -use DBI; + use Data::Dumper; -use GOSA::GosaSupportDaemon; use Time::HiRes qw(usleep); +use GOsaSI::GosaSupportDaemon; + +use DBI; my $col_names = {}; -- 2.30.2