Attachment 6626 Details for Bug 36532

[patch] Speedup network restart

36532_net-slow.diff (text/plain), 146.43 KB, created by Philipp Hahn on 2015-01-23 09:17 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Philipp Hahn

Created: 2015-01-23 09:17 CET

Size: 146.43 KB

patch

obsolete

>From f1014b91ab43332f55272c7210e50994009d3a67 Mon Sep 17 00:00:00 2001
>Message-Id: <f1014b91ab43332f55272c7210e50994009d3a67.1421929142.git.hahn@univention.de>
>From: Philipp Hahn <hahn@univention.de>
>Date: Tue, 6 Jan 2015 08:26:39 +0100
>Subject: [PATCH 1/8] =?UTF-8?q?Bug=20#36532=20bind,s4c,listener,notifier,n?=
> =?UTF-8?q?et:=20=C2=A9=202015?=
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>Organization: Univention GmbH, Bremen, Germany
>
>Update copyright to 2015
>---
> .../ucs-4.0/ucs-4.0-0/base/univention-network-manager/debian/copyright  | 2 +-
> branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/debian/rules | 2 +-
> .../base/univention-network-manager/debian/univention-ifplugd.postinst  | 2 +-
> .../base/univention-network-manager/debian/univention-ifplugd.preinst   | 2 +-
> .../univention-network-manager/debian/univention-network-common.init    | 2 +-
> .../debian/univention-network-common.postinst                           | 2 +-
> .../debian/univention-network-manager.postinst                          | 2 +-
> .../univention-network-manager/debian/univention-network-manager.postrm | 2 +-
> .../debian/univention-network-manager.preinst                           | 2 +-
> .../etc/dhcp/dhclient-exit-hooks.d/resolvconf                           | 2 +-
> .../base/univention-network-manager/etc/network/if-down.d/00_rdate      | 2 +-
> .../base/univention-network-manager/etc/network/if-down.d/15_nscd       | 2 +-
> .../univention-network-manager/etc/network/if-pre-up.d/10_dhclientconf  | 2 +-
> .../base/univention-network-manager/etc/network/if-up.d/00_resolvconf   | 2 +-
> .../base/univention-network-manager/etc/network/if-up.d/05_rdate        | 2 +-
> .../etc/network/if-up.d/12_univention_config_registry                   | 2 +-
> .../base/univention-network-manager/etc/network/if-up.d/15_nscd         | 2 +-
> .../base/univention-network-manager/etc/network/if-up.d/20_mount        | 2 +-
> .../etc/network/if-up.d/30_univention-directory-policy                  | 2 +-
> .../base/univention-network-manager/etc/network/if-up.d/90_dns_update   | 2 +-
> .../base/univention-network-manager/etc/network/ucs-network-tools       | 2 +-
> .../base/univention-network-manager/univention-ifplugd-enter-hook       | 2 +-
> .../base/univention-network-manager/univention-register-network-address | 2 +-
> .../univention-directory-listener/03univention-directory-listener.inst  | 2 +-
> .../conffiles/etc/runit/univention-directory-listener/run               | 2 +-
> .../ucs-4.0-0/management/univention-directory-listener/debian/copyright | 2 +-
> .../ucs-4.0-0/management/univention-directory-listener/debian/rules     | 2 +-
> .../debian/univention-directory-listener.init                           | 2 +-
> .../debian/univention-directory-listener.postinst                       | 2 +-
> .../debian/univention-directory-listener.postrm                         | 2 +-
> .../doc/univention-directory-listener-ctrl.8                            | 2 +-
> .../doc/univention-directory-listener-dump.8                            | 2 +-
> .../doc/univention-directory-listener-verify.8                          | 2 +-
> .../univention-directory-listener/doc/univention-directory-listener.8   | 2 +-
> .../etc/network/if-post-down.d/univention-directory-listener            | 2 +-
> .../management/univention-directory-listener/python/get_notifier_id.py  | 2 +-
> .../management/univention-directory-listener/python/ldap_server.py      | 2 +-
> .../management/univention-directory-listener/python/listener.py         | 2 +-
> .../ucs-4.0-0/management/univention-directory-listener/src/Makefile     | 2 +-
> .../ucs-4.0-0/management/univention-directory-listener/src/base64.h     | 2 +-
> .../ucs-4.0-0/management/univention-directory-listener/src/cache.c      | 2 +-
> .../ucs-4.0-0/management/univention-directory-listener/src/cache.h      | 2 +-
> .../management/univention-directory-listener/src/cache_entry.c          | 2 +-
> .../management/univention-directory-listener/src/cache_entry.h          | 2 +-
> .../management/univention-directory-listener/src/cache_lowlevel.c       | 2 +-
> .../management/univention-directory-listener/src/cache_lowlevel.h       | 2 +-
> .../ucs-4.0-0/management/univention-directory-listener/src/change.c     | 2 +-
> .../ucs-4.0-0/management/univention-directory-listener/src/change.h     | 2 +-
> .../ucs-4.0-0/management/univention-directory-listener/src/common.h     | 2 +-
> .../ucs-4.0-0/management/univention-directory-listener/src/demo.c       | 2 +-
> .../ucs-4.0-0/management/univention-directory-listener/src/dump.c       | 2 +-
> .../management/univention-directory-listener/src/dump_signals.c         | 2 +-
> .../ucs-4.0-0/management/univention-directory-listener/src/filter.c     | 2 +-
> .../ucs-4.0-0/management/univention-directory-listener/src/filter.h     | 2 +-
> .../ucs-4.0-0/management/univention-directory-listener/src/handlers.c   | 2 +-
> .../ucs-4.0-0/management/univention-directory-listener/src/handlers.h   | 2 +-
> .../management/univention-directory-listener/src/listener-ctrl          | 2 +-
> .../ucs-4.0-0/management/univention-directory-listener/src/main.c       | 2 +-
> .../ucs-4.0-0/management/univention-directory-listener/src/network.c    | 2 +-
> .../ucs-4.0-0/management/univention-directory-listener/src/network.h    | 2 +-
> .../ucs-4.0-0/management/univention-directory-listener/src/notifier.c   | 2 +-
> .../ucs-4.0-0/management/univention-directory-listener/src/notifier.h   | 2 +-
> .../management/univention-directory-listener/src/select_server.c        | 2 +-
> .../management/univention-directory-listener/src/select_server.h        | 2 +-
> .../ucs-4.0-0/management/univention-directory-listener/src/signals.c    | 2 +-
> .../ucs-4.0-0/management/univention-directory-listener/src/signals.h    | 2 +-
> .../ucs-4.0-0/management/univention-directory-listener/src/transfile.c  | 2 +-
> .../ucs-4.0-0/management/univention-directory-listener/src/transfile.h  | 2 +-
> .../ucs-4.0-0/management/univention-directory-listener/src/verify.c     | 2 +-
> .../ucs-4.0-0/management/univention-directory-listener/src/wrapper      | 2 +-
> .../ucs-4.0-0/management/univention-directory-listener/tests/Makefile   | 2 +-
> .../univention-directory-notifier/02univention-directory-notifier.inst  | 2 +-
> .../15univention-directory-notifier-post.inst                           | 2 +-
> .../conffiles/etc/runit/univention-directory-notifier/run               | 2 +-
> .../ucs-4.0-0/management/univention-directory-notifier/debian/copyright | 2 +-
> .../ucs-4.0-0/management/univention-directory-notifier/debian/rules     | 2 +-
> .../debian/univention-directory-notifier.init                           | 2 +-
> .../debian/univention-directory-notifier.postinst                       | 2 +-
> .../debian/univention-ldap-notifier.postinst                            | 2 +-
> .../etc/network/if-post-down.d/univention-directory-notifier            | 2 +-
> .../ucs-4.0-0/management/univention-directory-notifier/src/Makefile     | 2 +-
> .../ucs-4.0-0/management/univention-directory-notifier/src/cache.c      | 2 +-
> .../ucs-4.0-0/management/univention-directory-notifier/src/cache.h      | 2 +-
> .../ucs-4.0-0/management/univention-directory-notifier/src/callback.c   | 2 +-
> .../ucs-4.0-0/management/univention-directory-notifier/src/callback.h   | 2 +-
> .../ucs-4.0-0/management/univention-directory-notifier/src/index-dump.c | 2 +-
> .../ucs-4.0-0/management/univention-directory-notifier/src/index.c      | 2 +-
> .../ucs-4.0-0/management/univention-directory-notifier/src/index.h      | 2 +-
> .../ucs-4.0-0/management/univention-directory-notifier/src/network.c    | 2 +-
> .../ucs-4.0-0/management/univention-directory-notifier/src/network.h    | 2 +-
> .../ucs-4.0-0/management/univention-directory-notifier/src/notify.c     | 2 +-
> .../ucs-4.0-0/management/univention-directory-notifier/src/notify.h     | 2 +-
> .../ucs-4.0-0/management/univention-directory-notifier/src/sem.c        | 2 +-
> .../ucs-4.0-0/management/univention-directory-notifier/src/sem.h        | 2 +-
> .../univention-directory-notifier/src/univention-directory-notifier.c   | 2 +-
> .../management/univention-directory-notifier/univention-replicate-one   | 2 +-
> .../ucs-4.0/ucs-4.0-0/services/univention-bind/05univention-bind.inst   | 2 +-
> .../ucs-4.0-0/services/univention-bind/90univention-bind-post.inst      | 2 +-
> branches/ucs-4.0/ucs-4.0-0/services/univention-bind/bind.py             | 2 +-
> .../ucs-4.0-0/services/univention-bind/conffiles/etc/init.d/bind9       | 2 +-
> .../univention-bind/conffiles/etc/runit/univention-bind-proxy/run       | 2 +-
> .../univention-bind/conffiles/etc/runit/univention-bind-samba4/run      | 2 +-
> .../services/univention-bind/conffiles/etc/runit/univention-bind/run    | 2 +-
> branches/ucs-4.0/ucs-4.0-0/services/univention-bind/debian/copyright    | 2 +-
> branches/ucs-4.0/ucs-4.0-0/services/univention-bind/debian/rules        | 2 +-
> .../ucs-4.0-0/services/univention-bind/debian/univention-bind.postinst  | 2 +-
> branches/ucs-4.0/ucs-4.0-0/services/univention-bind/import-zone         | 2 +-
> .../usr/lib/univention-server/server_password_change.d/univention-bind  | 2 +-
> .../services/univention-s4-connector/03univention-s4-connector.uinst    | 2 +-
> .../services/univention-s4-connector/97univention-s4-connector.inst     | 2 +-
> .../conffiles/etc/univention/s4connector/s4/mapping.py                  | 2 +-
> .../ucs-4.0/ucs-4.0-0/services/univention-s4-connector/debian/copyright | 2 +-
> .../ucs-4.0/ucs-4.0-0/services/univention-s4-connector/debian/rules     | 2 +-
> .../univention-s4-connector/debian/univention-s4-connector.init         | 2 +-
> .../univention-s4-connector/debian/univention-s4-connector.postinst     | 2 +-
> .../univention-s4-connector/debian/univention-s4-connector.postrm       | 2 +-
> .../univention-s4-connector/debian/univention-s4-connector.prerm        | 2 +-
> .../etc/network/if-post-down.d/univention-s4-connector                  | 2 +-
> .../ucs-4.0-0/services/univention-s4-connector/ldap/msgpo.schema        | 2 +-
> .../ucs-4.0-0/services/univention-s4-connector/ldap/mswmi.schema        | 2 +-
> .../modules/univention/admin/handlers/container/msgpo.py                | 2 +-
> .../modules/univention/admin/handlers/settings/mswmifilter.py           | 2 +-
> .../univention-s4-connector/modules/univention/s4connector/__init__.py  | 2 +-
> .../univention-s4-connector/modules/univention/s4connector/lockingdb.py | 2 +-
> .../modules/univention/s4connector/s4/__init__.py                       | 2 +-
> .../modules/univention/s4connector/s4/computer.py                       | 2 +-
> .../univention-s4-connector/modules/univention/s4connector/s4/dc.py     | 2 +-
> .../univention-s4-connector/modules/univention/s4connector/s4/dns.py    | 2 +-
> .../univention-s4-connector/modules/univention/s4connector/s4/main.py   | 2 +-
> .../modules/univention/s4connector/s4/mapping.py                        | 2 +-
> .../modules/univention/s4connector/s4/password.py                       | 2 +-
> .../modules/univention/s4connector/s4/query_config.py                   | 2 +-
> .../modules/univention/s4connector/s4/sid_mapping.py                    | 2 +-
> .../univention-s4-connector/modules/univention/s4connector/s4cache.py   | 2 +-
> .../ucs-4.0/ucs-4.0-0/services/univention-s4-connector/s4-connector.py  | 2 +-
> .../ucs-4.0-0/services/univention-s4-connector/scripts/DN2base64Guid.py | 2 +-
> .../ucs-4.0-0/services/univention-s4-connector/scripts/base64Guid2DN.py | 2 +-
> .../services/univention-s4-connector/scripts/msGPOWQLFilter.py          | 2 +-
> .../ucs-4.0/ucs-4.0-0/services/univention-s4-connector/scripts/msgpo.py | 2 +-
> .../services/univention-s4-connector/scripts/remove_s4_rejected.py      | 2 +-
> .../services/univention-s4-connector/scripts/remove_ucs_rejected.py     | 2 +-
> .../services/univention-s4-connector/scripts/resync_object_from_s4.py   | 2 +-
> .../services/univention-s4-connector/scripts/resync_object_from_ucs.py  | 2 +-
> .../univention-s4-connector/scripts/upgrade_groupPolicyContainer.py     | 2 +-
> .../services/univention-s4-connector/scripts/upgrade_msWMI-Som.py       | 2 +-
> .../services/univention-s4-connector/scripts/write_password_settings.py | 2 +-
> .../server_password_change.d/univention-s4-connector                    | 2 +-
> branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/sync_krbtgt | 2 +-
> .../services/univention-s4-connector/univention-password_sync_ucs_to_s4 | 2 +-
> .../ucs-4.0-0/services/univention-s4-connector/univention-s4-connector  | 2 +-
> .../services/univention-s4-connector/univention-s4-position-sync        | 2 +-
> .../univention-s4-connector/univention-s4connector-list-rejected        | 2 +-
> 152 files changed, 152 insertions(+), 152 deletions(-)
>
>diff --git a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/debian/copyright b/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/debian/copyright
>index 61120e4..effbb73 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/debian/copyright
>+++ b/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/debian/copyright
>@@ -1,4 +1,4 @@
>-Copyright 2003-2014 Univention GmbH
>+Copyright 2003-2015 Univention GmbH
> 
> http://www.univention.de/
> 
>diff --git a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/debian/rules b/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/debian/rules
>index d7b4f3f..754dabd 100755
>--- a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/debian/rules
>+++ b/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/debian/rules
>@@ -3,7 +3,7 @@
> # Univention Network Manager
> #  rules file for the debian package
> #
>-# Copyright 2009-2014 Univention GmbH
>+# Copyright 2009-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/debian/univention-ifplugd.postinst b/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/debian/univention-ifplugd.postinst
>index 877723b..0e13c64 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/debian/univention-ifplugd.postinst
>+++ b/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/debian/univention-ifplugd.postinst
>@@ -3,7 +3,7 @@
> # Univention ifplugd
> #  postinst script
> #
>-# Copyright 2009-2014 Univention GmbH
>+# Copyright 2009-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/debian/univention-ifplugd.preinst b/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/debian/univention-ifplugd.preinst
>index f8f33ed..ee0dba8 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/debian/univention-ifplugd.preinst
>+++ b/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/debian/univention-ifplugd.preinst
>@@ -3,7 +3,7 @@
> # Univention Network ifplugd
> #  preinst script
> #
>-# Copyright 2004-2014 Univention GmbH
>+# Copyright 2004-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/debian/univention-network-common.init b/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/debian/univention-network-common.init
>index 5027f05..f242f77 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/debian/univention-network-common.init
>+++ b/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/debian/univention-network-common.init
>@@ -3,7 +3,7 @@
> # Univention Network Common
> #  Save the dhclient result in LDAP
> #
>-# Copyright (C) 2012-2014 Univention GmbH
>+# Copyright (C) 2012-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/debian/univention-network-common.postinst b/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/debian/univention-network-common.postinst
>index 5989196..8f57312 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/debian/univention-network-common.postinst
>+++ b/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/debian/univention-network-common.postinst
>@@ -3,7 +3,7 @@
> # Univention Network Manager
> #  postinst script
> #
>-# Copyright 2009-2014 Univention GmbH
>+# Copyright 2009-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/debian/univention-network-manager.postinst b/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/debian/univention-network-manager.postinst
>index e3fd98a..1298722 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/debian/univention-network-manager.postinst
>+++ b/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/debian/univention-network-manager.postinst
>@@ -3,7 +3,7 @@
> # Univention Network Manager
> #  postinst script
> #
>-# Copyright 2009-2014 Univention GmbH
>+# Copyright 2009-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/debian/univention-network-manager.postrm b/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/debian/univention-network-manager.postrm
>index 28c3121..0962ba8 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/debian/univention-network-manager.postrm
>+++ b/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/debian/univention-network-manager.postrm
>@@ -3,7 +3,7 @@
> # Univention Network Manager
> #  postrm script
> #
>-# Copyright 2009-2014 Univention GmbH
>+# Copyright 2009-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/debian/univention-network-manager.preinst b/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/debian/univention-network-manager.preinst
>index 5583fc3b..ffb0c67 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/debian/univention-network-manager.preinst
>+++ b/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/debian/univention-network-manager.preinst
>@@ -3,7 +3,7 @@
> # Univention Network Manager
> #  preinst script
> #
>-# Copyright 2009-2014 Univention GmbH
>+# Copyright 2009-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/dhcp/dhclient-exit-hooks.d/resolvconf b/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/dhcp/dhclient-exit-hooks.d/resolvconf
>index 7dd1a63..9bfa73f 100755
>--- a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/dhcp/dhclient-exit-hooks.d/resolvconf
>+++ b/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/dhcp/dhclient-exit-hooks.d/resolvconf
>@@ -3,7 +3,7 @@
> # Univention Server
> #  network script: modify resolv.conf
> #
>-# Copyright 2003-2014 Univention GmbH
>+# Copyright 2003-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-down.d/00_rdate b/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-down.d/00_rdate
>index 2b42065..eced777 100755
>--- a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-down.d/00_rdate
>+++ b/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-down.d/00_rdate
>@@ -4,7 +4,7 @@
> #  network script: fix time
> #  the network link is down
> #
>-# Copyright 2008-2014 Univention GmbH
>+# Copyright 2008-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-down.d/15_nscd b/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-down.d/15_nscd
>index 36237ee..a711459 100755
>--- a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-down.d/15_nscd
>+++ b/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-down.d/15_nscd
>@@ -3,7 +3,7 @@
> # Univention Server
> #  network script: restarts nscd when network state changes
> #
>-# Copyright 2004-2014 Univention GmbH
>+# Copyright 2004-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-pre-up.d/10_dhclientconf b/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-pre-up.d/10_dhclientconf
>index fd3ba97..0740354 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-pre-up.d/10_dhclientconf
>+++ b/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-pre-up.d/10_dhclientconf
>@@ -3,7 +3,7 @@
> # Univention Network
> #  Commit dhclient.conf to ensure the expire date is correct
> #
>-# Copyright 2004-2014 Univention GmbH
>+# Copyright 2004-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/00_resolvconf b/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/00_resolvconf
>index 31b89b9..1740914 100755
>--- a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/00_resolvconf
>+++ b/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/00_resolvconf
>@@ -3,7 +3,7 @@
> # Univention Server
> #  network script: modify resolv.conf
> #
>-# Copyright 2009-2014 Univention GmbH
>+# Copyright 2009-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/05_rdate b/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/05_rdate
>index 5f30332..27cf5f6 100755
>--- a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/05_rdate
>+++ b/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/05_rdate
>@@ -4,7 +4,7 @@
> #  network script: fix time
> #  the network link is active
> #
>-# Copyright 2008-2014 Univention GmbH
>+# Copyright 2008-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/12_univention_config_registry b/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/12_univention_config_registry
>index 659b173..5dd3020 100755
>--- a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/12_univention_config_registry
>+++ b/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/12_univention_config_registry
>@@ -3,7 +3,7 @@
> # Univention Network
> #  network script: save dhclient result in UCR
> #
>-# Copyright 2004-2014 Univention GmbH
>+# Copyright 2004-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/15_nscd b/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/15_nscd
>index 8d7480e..331abe1 100755
>--- a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/15_nscd
>+++ b/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/15_nscd
>@@ -3,7 +3,7 @@
> # Univention Server
> #  network script: set authentication methods
> #
>-# Copyright 2004-2014 Univention GmbH
>+# Copyright 2004-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/20_mount b/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/20_mount
>index c0dffff..2bf1545 100755
>--- a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/20_mount
>+++ b/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/20_mount
>@@ -4,7 +4,7 @@
> #  network script: (re)mounts all entries from /etc/fstab when
> #  the network link is active
> #
>-# Copyright 2004-2014 Univention GmbH
>+# Copyright 2004-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/30_univention-directory-policy b/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/30_univention-directory-policy
>index 3bb4219..dcd1a3f 100755
>--- a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/30_univention-directory-policy
>+++ b/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/30_univention-directory-policy
>@@ -3,7 +3,7 @@
> # Univention Network Manager
> #  network script: calls univention-directory-policy
> #
>-# Copyright 2009-2014 Univention GmbH
>+# Copyright 2009-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/90_dns_update b/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/90_dns_update
>index 9702813..8357271 100755
>--- a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/90_dns_update
>+++ b/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/90_dns_update
>@@ -3,7 +3,7 @@
> # Univention Network
> #  network script: register IP in LDAP
> #
>-# Copyright 2004-2014 Univention GmbH
>+# Copyright 2004-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/ucs-network-tools b/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/ucs-network-tools
>index bb819cc..dbb5a41 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/ucs-network-tools
>+++ b/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/ucs-network-tools
>@@ -3,7 +3,7 @@
> # Univention Network Manager
> #  network script helper functions
> #
>-# Copyright 2009-2014 Univention GmbH
>+# Copyright 2009-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/univention-ifplugd-enter-hook b/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/univention-ifplugd-enter-hook
>index ff5d61b..8ca75ec 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/univention-ifplugd-enter-hook
>+++ b/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/univention-ifplugd-enter-hook
>@@ -3,7 +3,7 @@
> # Univention ifplugd
> #  dhclient hook script
> #
>-# Copyright 2009-2014 Univention GmbH
>+# Copyright 2009-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/univention-register-network-address b/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/univention-register-network-address
>index d722dbc..f84c406 100755
>--- a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/univention-register-network-address
>+++ b/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/univention-register-network-address
>@@ -3,7 +3,7 @@
> # Univention Network Common
> #  Save the ip address in LDAP
> #
>-# Copyright (C) 2012-2014 Univention GmbH
>+# Copyright (C) 2012-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/03univention-directory-listener.inst b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/03univention-directory-listener.inst
>index 66b4c5f..1795cf0 100755
>--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/03univention-directory-listener.inst
>+++ b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/03univention-directory-listener.inst
>@@ -3,7 +3,7 @@
> # Univention Directory Listener
> #  join script
> #
>-# Copyright 2004-2014 Univention GmbH
>+# Copyright 2004-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/conffiles/etc/runit/univention-directory-listener/run b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/conffiles/etc/runit/univention-directory-listener/run
>index 26062ce..901447d 100755
>--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/conffiles/etc/runit/univention-directory-listener/run
>+++ b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/conffiles/etc/runit/univention-directory-listener/run
>@@ -1,7 +1,7 @@
> #!/bin/sh -e
> @%@UCRWARNING=# @%@
> #
>-# Copyright 2004-2014 Univention GmbH
>+# Copyright 2004-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/debian/copyright b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/debian/copyright
>index e8781f4..7c2adb0 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/debian/copyright
>+++ b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/debian/copyright
>@@ -1,4 +1,4 @@
>-Copyright 2002-2014 Univention GmbH
>+Copyright 2002-2015 Univention GmbH
> 
> http://www.univention.de/
> 
>diff --git a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/debian/rules b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/debian/rules
>index ea2f453..69b1d15 100755
>--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/debian/rules
>+++ b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/debian/rules
>@@ -3,7 +3,7 @@
> # Univention Directory Listener
> #  rules file for the debian package
> #
>-# Copyright 2004-2014 Univention GmbH
>+# Copyright 2004-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/debian/univention-directory-listener.init b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/debian/univention-directory-listener.init
>index 9b39e2c..838300a 100755
>--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/debian/univention-directory-listener.init
>+++ b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/debian/univention-directory-listener.init
>@@ -3,7 +3,7 @@
> # Univention Directory Listener
> #  init script
> #
>-# Copyright 2004-2014 Univention GmbH
>+# Copyright 2004-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/debian/univention-directory-listener.postinst b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/debian/univention-directory-listener.postinst
>index 09e7e42..a6f34cc 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/debian/univention-directory-listener.postinst
>+++ b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/debian/univention-directory-listener.postinst
>@@ -3,7 +3,7 @@
> # Univention Directory Listener
> #  postinst script
> #
>-# Copyright 2004-2014 Univention GmbH
>+# Copyright 2004-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/debian/univention-directory-listener.postrm b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/debian/univention-directory-listener.postrm
>index 6e45fe6..20918da 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/debian/univention-directory-listener.postrm
>+++ b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/debian/univention-directory-listener.postrm
>@@ -3,7 +3,7 @@
> # Univention LDAP Listener
> #  postrm script
> #
>-# Copyright 2004-2014 Univention GmbH
>+# Copyright 2004-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/doc/univention-directory-listener-ctrl.8 b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/doc/univention-directory-listener-ctrl.8
>index 0174cab..838642a 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/doc/univention-directory-listener-ctrl.8
>+++ b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/doc/univention-directory-listener-ctrl.8
>@@ -27,4 +27,4 @@ Directory containing the state files.
> This program is documented fully in the
> .IR "Univention Corporate Server Manual" .
> .SH AUTHOR
>-Copyright (c) 2001-2014 Univention GmbH, Germany
>+Copyright (c) 2001-2015 Univention GmbH, Germany
>diff --git a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/doc/univention-directory-listener-dump.8 b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/doc/univention-directory-listener-dump.8
>index f9e4d27..4e5b1e2 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/doc/univention-directory-listener-dump.8
>+++ b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/doc/univention-directory-listener-dump.8
>@@ -38,4 +38,4 @@ Default directory used by the
> This program is documented fully in the
> .IR "Univention Corporate Server Manual" .
> .SH AUTHOR
>-Copyright (c) 2001-2014 Univention GmbH, Germany
>+Copyright (c) 2001-2015 Univention GmbH, Germany
>diff --git a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/doc/univention-directory-listener-verify.8 b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/doc/univention-directory-listener-verify.8
>index c1139c4..8107c53 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/doc/univention-directory-listener-verify.8
>+++ b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/doc/univention-directory-listener-verify.8
>@@ -41,4 +41,4 @@ Default directory used by the
> This program is documented fully in the
> .IR "Univention Corporate Server Manual" .
> .SH AUTHOR
>-Copyright (c) 2001-2014 Univention GmbH, Germany
>+Copyright (c) 2001-2015 Univention GmbH, Germany
>diff --git a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/doc/univention-directory-listener.8 b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/doc/univention-directory-listener.8
>index 8b8fe45..86aefe0 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/doc/univention-directory-listener.8
>+++ b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/doc/univention-directory-listener.8
>@@ -134,4 +134,4 @@ This program is documented fully in the
> .IR "Univention Corporate Server Manual" .
> 
> .SH AUTHOR
>-Copyright (c) 2001-2014 Univention GmbH, Germany
>+Copyright (c) 2001-2015 Univention GmbH, Germany
>diff --git a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/etc/network/if-post-down.d/univention-directory-listener b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/etc/network/if-post-down.d/univention-directory-listener
>index 8fa688d..8be4ff9 100755
>--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/etc/network/if-post-down.d/univention-directory-listener
>+++ b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/etc/network/if-post-down.d/univention-directory-listener
>@@ -3,7 +3,7 @@
> # Restart the Directory Listener after an interface was stopped.
> #  See https://forge.univention.org/bugzilla/show_bug.cgi?id=30408
> #
>-# Copyright 2013-2014 Univention GmbH
>+# Copyright 2013-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/python/get_notifier_id.py b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/python/get_notifier_id.py
>index d99ec80..71030a1 100755
>--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/python/get_notifier_id.py
>+++ b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/python/get_notifier_id.py
>@@ -4,7 +4,7 @@
> # Univention Directory Listener
> """Read the notifier id from the DC master"""
> #
>-# Copyright 2004-2014 Univention GmbH
>+# Copyright 2004-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/python/ldap_server.py b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/python/ldap_server.py
>index 6f9b8e5..752c132 100755
>--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/python/ldap_server.py
>+++ b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/python/ldap_server.py
>@@ -3,7 +3,7 @@
> # Univention Directory Listener
> """listener script for setting ldap server."""
> #
>-# Copyright 2004-2014 Univention GmbH
>+# Copyright 2004-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/python/listener.py b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/python/listener.py
>index a9f9933..e7829f1 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/python/listener.py
>+++ b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/python/listener.py
>@@ -3,7 +3,7 @@
> # Univention Directory Listener
> #  listener script
> #
>-# Copyright 2004-2014 Univention GmbH
>+# Copyright 2004-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/Makefile b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/Makefile
>index 3272d4d..4a04705 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/Makefile
>+++ b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/Makefile
>@@ -2,7 +2,7 @@
> # Univention Directory Listener
> #  Makefile for the listener
> #
>-# Copyright 2004-2014 Univention GmbH
>+# Copyright 2004-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/base64.h b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/base64.h
>index 385ae9f..0c4e8d7 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/base64.h
>+++ b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/base64.h
>@@ -2,7 +2,7 @@
>  * Univention Directory Listener
>  *  header information for base64.c
>  *
>- * Copyright 2004-2014 Univention GmbH
>+ * Copyright 2004-2015 Univention GmbH
>  *
>  * http://www.univention.de/
>  *
>diff --git a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/cache.c b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/cache.c
>index 7ad545c..59d5a0f 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/cache.c
>+++ b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/cache.c
>@@ -2,7 +2,7 @@
>  * Univention Directory Listener
>  *  ldap listener caching system
>  *
>- * Copyright 2004-2014 Univention GmbH
>+ * Copyright 2004-2015 Univention GmbH
>  *
>  * http://www.univention.de/
>  *
>diff --git a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/cache.h b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/cache.h
>index 17d7163..902a41b 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/cache.h
>+++ b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/cache.h
>@@ -2,7 +2,7 @@
>  * Univention Directory Listener
>  *  header information for cache.c
>  *
>- * Copyright 2004-2014 Univention GmbH
>+ * Copyright 2004-2015 Univention GmbH
>  *
>  * http://www.univention.de/
>  *
>diff --git a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/cache_entry.c b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/cache_entry.c
>index b3b64d7..96c5170 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/cache_entry.c
>+++ b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/cache_entry.c
>@@ -2,7 +2,7 @@
>  * Univention Directory Listener
>  *  entries in the cache
>  *
>- * Copyright 2004-2014 Univention GmbH
>+ * Copyright 2004-2015 Univention GmbH
>  *
>  * http://www.univention.de/
>  *
>diff --git a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/cache_entry.h b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/cache_entry.h
>index 8c6b479..bdce2b7 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/cache_entry.h
>+++ b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/cache_entry.h
>@@ -2,7 +2,7 @@
>  * Univention Directory Listener
>  *  cache entry header information
>  *
>- * Copyright 2004-2014 Univention GmbH
>+ * Copyright 2004-2015 Univention GmbH
>  *
>  * http://www.univention.de/
>  *
>diff --git a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/cache_lowlevel.c b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/cache_lowlevel.c
>index 1d3aa25..5eb2006 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/cache_lowlevel.c
>+++ b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/cache_lowlevel.c
>@@ -2,7 +2,7 @@
>  * Univention Directory Listener
>  *  cache_lowlevel.c
>  *
>- * Copyright 2004-2014 Univention GmbH
>+ * Copyright 2004-2015 Univention GmbH
>  *
>  * http://www.univention.de/
>  *
>diff --git a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/cache_lowlevel.h b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/cache_lowlevel.h
>index 174dc31..0f9e558 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/cache_lowlevel.h
>+++ b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/cache_lowlevel.h
>@@ -2,7 +2,7 @@
>  * Univention Directory Listener
>  *  header information for cache_lowlevel.c
>  *
>- * Copyright 2004-2014 Univention GmbH
>+ * Copyright 2004-2015 Univention GmbH
>  *
>  * http://www.univention.de/
>  *
>diff --git a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/change.c b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/change.c
>index 5a3ff95..7eab171 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/change.c
>+++ b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/change.c
>@@ -2,7 +2,7 @@
>  * Univention Directory Listener
>  *  abstract change handling
>  *
>- * Copyright 2004-2014 Univention GmbH
>+ * Copyright 2004-2015 Univention GmbH
>  *
>  * http://www.univention.de/
>  *
>diff --git a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/change.h b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/change.h
>index bed5714..55e4da2 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/change.h
>+++ b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/change.h
>@@ -2,7 +2,7 @@
>  * Univention Directory Listener
>  *  header information for change.c
>  *
>- * Copyright 2004-2014 Univention GmbH
>+ * Copyright 2004-2015 Univention GmbH
>  *
>  * http://www.univention.de/
>  *
>diff --git a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/common.h b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/common.h
>index 329efb6..2944dd0 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/common.h
>+++ b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/common.h
>@@ -2,7 +2,7 @@
>  * Univention Directory Listener
>  *  header information common.h
>  *
>- * Copyright 2004-2014 Univention GmbH
>+ * Copyright 2004-2015 Univention GmbH
>  *
>  * http://www.univention.de/
>  *
>diff --git a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/demo.c b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/demo.c
>index 509ae6f..a128568 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/demo.c
>+++ b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/demo.c
>@@ -2,7 +2,7 @@
>  * Univention Directory Listener
>  *  demo program for the notifier client API.
>  *
>- * Copyright 2004-2014 Univention GmbH
>+ * Copyright 2004-2015 Univention GmbH
>  *
>  * http://www.univention.de/
>  *
>diff --git a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/dump.c b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/dump.c
>index 5d73bf7..8a64038 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/dump.c
>+++ b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/dump.c
>@@ -3,7 +3,7 @@
>  *  header information for base64.c
>  *  tool to dump the cache.
>  *
>- * Copyright 2004-2014 Univention GmbH
>+ * Copyright 2004-2015 Univention GmbH
>  *
>  * http://www.univention.de/
>  *
>diff --git a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/dump_signals.c b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/dump_signals.c
>index bd6d814..3364774 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/dump_signals.c
>+++ b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/dump_signals.c
>@@ -2,7 +2,7 @@
>  * Univention Directory Listener
>  *  dump_signals.c
>  *
>- * Copyright 2004-2014 Univention GmbH
>+ * Copyright 2004-2015 Univention GmbH
>  *
>  * http://www.univention.de/
>  *
>diff --git a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/filter.c b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/filter.c
>index b85e5b9..9368d37 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/filter.c
>+++ b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/filter.c
>@@ -2,7 +2,7 @@
>  * Univention Directory Listener
>  *  filter.c
>  *
>- * Copyright 2004-2014 Univention GmbH
>+ * Copyright 2004-2015 Univention GmbH
>  *
>  * http://www.univention.de/
>  *
>diff --git a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/filter.h b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/filter.h
>index 7fb301a..973087a 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/filter.h
>+++ b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/filter.h
>@@ -2,7 +2,7 @@
>  * Univention Directory Listener
>  *  header information for filter.c
>  *
>- * Copyright 2004-2014 Univention GmbH
>+ * Copyright 2004-2015 Univention GmbH
>  *
>  * http://www.univention.de/
>  *
>diff --git a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/handlers.c b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/handlers.c
>index b00dd74..18be7ae 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/handlers.c
>+++ b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/handlers.c
>@@ -2,7 +2,7 @@
>  * Univention Directory Listener
>  *  handler.c
>  *
>- * Copyright 2004-2014 Univention GmbH
>+ * Copyright 2004-2015 Univention GmbH
>  *
>  * http://www.univention.de/
>  *
>diff --git a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/handlers.h b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/handlers.h
>index 517107e..ba24e51 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/handlers.h
>+++ b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/handlers.h
>@@ -2,7 +2,7 @@
>  * Univention Directory Listener
>  *  header information for handlers.c
>  *
>- * Copyright 2004-2014 Univention GmbH
>+ * Copyright 2004-2015 Univention GmbH
>  *
>  * http://www.univention.de/
>  *
>diff --git a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/listener-ctrl b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/listener-ctrl
>index 47bff40..0de5486 100755
>--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/listener-ctrl
>+++ b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/listener-ctrl
>@@ -3,7 +3,7 @@
> # Univention Directory Listener
> #  resync modules
> #
>-# Copyright 2004-2014 Univention GmbH
>+# Copyright 2004-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/main.c b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/main.c
>index 54f73e7..397b059 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/main.c
>+++ b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/main.c
>@@ -2,7 +2,7 @@
>  * Univention Directory Listener
>  *  main.c
>  *
>- * Copyright 2004-2014 Univention GmbH
>+ * Copyright 2004-2015 Univention GmbH
>  *
>  * http://www.univention.de/
>  *
>diff --git a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/network.c b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/network.c
>index ebd6278..19b349e 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/network.c
>+++ b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/network.c
>@@ -2,7 +2,7 @@
>  * Univention Directory Listener
>  *  an asyncronous notifier client API.
>  *
>- * Copyright 2004-2014 Univention GmbH
>+ * Copyright 2004-2015 Univention GmbH
>  *
>  * http://www.univention.de/
>  *
>diff --git a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/network.h b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/network.h
>index a1fdb9a..8892407 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/network.h
>+++ b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/network.h
>@@ -2,7 +2,7 @@
>  * Univention Directory Listener
>  *  header information for network.c
>  *
>- * Copyright 2004-2014 Univention GmbH
>+ * Copyright 2004-2015 Univention GmbH
>  *
>  * http://www.univention.de/
>  *
>diff --git a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/notifier.c b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/notifier.c
>index e4a9017..4b93ce2 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/notifier.c
>+++ b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/notifier.c
>@@ -2,7 +2,7 @@
>  * Univention Directory Listener
>  *  notifier.c
>  *
>- * Copyright 2004-2014 Univention GmbH
>+ * Copyright 2004-2015 Univention GmbH
>  *
>  * http://www.univention.de/
>  *
>diff --git a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/notifier.h b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/notifier.h
>index 26898b1..f920245 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/notifier.h
>+++ b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/notifier.h
>@@ -2,7 +2,7 @@
>  * Univention Directory Listener
>  *  header information for notifier.c
>  *
>- * Copyright 2004-2014 Univention GmbH
>+ * Copyright 2004-2015 Univention GmbH
>  *
>  * http://www.univention.de/
>  *
>diff --git a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/select_server.c b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/select_server.c
>index 73d0846..36a9fbc 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/select_server.c
>+++ b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/select_server.c
>@@ -2,7 +2,7 @@
>  * Univention Directory Listener
>  *  select_server.c
>  *
>- * Copyright 2004-2014 Univention GmbH
>+ * Copyright 2004-2015 Univention GmbH
>  *
>  * http://www.univention.de/
>  *
>diff --git a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/select_server.h b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/select_server.h
>index 04d8c03..199170b 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/select_server.h
>+++ b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/select_server.h
>@@ -2,7 +2,7 @@
>  * Univention Directory Listener
>  *  header information for select_server.c
>  *
>- * Copyright 2004-2014 Univention GmbH
>+ * Copyright 2004-2015 Univention GmbH
>  *
>  * http://www.univention.de/
>  *
>diff --git a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/signals.c b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/signals.c
>index e39039f..49c6313 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/signals.c
>+++ b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/signals.c
>@@ -2,7 +2,7 @@
>  * Univention Directory Listener
>  *  signal handlers are initialized and defined here.
>  *
>- * Copyright 2004-2014 Univention GmbH
>+ * Copyright 2004-2015 Univention GmbH
>  *
>  * http://www.univention.de/
>  *
>diff --git a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/signals.h b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/signals.h
>index a15eb45..c8cbc7b 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/signals.h
>+++ b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/signals.h
>@@ -2,7 +2,7 @@
>  * Univention Directory Listener
>  *  signal handling
>  *
>- * Copyright 2004-2014 Univention GmbH
>+ * Copyright 2004-2015 Univention GmbH
>  *
>  * http://www.univention.de/
>  *
>diff --git a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/transfile.c b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/transfile.c
>index 8d479ea..f7947b1 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/transfile.c
>+++ b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/transfile.c
>@@ -2,7 +2,7 @@
>  * Univention Directory Listener
>  *  transfile.c
>  *
>- * Copyright 2004-2014 Univention GmbH
>+ * Copyright 2004-2015 Univention GmbH
>  *
>  * http://www.univention.de/
>  *
>diff --git a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/transfile.h b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/transfile.h
>index 621c478..818ddcb 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/transfile.h
>+++ b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/transfile.h
>@@ -2,7 +2,7 @@
>  * Univention Directory Listener
>  *  header information for transfile.c
>  *
>- * Copyright 2004-2014 Univention GmbH
>+ * Copyright 2004-2015 Univention GmbH
>  *
>  * http://www.univention.de/
>  *
>diff --git a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/verify.c b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/verify.c
>index 315c983..658b7c3 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/verify.c
>+++ b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/verify.c
>@@ -2,7 +2,7 @@
>  * Univention Directory Listener
>  *  verify that Listener DB and local LDAP match
>  *
>- * Copyright 2004-2014 Univention GmbH
>+ * Copyright 2004-2015 Univention GmbH
>  *
>  * http://www.univention.de/
>  *
>diff --git a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/wrapper b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/wrapper
>index 342ea2e..63b4126 100755
>--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/wrapper
>+++ b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/wrapper
>@@ -3,7 +3,7 @@
> # Univention Baseconfig
> #  wrapper script
> #
>-# Copyright 2004-2014 Univention GmbH
>+# Copyright 2004-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/tests/Makefile b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/tests/Makefile
>index e25857e..0ede16e 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/tests/Makefile
>+++ b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/tests/Makefile
>@@ -2,7 +2,7 @@
> # Univention Directory Listener
> #  Makefile for testing the listener
> #
>-# Copyright 2004-2014 Univention GmbH
>+# Copyright 2004-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/02univention-directory-notifier.inst b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/02univention-directory-notifier.inst
>index 7c6e276..250683f 100755
>--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/02univention-directory-notifier.inst
>+++ b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/02univention-directory-notifier.inst
>@@ -3,7 +3,7 @@
> # Univention Directory Notifier
> #  join script
> #
>-# Copyright 2007-2014 Univention GmbH
>+# Copyright 2007-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/15univention-directory-notifier-post.inst b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/15univention-directory-notifier-post.inst
>index a2c98e8..d471c77 100755
>--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/15univention-directory-notifier-post.inst
>+++ b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/15univention-directory-notifier-post.inst
>@@ -3,7 +3,7 @@
> # Univention Directory Notifier
> #  join script
> #
>-# Copyright 2007-2014 Univention GmbH
>+# Copyright 2007-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/conffiles/etc/runit/univention-directory-notifier/run b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/conffiles/etc/runit/univention-directory-notifier/run
>index 59ff8f2..9f54a08 100755
>--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/conffiles/etc/runit/univention-directory-notifier/run
>+++ b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/conffiles/etc/runit/univention-directory-notifier/run
>@@ -1,7 +1,7 @@
> #!/bin/sh -e
> @%@UCRWARNING=# @%@
> #
>-# Copyright 2004-2014 Univention GmbH
>+# Copyright 2004-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/debian/copyright b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/debian/copyright
>index 1d0e8af..4802bd2 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/debian/copyright
>+++ b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/debian/copyright
>@@ -1,4 +1,4 @@
>-Copyright 2002-2014 Univention GmbH
>+Copyright 2002-2015 Univention GmbH
> 
> http://www.univention.de/
> 
>diff --git a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/debian/rules b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/debian/rules
>index 128ebc7..7aa7ca1 100755
>--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/debian/rules
>+++ b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/debian/rules
>@@ -3,7 +3,7 @@
> # Univention Directory Notifier
> #  rules file for the debian package
> #
>-# Copyright 2004-2014 Univention GmbH
>+# Copyright 2004-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/debian/univention-directory-notifier.init b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/debian/univention-directory-notifier.init
>index 4f85756..41539a5 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/debian/univention-directory-notifier.init
>+++ b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/debian/univention-directory-notifier.init
>@@ -3,7 +3,7 @@
> # Univention Directory Notifier
> #  init script
> #
>-# Copyright 2004-2014 Univention GmbH
>+# Copyright 2004-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/debian/univention-directory-notifier.postinst b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/debian/univention-directory-notifier.postinst
>index 438274f..e99a182 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/debian/univention-directory-notifier.postinst
>+++ b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/debian/univention-directory-notifier.postinst
>@@ -3,7 +3,7 @@
> # Univention Directory Notifier
> #  postinst
> #
>-# Copyright 2004-2014 Univention GmbH
>+# Copyright 2004-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/debian/univention-ldap-notifier.postinst b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/debian/univention-ldap-notifier.postinst
>index 3e3e29b..c0c66e4 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/debian/univention-ldap-notifier.postinst
>+++ b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/debian/univention-ldap-notifier.postinst
>@@ -3,7 +3,7 @@
> # Univention LDAP Notifier
> #  postinst
> #
>-# Copyright 2004-2014 Univention GmbH
>+# Copyright 2004-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/etc/network/if-post-down.d/univention-directory-notifier b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/etc/network/if-post-down.d/univention-directory-notifier
>index 61a263f..182e4b7 100755
>--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/etc/network/if-post-down.d/univention-directory-notifier
>+++ b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/etc/network/if-post-down.d/univention-directory-notifier
>@@ -3,7 +3,7 @@
> # Restart the Directory Notifier after an interface was stopped.
> #  See https://forge.univention.org/bugzilla/show_bug.cgi?id=30408
> #
>-# Copyright 2013-2014 Univention GmbH
>+# Copyright 2013-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/src/Makefile b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/src/Makefile
>index 132b3fa..843b9e0 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/src/Makefile
>+++ b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/src/Makefile
>@@ -2,7 +2,7 @@
> # Univention Directory Notifier
> #  Makefile
> #
>-# Copyright 2004-2014 Univention GmbH
>+# Copyright 2004-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/src/cache.c b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/src/cache.c
>index 57f8489..4cae077 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/src/cache.c
>+++ b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/src/cache.c
>@@ -2,7 +2,7 @@
>  * Univention Directory Notifier
>  *  cache.c
>  *
>- * Copyright 2004-2014 Univention GmbH
>+ * Copyright 2004-2015 Univention GmbH
>  *
>  * http://www.univention.de/
>  *
>diff --git a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/src/cache.h b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/src/cache.h
>index 72f715b..ac3a3a4 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/src/cache.h
>+++ b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/src/cache.h
>@@ -2,7 +2,7 @@
>  * Univention Directory Notifier
>  *  cache.h
>  *
>- * Copyright 2004-2014 Univention GmbH
>+ * Copyright 2004-2015 Univention GmbH
>  *
>  * http://www.univention.de/
>  *
>diff --git a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/src/callback.c b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/src/callback.c
>index 22f07d3..f78dc36 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/src/callback.c
>+++ b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/src/callback.c
>@@ -1,7 +1,7 @@
> /*
>  * Univention Directory Notifier
>  *
>- * Copyright 2004-2014 Univention GmbH
>+ * Copyright 2004-2015 Univention GmbH
>  *
>  * http://www.univention.de/
>  *
>diff --git a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/src/callback.h b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/src/callback.h
>index 9f6f234..a085a05 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/src/callback.h
>+++ b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/src/callback.h
>@@ -1,7 +1,7 @@
> /*
>  * Univention Directory Notifier
>  *
>- * Copyright 2004-2014 Univention GmbH
>+ * Copyright 2004-2015 Univention GmbH
>  *
>  * http://www.univention.de/
>  *
>diff --git a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/src/index-dump.c b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/src/index-dump.c
>index 615395c..3d4b3a2 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/src/index-dump.c
>+++ b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/src/index-dump.c
>@@ -1,7 +1,7 @@
> /*
>  * Univention Directory Notifier
>  *
>- * Copyright 2004-2014 Univention GmbH
>+ * Copyright 2004-2015 Univention GmbH
>  *
>  * http://www.univention.de/
>  *
>diff --git a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/src/index.c b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/src/index.c
>index 4f79005..55602d9 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/src/index.c
>+++ b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/src/index.c
>@@ -1,7 +1,7 @@
> /*
>  * Univention Directory Notifier
>  *
>- * Copyright 2004-2014 Univention GmbH
>+ * Copyright 2004-2015 Univention GmbH
>  *
>  * http://www.univention.de/
>  *
>diff --git a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/src/index.h b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/src/index.h
>index c3d4563..40c4b82 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/src/index.h
>+++ b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/src/index.h
>@@ -1,7 +1,7 @@
> /*
>  * Univention Directory Notifier
>  *
>- * Copyright 2004-2014 Univention GmbH
>+ * Copyright 2004-2015 Univention GmbH
>  *
>  * http://www.univention.de/
>  *
>diff --git a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/src/network.c b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/src/network.c
>index 230922c..b84b389 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/src/network.c
>+++ b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/src/network.c
>@@ -1,7 +1,7 @@
> /*
>  * Univention Directory Notifier
>  *
>- * Copyright 2004-2014 Univention GmbH
>+ * Copyright 2004-2015 Univention GmbH
>  *
>  * http://www.univention.de/
>  *
>diff --git a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/src/network.h b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/src/network.h
>index 96298d9..c332448 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/src/network.h
>+++ b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/src/network.h
>@@ -1,7 +1,7 @@
> /*
>  * Univention Directory Notifier
>  *
>- * Copyright 2004-2014 Univention GmbH
>+ * Copyright 2004-2015 Univention GmbH
>  *
>  * http://www.univention.de/
>  *
>diff --git a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/src/notify.c b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/src/notify.c
>index 0a1adb6..f8c9bd4 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/src/notify.c
>+++ b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/src/notify.c
>@@ -1,7 +1,7 @@
> /*
>  * Univention Directory Notifier
>  *
>- * Copyright 2004-2014 Univention GmbH
>+ * Copyright 2004-2015 Univention GmbH
>  *
>  * http://www.univention.de/
>  *
>diff --git a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/src/notify.h b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/src/notify.h
>index 3d53947..33b6485 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/src/notify.h
>+++ b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/src/notify.h
>@@ -1,7 +1,7 @@
> /*
>  * Univention Directory Notifier
>  *
>- * Copyright 2004-2014 Univention GmbH
>+ * Copyright 2004-2015 Univention GmbH
>  *
>  * http://www.univention.de/
>  *
>diff --git a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/src/sem.c b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/src/sem.c
>index 2593080..0d0f6b4 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/src/sem.c
>+++ b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/src/sem.c
>@@ -1,7 +1,7 @@
> /*
>  * Univention Directory Notifier
>  *
>- * Copyright 2004-2014 Univention GmbH
>+ * Copyright 2004-2015 Univention GmbH
>  *
>  * http://www.univention.de/
>  *
>diff --git a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/src/sem.h b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/src/sem.h
>index c806590..955608f 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/src/sem.h
>+++ b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/src/sem.h
>@@ -1,7 +1,7 @@
> /*
>  * Univention Directory Notifier
>  *
>- * Copyright 2004-2014 Univention GmbH
>+ * Copyright 2004-2015 Univention GmbH
>  *
>  * http://www.univention.de/
>  *
>diff --git a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/src/univention-directory-notifier.c b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/src/univention-directory-notifier.c
>index c832afa..105f10f 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/src/univention-directory-notifier.c
>+++ b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/src/univention-directory-notifier.c
>@@ -1,7 +1,7 @@
> /*
>  * Univention Directory Notifier
>  *
>- * Copyright 2004-2014 Univention GmbH
>+ * Copyright 2004-2015 Univention GmbH
>  *
>  * http://www.univention.de/
>  *
>diff --git a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/univention-replicate-one b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/univention-replicate-one
>index 4c36b99..0101f2b 100755
>--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/univention-replicate-one
>+++ b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/univention-replicate-one
>@@ -3,7 +3,7 @@
> # Univention Directory Notifier
> #  Replicate one DN
> #
>-# Copyright 2012-2014 Univention GmbH
>+# Copyright 2012-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/05univention-bind.inst b/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/05univention-bind.inst
>index 1112eaa..43d50c3 100755
>--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/05univention-bind.inst
>+++ b/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/05univention-bind.inst
>@@ -3,7 +3,7 @@
> # Univention Bind
> #  join script
> #
>-# Copyright 2001-2014 Univention GmbH
>+# Copyright 2001-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/90univention-bind-post.inst b/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/90univention-bind-post.inst
>index 10e3b15..d5dd1f5 100755
>--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/90univention-bind-post.inst
>+++ b/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/90univention-bind-post.inst
>@@ -3,7 +3,7 @@
> # Univention Bind
> #  join script
> #
>-# Copyright 2001-2014 Univention GmbH
>+# Copyright 2001-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/bind.py b/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/bind.py
>index ba8a6f0..66d199d 100755
>--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/bind.py
>+++ b/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/bind.py
>@@ -9,7 +9,7 @@ the proxy.
> During the quiet period check the cache directory (is-state) against the
> configuration directory (should-state) and reload/restart as appropriate.
> """
>-# Copyright 2001-2014 Univention GmbH
>+# Copyright 2001-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/conffiles/etc/init.d/bind9 b/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/conffiles/etc/init.d/bind9
>index 9bfa738..5f75311 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/conffiles/etc/init.d/bind9
>+++ b/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/conffiles/etc/init.d/bind9
>@@ -1,7 +1,7 @@
> #!/bin/sh
> @%@UCRWARNING=# @%@
> #
>-# Copyright 2001-2014 Univention GmbH
>+# Copyright 2001-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/conffiles/etc/runit/univention-bind-proxy/run b/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/conffiles/etc/runit/univention-bind-proxy/run
>index 4577aee..1b4c6d1 100755
>--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/conffiles/etc/runit/univention-bind-proxy/run
>+++ b/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/conffiles/etc/runit/univention-bind-proxy/run
>@@ -1,6 +1,6 @@
> #!/bin/sh
> #
>-# Copyright 2001-2014 Univention GmbH
>+# Copyright 2001-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/conffiles/etc/runit/univention-bind-samba4/run b/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/conffiles/etc/runit/univention-bind-samba4/run
>index 0a53f92..e0c2403 100755
>--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/conffiles/etc/runit/univention-bind-samba4/run
>+++ b/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/conffiles/etc/runit/univention-bind-samba4/run
>@@ -1,6 +1,6 @@
> #!/bin/sh
> #
>-# Copyright 2001-2014 Univention GmbH
>+# Copyright 2001-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/conffiles/etc/runit/univention-bind/run b/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/conffiles/etc/runit/univention-bind/run
>index e8f3adc..277dc65 100755
>--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/conffiles/etc/runit/univention-bind/run
>+++ b/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/conffiles/etc/runit/univention-bind/run
>@@ -1,6 +1,6 @@
> #!/bin/sh
> #
>-# Copyright 2001-2014 Univention GmbH
>+# Copyright 2001-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/debian/copyright b/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/debian/copyright
>index d39899c..61cb6c7 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/debian/copyright
>+++ b/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/debian/copyright
>@@ -1,4 +1,4 @@
>-Copyright 2001-2014 Univention GmbH
>+Copyright 2001-2015 Univention GmbH
> 
> http://www.univention.de/
> 
>diff --git a/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/debian/rules b/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/debian/rules
>index a59ce81..991ca23 100755
>--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/debian/rules
>+++ b/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/debian/rules
>@@ -3,7 +3,7 @@
> # Univention Bind
> #  rules file for the debian package
> #
>-# Copyright 2001-2014 Univention GmbH
>+# Copyright 2001-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/debian/univention-bind.postinst b/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/debian/univention-bind.postinst
>index 7382a14..1d90ea5 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/debian/univention-bind.postinst
>+++ b/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/debian/univention-bind.postinst
>@@ -3,7 +3,7 @@
> # Univention Bind
> #  postinst script for the univention-bind debian package
> #
>-# Copyright 2001-2014 Univention GmbH
>+# Copyright 2001-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/import-zone b/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/import-zone
>index d5db979..a9a71e8 100755
>--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/import-zone
>+++ b/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/import-zone
>@@ -4,7 +4,7 @@
> # Univention Bind
> #  join script
> #
>-# Copyright 2001-2014 Univention GmbH
>+# Copyright 2001-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/usr/lib/univention-server/server_password_change.d/univention-bind b/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/usr/lib/univention-server/server_password_change.d/univention-bind
>index 8da8b01..d9dc40d 100755
>--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/usr/lib/univention-server/server_password_change.d/univention-bind
>+++ b/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/usr/lib/univention-server/server_password_change.d/univention-bind
>@@ -2,7 +2,7 @@
> #
> # Univention Bind
> #
>-# Copyright 2011-2014 Univention GmbH
>+# Copyright 2011-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/03univention-s4-connector.uinst b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/03univention-s4-connector.uinst
>index 6248e67..324d657 100755
>--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/03univention-s4-connector.uinst
>+++ b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/03univention-s4-connector.uinst
>@@ -3,7 +3,7 @@
> # Univention S4 Connector
> #  join script
> #
>-# Copyright 2004-2014 Univention GmbH
>+# Copyright 2004-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/97univention-s4-connector.inst b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/97univention-s4-connector.inst
>index 0cadb7f..7386d66 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/97univention-s4-connector.inst
>+++ b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/97univention-s4-connector.inst
>@@ -3,7 +3,7 @@
> # Univention S4 Connector
> #  join script
> #
>-# Copyright 2004-2014 Univention GmbH
>+# Copyright 2004-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/conffiles/etc/univention/s4connector/s4/mapping.py b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/conffiles/etc/univention/s4connector/s4/mapping.py
>index dc661be..0bd4a42 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/conffiles/etc/univention/s4connector/s4/mapping.py
>+++ b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/conffiles/etc/univention/s4connector/s4/mapping.py
>@@ -3,7 +3,7 @@
> # Univention S4 Connector
> #  this file defines the mapping beetween S4 and UCS
> #
>-# Copyright 2004-2014 Univention GmbH
>+# Copyright 2004-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/debian/copyright b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/debian/copyright
>index e025a72..9a49473 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/debian/copyright
>+++ b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/debian/copyright
>@@ -1,4 +1,4 @@
>-Copyright 2002-2014 Univention GmbH
>+Copyright 2002-2015 Univention GmbH
> 
> http://www.univention.de/
> 
>diff --git a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/debian/rules b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/debian/rules
>index fb1ae88..f2bd727 100755
>--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/debian/rules
>+++ b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/debian/rules
>@@ -3,7 +3,7 @@
> # Univention AD Connector
> #  rules file for the ad connector debian package
> #
>-# Copyright 2004-2014 Univention GmbH
>+# Copyright 2004-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/debian/univention-s4-connector.init b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/debian/univention-s4-connector.init
>index a7025db..4add350 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/debian/univention-s4-connector.init
>+++ b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/debian/univention-s4-connector.init
>@@ -3,7 +3,7 @@
> # Univention S4 Connector
> #  init script of the ad connector
> #
>-# Copyright 2004-2014 Univention GmbH
>+# Copyright 2004-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/debian/univention-s4-connector.postinst b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/debian/univention-s4-connector.postinst
>index c990d57..630b23f 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/debian/univention-s4-connector.postinst
>+++ b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/debian/univention-s4-connector.postinst
>@@ -3,7 +3,7 @@
> # Univention Samba4 Connector
> #  postinst script of the samba4 connector package
> #
>-# Copyright 2004-2014 Univention GmbH
>+# Copyright 2004-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/debian/univention-s4-connector.postrm b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/debian/univention-s4-connector.postrm
>index 0900d94..a322c8f 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/debian/univention-s4-connector.postrm
>+++ b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/debian/univention-s4-connector.postrm
>@@ -3,7 +3,7 @@
> # Univention S4 Connector
> #  postinst script of the samba4 connector package
> #
>-# Copyright 2013-2014 Univention GmbH
>+# Copyright 2013-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/debian/univention-s4-connector.prerm b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/debian/univention-s4-connector.prerm
>index 315aac6..c06c21a 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/debian/univention-s4-connector.prerm
>+++ b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/debian/univention-s4-connector.prerm
>@@ -3,7 +3,7 @@
> # Univention S4 Connector
> #  prerm script
> #
>-# Copyright 2013-2014 Univention GmbH
>+# Copyright 2013-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/etc/network/if-post-down.d/univention-s4-connector b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/etc/network/if-post-down.d/univention-s4-connector
>index b256e43..68650ac 100755
>--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/etc/network/if-post-down.d/univention-s4-connector
>+++ b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/etc/network/if-post-down.d/univention-s4-connector
>@@ -3,7 +3,7 @@
> # Restart the S4 connector if an interface was stopped.
> #  See https://forge.univention.org/bugzilla/show_bug.cgi?id=30119
> #
>-# Copyright 2013-2014 Univention GmbH
>+# Copyright 2013-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/ldap/msgpo.schema b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/ldap/msgpo.schema
>index 8230a44..d173780 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/ldap/msgpo.schema
>+++ b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/ldap/msgpo.schema
>@@ -1,4 +1,4 @@
>-# Copyright 2012-2014 Univention GmbH
>+# Copyright 2012-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/ldap/mswmi.schema b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/ldap/mswmi.schema
>index 45036d0..df66b6f 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/ldap/mswmi.schema
>+++ b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/ldap/mswmi.schema
>@@ -1,4 +1,4 @@
>-# Copyright 2013-2014 Univention GmbH
>+# Copyright 2013-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/modules/univention/admin/handlers/container/msgpo.py b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/modules/univention/admin/handlers/container/msgpo.py
>index 1750be1..06f64f8 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/modules/univention/admin/handlers/container/msgpo.py
>+++ b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/modules/univention/admin/handlers/container/msgpo.py
>@@ -3,7 +3,7 @@
> # Univention S4 Connector
> #  UDM module for MS GPOs
> #
>-# Copyright 2012-2014 Univention GmbH
>+# Copyright 2012-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/modules/univention/admin/handlers/settings/mswmifilter.py b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/modules/univention/admin/handlers/settings/mswmifilter.py
>index 91c6b07..1f88b45 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/modules/univention/admin/handlers/settings/mswmifilter.py
>+++ b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/modules/univention/admin/handlers/settings/mswmifilter.py
>@@ -3,7 +3,7 @@
> # Univention S4 Connector
> #  UDM module for MS GPOs
> #
>-# Copyright 2012-2014 Univention GmbH
>+# Copyright 2012-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/modules/univention/s4connector/__init__.py b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/modules/univention/s4connector/__init__.py
>index a598ed5..2d1674f 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/modules/univention/s4connector/__init__.py
>+++ b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/modules/univention/s4connector/__init__.py
>@@ -4,7 +4,7 @@
> # Univention S4 Connector
> #  Basic class for the UCS connector part
> #
>-# Copyright 2004-2014 Univention GmbH
>+# Copyright 2004-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/modules/univention/s4connector/lockingdb.py b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/modules/univention/s4connector/lockingdb.py
>index 262d7fe..d2f446f 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/modules/univention/s4connector/lockingdb.py
>+++ b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/modules/univention/s4connector/lockingdb.py
>@@ -4,7 +4,7 @@
> # Univention S4 Connector
> #  LockingDB
> #
>-# Copyright 2014 Univention GmbH
>+# Copyright 2014-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/modules/univention/s4connector/s4/__init__.py b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/modules/univention/s4connector/s4/__init__.py
>index 0026b51..29819fd 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/modules/univention/s4connector/s4/__init__.py
>+++ b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/modules/univention/s4connector/s4/__init__.py
>@@ -4,7 +4,7 @@
> # Univention S4 Connector
> #  Basic class for the AD connector part
> #
>-# Copyright 2004-2014 Univention GmbH
>+# Copyright 2004-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/modules/univention/s4connector/s4/computer.py b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/modules/univention/s4connector/s4/computer.py
>index 9796951..488e287 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/modules/univention/s4connector/s4/computer.py
>+++ b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/modules/univention/s4connector/s4/computer.py
>@@ -4,7 +4,7 @@
> # Univention S4 Connector
> #  computer object helper functions
> #
>-# Copyright 2013-2014 Univention GmbH
>+# Copyright 2013-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/modules/univention/s4connector/s4/dc.py b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/modules/univention/s4connector/s4/dc.py
>index c0ee6c3..3fdc043 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/modules/univention/s4connector/s4/dc.py
>+++ b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/modules/univention/s4connector/s4/dc.py
>@@ -4,7 +4,7 @@
> # Univention S4 Connector
> #  dc sync
> #
>-# Copyright 2004-2014 Univention GmbH
>+# Copyright 2004-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/modules/univention/s4connector/s4/dns.py b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/modules/univention/s4connector/s4/dns.py
>index 8d606c5..5537371 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/modules/univention/s4connector/s4/dns.py
>+++ b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/modules/univention/s4connector/s4/dns.py
>@@ -4,7 +4,7 @@
> # Univention S4 Connector
> #  dns helper functions
> #
>-# Copyright 2004-2014 Univention GmbH
>+# Copyright 2004-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/modules/univention/s4connector/s4/main.py b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/modules/univention/s4connector/s4/main.py
>index 986779e..5ffd0b9 100755
>--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/modules/univention/s4connector/s4/main.py
>+++ b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/modules/univention/s4connector/s4/main.py
>@@ -4,7 +4,7 @@
> # Univention S4 Connector
> #  the main start script
> #
>-# Copyright 2004-2014 Univention GmbH
>+# Copyright 2004-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/modules/univention/s4connector/s4/mapping.py b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/modules/univention/s4connector/s4/mapping.py
>index 2991aa4..2b66b7b 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/modules/univention/s4connector/s4/mapping.py
>+++ b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/modules/univention/s4connector/s4/mapping.py
>@@ -4,7 +4,7 @@
> # Univention S4 Connector
> #  some mapping helper functions
> #
>-# Copyright 2004-2014 Univention GmbH
>+# Copyright 2004-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/modules/univention/s4connector/s4/password.py b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/modules/univention/s4connector/s4/password.py
>index 8e8a231..f997b8b 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/modules/univention/s4connector/s4/password.py
>+++ b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/modules/univention/s4connector/s4/password.py
>@@ -4,7 +4,7 @@
> # Univention S4 Connector
> #  control the password sync communication with the s4 password service
> #
>-# Copyright 2004-2014 Univention GmbH
>+# Copyright 2004-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/modules/univention/s4connector/s4/query_config.py b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/modules/univention/s4connector/s4/query_config.py
>index d84defb..33953bd 100755
>--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/modules/univention/s4connector/s4/query_config.py
>+++ b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/modules/univention/s4connector/s4/query_config.py
>@@ -4,7 +4,7 @@
> # Univention S4 Connector
> #  reads the internal configuration
> #
>-# Copyright 2004-2014 Univention GmbH
>+# Copyright 2004-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/modules/univention/s4connector/s4/sid_mapping.py b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/modules/univention/s4connector/s4/sid_mapping.py
>index ddaef9e..a037721 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/modules/univention/s4connector/s4/sid_mapping.py
>+++ b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/modules/univention/s4connector/s4/sid_mapping.py
>@@ -4,7 +4,7 @@
> # Univention S4 Connector
> #  sid sync
> #
>-# Copyright 2004-2014 Univention GmbH
>+# Copyright 2004-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/modules/univention/s4connector/s4cache.py b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/modules/univention/s4connector/s4cache.py
>index 7cea41e..00cc89e 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/modules/univention/s4connector/s4cache.py
>+++ b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/modules/univention/s4connector/s4cache.py
>@@ -4,7 +4,7 @@
> # Univention S4 Connector
> #  s4 cache
> #
>-# Copyright 2014 Univention GmbH
>+# Copyright 2014-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/s4-connector.py b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/s4-connector.py
>index e70ef5e..cfb6e96 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/s4-connector.py
>+++ b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/s4-connector.py
>@@ -4,7 +4,7 @@
> # Univention S4 Connector
> #  Univention Directory Listener script for the s4 connector
> #
>-# Copyright 2004-2014 Univention GmbH
>+# Copyright 2004-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/scripts/DN2base64Guid.py b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/scripts/DN2base64Guid.py
>index 98b0414..2d95721 100755
>--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/scripts/DN2base64Guid.py
>+++ b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/scripts/DN2base64Guid.py
>@@ -4,7 +4,7 @@
> # Univention S4 Connector
> #  Convert S4 DN to base64 objectGuid as used in s4cache.sqlite
> #
>-# Copyright 2014 Univention GmbH
>+# Copyright 2014-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/scripts/base64Guid2DN.py b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/scripts/base64Guid2DN.py
>index a2486e3..72039b6 100755
>--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/scripts/base64Guid2DN.py
>+++ b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/scripts/base64Guid2DN.py
>@@ -5,7 +5,7 @@
> #  Upgrade script for gPLink
> #  Convert base64 objectGuid to S4 DN as used in s4cache.sqlite
> #
>-# Copyright 2014 Univention GmbH
>+# Copyright 2014-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/scripts/msGPOWQLFilter.py b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/scripts/msGPOWQLFilter.py
>index 56510fb..1684c90 100755
>--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/scripts/msGPOWQLFilter.py
>+++ b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/scripts/msGPOWQLFilter.py
>@@ -4,7 +4,7 @@
> # Univention S4 Connector
> #  Upgrade script for msGPOWQLFilter attributes
> #
>-# Copyright 2013-2014 Univention GmbH
>+# Copyright 2013-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/scripts/msgpo.py b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/scripts/msgpo.py
>index e8a2be4..dbfe1d2 100755
>--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/scripts/msgpo.py
>+++ b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/scripts/msgpo.py
>@@ -4,7 +4,7 @@
> # Univention S4 Connector
> #  Upgrade script for gPLink
> #
>-# Copyright 2012-2014 Univention GmbH
>+# Copyright 2012-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/scripts/remove_s4_rejected.py b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/scripts/remove_s4_rejected.py
>index 81d0905..0f2cff7 100755
>--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/scripts/remove_s4_rejected.py
>+++ b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/scripts/remove_s4_rejected.py
>@@ -4,7 +4,7 @@
> # Univention S4 Connector
> #  Remove rejected S4 object
> #
>-# Copyright 2014 Univention GmbH
>+# Copyright 2014-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/scripts/remove_ucs_rejected.py b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/scripts/remove_ucs_rejected.py
>index 8fbfa9c..861a21a 100755
>--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/scripts/remove_ucs_rejected.py
>+++ b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/scripts/remove_ucs_rejected.py
>@@ -4,7 +4,7 @@
> # Univention S4 Connector
> #  Remove rejected UCS object
> #
>-# Copyright 2014 Univention GmbH
>+# Copyright 2014-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/scripts/resync_object_from_s4.py b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/scripts/resync_object_from_s4.py
>index 420b680..748430b 100755
>--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/scripts/resync_object_from_s4.py
>+++ b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/scripts/resync_object_from_s4.py
>@@ -4,7 +4,7 @@
> # Univention S4 Connector
> #  Resync object from S4 to OpenLDAP
> #
>-# Copyright 2014 Univention GmbH
>+# Copyright 2014-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/scripts/resync_object_from_ucs.py b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/scripts/resync_object_from_ucs.py
>index 65b87c6..c46c7b0 100755
>--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/scripts/resync_object_from_ucs.py
>+++ b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/scripts/resync_object_from_ucs.py
>@@ -4,7 +4,7 @@
> # Univention S4 Connector
> #  Resync object from OpenLDAP to S4
> #
>-# Copyright 2014 Univention GmbH
>+# Copyright 2014-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/scripts/upgrade_groupPolicyContainer.py b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/scripts/upgrade_groupPolicyContainer.py
>index 01c44b4..a6cd7df 100755
>--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/scripts/upgrade_groupPolicyContainer.py
>+++ b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/scripts/upgrade_groupPolicyContainer.py
>@@ -4,7 +4,7 @@
> # Univention S4 Connector
> #  Added groupPolicyContainer objects to rejected table
> #
>-# Copyright 2012-2014 Univention GmbH
>+# Copyright 2012-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/scripts/upgrade_msWMI-Som.py b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/scripts/upgrade_msWMI-Som.py
>index 3f5cf9f..a9fb431 100755
>--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/scripts/upgrade_msWMI-Som.py
>+++ b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/scripts/upgrade_msWMI-Som.py
>@@ -4,7 +4,7 @@
> # Univention S4 Connector
> #  Trigger Synchronization of msWMI-Som objects
> #
>-# Copyright 2013-2014 Univention GmbH
>+# Copyright 2013-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/scripts/write_password_settings.py b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/scripts/write_password_settings.py
>index e0e9883..50adabf 100755
>--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/scripts/write_password_settings.py
>+++ b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/scripts/write_password_settings.py
>@@ -4,7 +4,7 @@
> # Univention S4 Connector
> #  Upgrade script for samba domain password setting attributes
> #
>-# Copyright 2012-2014 Univention GmbH
>+# Copyright 2012-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/server_password_change.d/univention-s4-connector b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/server_password_change.d/univention-s4-connector
>index bff02bb..726dfb1 100755
>--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/server_password_change.d/univention-s4-connector
>+++ b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/server_password_change.d/univention-s4-connector
>@@ -2,7 +2,7 @@
> #
> # Univention S4 Connector
> #
>-# Copyright 2013-2014 Univention GmbH
>+# Copyright 2013-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/sync_krbtgt b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/sync_krbtgt
>index 17712b9..44ccaf3 100755
>--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/sync_krbtgt
>+++ b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/sync_krbtgt
>@@ -4,7 +4,7 @@
> # sync_krbtgt
> #  sync the password of krbtgt from Samba4 to UCS
> #
>-# Copyright 2010-2014 Univention GmbH
>+# Copyright 2010-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/univention-password_sync_ucs_to_s4 b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/univention-password_sync_ucs_to_s4
>index 9320122..10db55d 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/univention-password_sync_ucs_to_s4
>+++ b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/univention-password_sync_ucs_to_s4
>@@ -4,7 +4,7 @@
> # Univention Samba4 Password sync
> #  sync the password from UCS to Samba4
> #
>-# Copyright 2010-2014 Univention GmbH
>+# Copyright 2010-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/univention-s4-connector b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/univention-s4-connector
>index 3992912..b3c9dad 100755
>--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/univention-s4-connector
>+++ b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/univention-s4-connector
>@@ -3,7 +3,7 @@
> # Univention S4 Connector
> #  Start script for the AD Conenctor
> #
>-# Copyright 2004-2014 Univention GmbH
>+# Copyright 2004-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/univention-s4-position-sync b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/univention-s4-position-sync
>index 1c0a11e..0984e27 100755
>--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/univention-s4-position-sync
>+++ b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/univention-s4-position-sync
>@@ -4,7 +4,7 @@
> # Univention S4 Connector
> #  List all rejected objects
> #
>-# Copyright 2004-2014 Univention GmbH
>+# Copyright 2004-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>diff --git a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/univention-s4connector-list-rejected b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/univention-s4connector-list-rejected
>index 7ad9885..34befbd 100755
>--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/univention-s4connector-list-rejected
>+++ b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/univention-s4connector-list-rejected
>@@ -4,7 +4,7 @@
> # Univention S4 Connector
> #  List all rejected objects
> #
>-# Copyright 2004-2014 Univention GmbH
>+# Copyright 2004-2015 Univention GmbH
> #
> # http://www.univention.de/
> #
>-- 
>1.9.1
>
>
>From 4c6786e96a74e313076d2ea959c1d36b169283c3 Mon Sep 17 00:00:00 2001
>Message-Id: <4c6786e96a74e313076d2ea959c1d36b169283c3.1421929142.git.hahn@univention.de>
>In-Reply-To: <f1014b91ab43332f55272c7210e50994009d3a67.1421929142.git.hahn@univention.de>
>References: <f1014b91ab43332f55272c7210e50994009d3a67.1421929142.git.hahn@univention.de>
>From: Philipp Hahn <hahn@univention.de>
>Date: Tue, 6 Jan 2015 08:26:39 +0100
>Subject: [PATCH 2/8] Bug #36532 bind: Speed up network re-config
>Organization: Univention GmbH, Bremen, Germany
>
>1. Listen on all interfaces by default: "named" then dynamically binds
>to all interfaces and allows "rndc reload" to be used on ifupdown
>instead of the slow "restart".
>2. Implement "reload" in /etc/init.d/univention-bind9.
>3. Don't restart bind9 multiple times when backend=ldap.
>4. Fix usage of log_action_[begin|cont|end]msg()
>---
> .../univention-bind/conffiles/etc/bind/named.conf  |  1 +
> .../conffiles/etc/bind/named.conf.proxy            |  1 +
> .../conffiles/etc/bind/named.conf.samba4           |  1 +
> .../univention-bind/conffiles/etc/init.d/bind9     | 25 +++++++++-----
> .../conffiles/etc/network/if-down.d/bind9          | 38 ++++++++++++++++++++++
> .../conffiles/etc/network/if-up.d/bind9            | 38 ++++++++++++++++++++++
> .../services/univention-bind/debian/changelog      |  6 ++++
> .../univention-bind.univention-config-registry     |  8 +++++
> 8 files changed, 110 insertions(+), 8 deletions(-)
> create mode 100755 branches/ucs-4.0/ucs-4.0-0/services/univention-bind/conffiles/etc/network/if-down.d/bind9
> create mode 100755 branches/ucs-4.0/ucs-4.0-0/services/univention-bind/conffiles/etc/network/if-up.d/bind9
>
>diff --git a/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/conffiles/etc/bind/named.conf b/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/conffiles/etc/bind/named.conf
>index 1f9daee..9c71f9d 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/conffiles/etc/bind/named.conf
>+++ b/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/conffiles/etc/bind/named.conf
>@@ -10,6 +10,7 @@ options {
> 	also-notify {
> 		127.0.0.1;
> 	};
>+	listen-on { any; };
> @!@
> val = 'none'
> if configRegistry.is_true('dns/ipv6', True ):
>diff --git a/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/conffiles/etc/bind/named.conf.proxy b/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/conffiles/etc/bind/named.conf.proxy
>index 45e443a..992e06b 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/conffiles/etc/bind/named.conf.proxy
>+++ b/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/conffiles/etc/bind/named.conf.proxy
>@@ -7,6 +7,7 @@ controls{
> };			
> options {
>     directory "/var/cache/bind";
>+	listen-on { any; };
> @!@
> dns_allow_query = configRegistry.get('dns/allow/query')
> dns_allow_query_cache = configRegistry.get('dns/allow/query/cache')
>diff --git a/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/conffiles/etc/bind/named.conf.samba4 b/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/conffiles/etc/bind/named.conf.samba4
>index 1aa5641..37f8834 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/conffiles/etc/bind/named.conf.samba4
>+++ b/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/conffiles/etc/bind/named.conf.samba4
>@@ -6,6 +6,7 @@ controls{
> };			
> options {
>         tkey-gssapi-keytab "/var/lib/samba/private/dns.keytab";
>+	listen-on { any; };
> @!@
> dns_allow_query = configRegistry.get('dns/allow/query')
> dns_allow_query_cache = configRegistry.get('dns/allow/query/cache')
>diff --git a/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/conffiles/etc/init.d/bind9 b/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/conffiles/etc/init.d/bind9
>index 5f75311..5fa8cfa 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/conffiles/etc/init.d/bind9
>+++ b/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/conffiles/etc/init.d/bind9
>@@ -58,7 +58,7 @@ case "$1" in
> 			. "/usr/share/univention-config-registry/init-autostart.lib"
> 			check_autostart univention-bind bind/autostart
> 		fi
>-		log_action_msg "Starting bind9 daemon:"
>+		log_action_begin_msg "Starting bind9 daemon:"
> 		if [ "$dns_backend" = "samba4" ]; then
> 			sv_action up univention-bind-samba4
> 		elif [ "$dns_backend" = "ldap" ]; then
>@@ -68,7 +68,7 @@ case "$1" in
> 		log_action_end_msg 0
> 		;;
> 	stop)
>-		log_action_msg "Stopping bind9 daemon: "
>+		log_action_begin_msg "Stopping bind9 daemon: "
> 		sv_action down univention-bind-proxy
> 		sv_action down univention-bind
> 		sv_action down univention-bind-samba4
>@@ -81,7 +81,7 @@ case "$1" in
> 			check_autostart univention-bind bind/autostart
> 		fi
> 
>-		log_action_msg "Restarting bind9 daemon: "
>+		log_action_begin_msg "Restarting bind9 daemon: "
> 		if [ "$dns_backend" = "samba4" ]; then
> 			sv_action stop univention-bind
> 			sv_action stop univention-bind-proxy
>@@ -105,16 +105,25 @@ case "$1" in
> 				"$0" restart
> 			fi
> 		elif [ "$dns_backend" = "ldap" ]; then
>-			if sv_running univention-bind
>-			then
>-				"$0" restart
>-			fi
>-			if sv_running univention-bind-proxy
>+			if sv_running univention-bind || sv_running univention-bind-proxy
> 			then
> 				"$0" restart
> 			fi
> 		fi
> 		;;
>+	reload)
>+		log_action_begin_msg "Reloading bind9 daemon: "
>+		case "$dns_backend" in
>+		samba4)
>+			log_action_cont_msg "samba4" && rndc -p 953 reload >/dev/null
>+			;;
>+		ldap)
>+			log_action_cont_msg "ldap" && rndc -p 55555 reload >/dev/null
>+			log_action_cont_msg "proxy" && rndc -p 953 reload >/dev/null
>+			;;
>+		esac
>+		log_action_end_msg 0
>+		;;
> 	status)
> 		if	sv status univention-bind-samba4 | grep -qs ^run: ||
> 			sv status univention-bind | grep -qs ^run: ||
>diff --git a/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/conffiles/etc/network/if-down.d/bind9 b/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/conffiles/etc/network/if-down.d/bind9
>new file mode 100755
>index 0000000..d92de6d
>--- /dev/null
>+++ b/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/conffiles/etc/network/if-down.d/bind9
>@@ -0,0 +1,38 @@
>+#!/bin/sh -e
>+@%@UCRWARNING=# @%@
>+#
>+# Copyright 2015 Univention GmbH
>+#
>+# http://www.univention.de/
>+#
>+# All rights reserved.
>+#
>+# The source code of this program is made available
>+# under the terms of the GNU Affero General Public License version 3
>+# (GNU AGPL V3) as published by the Free Software Foundation.
>+#
>+# Binary versions of this program provided by Univention to you as
>+# well as other copyrighted, protected or trademarked materials like
>+# Logos, graphics, fonts, specific documentations and configurations,
>+# cryptographic keys etc. are subject to a license agreement between
>+# you and Univention and not subject to the GNU AGPL V3.
>+#
>+# In the case you use this program under the terms of the GNU AGPL V3,
>+# the program is provided in the hope that it will be useful,
>+# but WITHOUT ANY WARRANTY; without even the implied warranty of
>+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
>+# GNU Affero General Public License for more details.
>+#
>+# You should have received a copy of the GNU Affero General Public
>+# License with the Debian GNU/Linux or Univention distribution in file
>+# /usr/share/common-licenses/AGPL-3; if not, see
>+# <http://www.gnu.org/licenses/>.
>+#
>+
>+[ -x /usr/sbin/rndc ] || exit 0
>+[ -e /etc/init.d/univention-bind9 ] || exit 0
>+
>+# Always reload, even for loopback
>+invoke-rc.d univention-bind9 reload
>+
>+exit 0
>diff --git a/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/conffiles/etc/network/if-up.d/bind9 b/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/conffiles/etc/network/if-up.d/bind9
>new file mode 100755
>index 0000000..fc34263
>--- /dev/null
>+++ b/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/conffiles/etc/network/if-up.d/bind9
>@@ -0,0 +1,38 @@
>+#!/bin/sh -e
>+@%@UCRWARNING=# @%@
>+#
>+# Copyright 2015 Univention GmbH
>+#
>+# http://www.univention.de/
>+#
>+# All rights reserved.
>+#
>+# The source code of this program is made available
>+# under the terms of the GNU Affero General Public License version 3
>+# (GNU AGPL V3) as published by the Free Software Foundation.
>+#
>+# Binary versions of this program provided by Univention to you as
>+# well as other copyrighted, protected or trademarked materials like
>+# Logos, graphics, fonts, specific documentations and configurations,
>+# cryptographic keys etc. are subject to a license agreement between
>+# you and Univention and not subject to the GNU AGPL V3.
>+#
>+# In the case you use this program under the terms of the GNU AGPL V3,
>+# the program is provided in the hope that it will be useful,
>+# but WITHOUT ANY WARRANTY; without even the implied warranty of
>+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
>+# GNU Affero General Public License for more details.
>+#
>+# You should have received a copy of the GNU Affero General Public
>+# License with the Debian GNU/Linux or Univention distribution in file
>+# /usr/share/common-licenses/AGPL-3; if not, see
>+# <http://www.gnu.org/licenses/>.
>+#
>+
>+[ -d /usr/sbin ] || exit 0
>+[ -x /etc/init.d/univention-bind9 ] || exit 0
>+
>+# Always reload, even for loopback
>+invoke-rc.d univention-bind9 reload
>+
>+exit 0
>diff --git a/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/debian/changelog b/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/debian/changelog
>index f850417..038ff74 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/debian/changelog
>+++ b/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/debian/changelog
>@@ -1,3 +1,9 @@
>+univention-bind (9.0.5-1) unstable; urgency=low
>+
>+  * Bug #36532: Improve restart of bind9 on network reconfiguration
>+
>+ -- Philipp Hahn <hahn@univention.de>  Thu, 22 Jan 2015 09:21:43 +0100
>+
> univention-bind (9.0.4-1) unstable; urgency=low
> 
>   * If no dns/forwarder is set, use the nameserver variables as forwarder
>diff --git a/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/debian/univention-bind.univention-config-registry b/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/debian/univention-bind.univention-config-registry
>index 43bb55c..a08fcce 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/debian/univention-bind.univention-config-registry
>+++ b/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/debian/univention-bind.univention-config-registry
>@@ -37,3 +37,11 @@ Variables: dns/dlz/debug/level
> Type: file
> Mode: 755
> File: etc/init.d/bind9
>+
>+Type: file
>+Mode: 755
>+File: etc/network/if-up.d/bind9
>+
>+Type: file
>+Mode: 755
>+File: etc/network/if-down.d/bind9
>-- 
>1.9.1
>
>
>From 5c925f82bbb962a9b87e8501c2b8d98f65bbf93b Mon Sep 17 00:00:00 2001
>Message-Id: <5c925f82bbb962a9b87e8501c2b8d98f65bbf93b.1421929143.git.hahn@univention.de>
>In-Reply-To: <f1014b91ab43332f55272c7210e50994009d3a67.1421929142.git.hahn@univention.de>
>References: <f1014b91ab43332f55272c7210e50994009d3a67.1421929142.git.hahn@univention.de>
>From: Philipp Hahn <hahn@univention.de>
>Date: Tue, 6 Jan 2015 08:26:39 +0100
>Subject: [PATCH 3/8] Bug #36532 s4c,listener,notifier,net: Skip interfaces
>Organization: Univention GmbH, Bremen, Germany
>
>1. Check $METHOD=loopback instead of $IFACE=lo to be name agnostic.
>2. Check $ADDRFAM=meta instead of $IFACE=all (which is wrong, since it
>would be --all)
>3.  Add missing calls to ucs_ignore_interface()
>---
> .../base/univention-network-manager/etc/network/if-down.d/15_nscd   | 3 +++
> .../etc/network/if-up.d/12_univention_config_registry               | 2 +-
> .../base/univention-network-manager/etc/network/ucs-network-tools   | 4 ++--
> .../management/univention-directory-listener/debian/changelog       | 6 ++++++
> .../etc/network/if-post-down.d/univention-directory-listener        | 3 +++
> .../management/univention-directory-notifier/debian/changelog       | 6 ++++++
> .../etc/network/if-post-down.d/univention-directory-notifier        | 3 +++
> .../ucs-4.0-0/services/univention-s4-connector/debian/changelog     | 6 ++++++
> .../etc/network/if-post-down.d/univention-s4-connector              | 3 +++
> 9 files changed, 33 insertions(+), 3 deletions(-)
>
>diff --git a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-down.d/15_nscd b/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-down.d/15_nscd
>index a711459..67c4f61 100755
>--- a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-down.d/15_nscd
>+++ b/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-down.d/15_nscd
>@@ -32,6 +32,9 @@
> 
> [ ! -f /var/run/nscd/nscd.pid ] && exit 0
> 
>+. /etc/network/ucs-network-tools
>+ucs_ignore_interface
>+
> if [ -x /etc/init.d/nscd ]; then
> 	/etc/init.d/nscd restart
> 	nscd -i passwd
>diff --git a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/12_univention_config_registry b/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/12_univention_config_registry
>index 5dd3020..2864f08 100755
>--- a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/12_univention_config_registry
>+++ b/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/12_univention_config_registry
>@@ -41,7 +41,7 @@ configRegistry.load()
> iface = os.environ.get('IFACE')
> 
> # ignore lo and all
>-if iface in ['lo', 'all']:
>+if os.environ.get('METHOD') == 'loopback' or os.environ.get('ADDRFAM') == 'meta':
> 	sys.exit(0)
> 
> # is interface configured as DHCP?
>diff --git a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/ucs-network-tools b/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/ucs-network-tools
>index dbb5a41..f28b306 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/ucs-network-tools
>+++ b/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/ucs-network-tools
>@@ -31,8 +31,8 @@
> # <http://www.gnu.org/licenses/>.
> 
> ucs_ignore_interface () {
>-	case "${IFACE:-}" in
>-	lo|--all) exit 0 ;;
>+	case "${METHOD:-}" in
>+	loopback) exit 0 ;;
> 	esac
> 	case "${ADDRFAM:-}" in
> 	meta) exit 0 ;;
>diff --git a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/debian/changelog b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/debian/changelog
>index 62d2f7d..9c2bf1f 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/debian/changelog
>+++ b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/debian/changelog
>@@ -1,3 +1,9 @@
>+univention-directory-listener (9.0.3-1) unstable; urgency=low
>+
>+  * Bug #36532: Speed up network re-config
>+
>+ -- Philipp Hahn <hahn@univention.de>  Thu, 22 Jan 2015 11:23:42 +0100
>+
> univention-directory-listener (9.0.2-1) unstable; urgency=medium
> 
>   * Do atomic locking on the cache (Bug #34013)
>diff --git a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/etc/network/if-post-down.d/univention-directory-listener b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/etc/network/if-post-down.d/univention-directory-listener
>index 8be4ff9..a8ebf13 100755
>--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/etc/network/if-post-down.d/univention-directory-listener
>+++ b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/etc/network/if-post-down.d/univention-directory-listener
>@@ -30,6 +30,9 @@
> # /usr/share/common-licenses/AGPL-3; if not, see
> # <http://www.gnu.org/licenses/>.
> 
>+. /etc/network/ucs-network-tools
>+ucs_ignore_interface
>+
> if [ -x /etc/init.d/univention-directory-listener ]; then
> 	/etc/init.d/univention-directory-listener crestart
> fi
>diff --git a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/debian/changelog b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/debian/changelog
>index 3807c20..b52ce5f 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/debian/changelog
>+++ b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/debian/changelog
>@@ -1,3 +1,9 @@
>+univention-directory-notifier (9.0.4-1) unstable; urgency=low
>+
>+  * Bug #36532: Speed up network re-config
>+
>+ -- Philipp Hahn <hahn@univention.de>  Thu, 22 Jan 2015 11:24:47 +0100
>+
> univention-directory-notifier (9.0.3-1) unstable; urgency=medium
> 
>   * Wait for the notifier start in 15univention-directory-notifier-
>diff --git a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/etc/network/if-post-down.d/univention-directory-notifier b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/etc/network/if-post-down.d/univention-directory-notifier
>index 182e4b7..8f3593d 100755
>--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/etc/network/if-post-down.d/univention-directory-notifier
>+++ b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/etc/network/if-post-down.d/univention-directory-notifier
>@@ -30,6 +30,9 @@
> # /usr/share/common-licenses/AGPL-3; if not, see
> # <http://www.gnu.org/licenses/>.
> 
>+. /etc/network/ucs-network-tools
>+ucs_ignore_interface
>+
> if [ -x /etc/init.d/univention-directory-notifier ]; then
> 	/etc/init.d/univention-directory-notifier crestart
> fi
>diff --git a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/debian/changelog b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/debian/changelog
>index 902ef79..08845fe 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/debian/changelog
>+++ b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/debian/changelog
>@@ -1,3 +1,9 @@
>+univention-s4-connector (9.0.16-11) unstable; urgency=low
>+
>+  * Bug #36532: Speed up network re-config
>+
>+ -- Philipp Hahn <hahn@univention.de>  Thu, 22 Jan 2015 11:26:43 +0100
>+
> univention-s4-connector (9.0.16-10) unstable; urgency=medium
> 
>   * Bug #33110: Cleanup S4 LDAP base lookup code
>diff --git a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/etc/network/if-post-down.d/univention-s4-connector b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/etc/network/if-post-down.d/univention-s4-connector
>index 68650ac..a49450d 100755
>--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/etc/network/if-post-down.d/univention-s4-connector
>+++ b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/etc/network/if-post-down.d/univention-s4-connector
>@@ -30,6 +30,9 @@
> # /usr/share/common-licenses/AGPL-3; if not, see
> # <http://www.gnu.org/licenses/>.
> 
>+. /etc/network/ucs-network-tools
>+ucs_ignore_interface
>+
> if [ -x /etc/init.d/univention-s4-connector ]; then
> 	/etc/init.d/univention-s4-connector crestart
> fi
>-- 
>1.9.1
>
>
>From 8a0c035df4d3f2337b4642155813779f2b16393b Mon Sep 17 00:00:00 2001
>Message-Id: <8a0c035df4d3f2337b4642155813779f2b16393b.1421929143.git.hahn@univention.de>
>In-Reply-To: <f1014b91ab43332f55272c7210e50994009d3a67.1421929142.git.hahn@univention.de>
>References: <f1014b91ab43332f55272c7210e50994009d3a67.1421929142.git.hahn@univention.de>
>From: Philipp Hahn <hahn@univention.de>
>Date: Tue, 6 Jan 2015 08:26:39 +0100
>Subject: [PATCH 4/8] Bug #36532 net: Skip ntpd restart
>Organization: Univention GmbH, Bremen, Germany
>
>Don't stop ntpd as ntpd monitors interface changes all 5 minutes.
>---
> .../debian/univention-network-common.maintscript   |  1 +
> .../etc/network/if-down.d/00_rdate                 | 38 ----------------------
> .../etc/network/if-up.d/05_rdate                   |  2 --
> 3 files changed, 1 insertion(+), 40 deletions(-)
> create mode 100644 branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/debian/univention-network-common.maintscript
> delete mode 100755 branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-down.d/00_rdate
>
>diff --git a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/debian/univention-network-common.maintscript b/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/debian/univention-network-common.maintscript
>new file mode 100644
>index 0000000..782533e
>--- /dev/null
>+++ b/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/debian/univention-network-common.maintscript
>@@ -0,0 +1 @@
>+rm_conffile etc/network/if-down.d/00_rdate 6.0.0-2~
>diff --git a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-down.d/00_rdate b/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-down.d/00_rdate
>deleted file mode 100755
>index eced777..0000000
>--- a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-down.d/00_rdate
>+++ /dev/null
>@@ -1,38 +0,0 @@
>-#!/bin/sh
>-#
>-# Univention Server
>-#  network script: fix time
>-#  the network link is down
>-#
>-# Copyright 2008-2015 Univention GmbH
>-#
>-# http://www.univention.de/
>-#
>-# All rights reserved.
>-#
>-# The source code of this program is made available
>-# under the terms of the GNU Affero General Public License version 3
>-# (GNU AGPL V3) as published by the Free Software Foundation.
>-#
>-# Binary versions of this program provided by Univention to you as
>-# well as other copyrighted, protected or trademarked materials like
>-# Logos, graphics, fonts, specific documentations and configurations,
>-# cryptographic keys etc. are subject to a license agreement between
>-# you and Univention and not subject to the GNU AGPL V3.
>-#
>-# In the case you use this program under the terms of the GNU AGPL V3,
>-# the program is provided in the hope that it will be useful,
>-# but WITHOUT ANY WARRANTY; without even the implied warranty of
>-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
>-# GNU Affero General Public License for more details.
>-#
>-# You should have received a copy of the GNU Affero General Public
>-# License with the Debian GNU/Linux or Univention distribution in file
>-# /usr/share/common-licenses/AGPL-3; if not, see
>-# <http://www.gnu.org/licenses/>.
>-
>-[ ! -f /var/run/ntpd.pid ] && exit 0
>-
>-/etc/init.d/ntp stop
>-
>-exit 0
>diff --git a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/05_rdate b/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/05_rdate
>index 27cf5f6..6f725a5 100755
>--- a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/05_rdate
>+++ b/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/05_rdate
>@@ -38,6 +38,4 @@ ucs_ignore_interface
> 
> /etc/init.d/rdate start
> 
>-/etc/init.d/ntp start
>-
> exit 0
>-- 
>1.9.1
>
>
>From 6ffe1073917b4d57a29da9b6fe884c530fa23b10 Mon Sep 17 00:00:00 2001
>Message-Id: <6ffe1073917b4d57a29da9b6fe884c530fa23b10.1421929143.git.hahn@univention.de>
>In-Reply-To: <f1014b91ab43332f55272c7210e50994009d3a67.1421929142.git.hahn@univention.de>
>References: <f1014b91ab43332f55272c7210e50994009d3a67.1421929142.git.hahn@univention.de>
>From: Philipp Hahn <hahn@univention.de>
>Date: Tue, 6 Jan 2015 08:26:39 +0100
>Subject: [PATCH 5/8] Bug #36532 net: Speed up UCR re-config
>Organization: Univention GmbH, Bremen, Germany
>
>Rewrite if-up.d/12_univention_config_registry to use ucr_update()
>instead of doing multiple calls of handle_[un]set()"
>---
> .../network/if-up.d/12_univention_config_registry  | 54 +++++++++-------------
> 1 file changed, 21 insertions(+), 33 deletions(-)
>
>diff --git a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/12_univention_config_registry b/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/12_univention_config_registry
>index 2864f08..3f15996 100755
>--- a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/12_univention_config_registry
>+++ b/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/12_univention_config_registry
>@@ -33,69 +33,57 @@
> import sys, os, ipaddr, netifaces
> import socket, struct
> 
>-import univention.config_registry
>-
>-configRegistry = univention.config_registry.ConfigRegistry()
>-configRegistry.load()
>-
>-iface = os.environ.get('IFACE')
>+from univention.config_registry.frontend import ConfigRegistry, ucr_update
> 
> # ignore lo and all
> if os.environ.get('METHOD') == 'loopback' or os.environ.get('ADDRFAM') == 'meta':
> 	sys.exit(0)
> 
> # is interface configured as DHCP?
>+iface = os.environ.get('IFACE')
>+configRegistry = ConfigRegistry()
>+configRegistry.load()
> if configRegistry.get('interfaces/%s/type' % iface) != 'dhcp':
> 	sys.exit(0)
> 
> # get first AF_INET interface
> inf = netifaces.ifaddresses(iface).get(netifaces.AF_INET)[0]
>-
>-ip = ipaddr.IPv4Network('%s/%s' % ( inf.get('addr'), inf.get('netmask') ) )
>+try:
>+	newip = inf.get('addr')
>+	ip = ipaddr.IPv4Network('%(addr)s/%(netmask)s' % inf)
>+except KeyError:
>+	sys.exit(0)
>+inf['address'] = newip
> inf['network'] = ip.network
> 
>-# make the key equal to UCR
>-inf['address'] = inf.get('addr')
>-
> # save to UCR
>-ucr_set = []
>+ucr_set = {
>+	'interfaces/restart/auto': configRegistry.get('interfaces/restart/auto'),
>+}
> for k in ['netmask', 'address', 'broadcast', 'network']:
>-	if inf.get(k):
>-		ucr_set.append('interfaces/%s/%s=%s' % (iface, k, inf.get(k)))
>-	else:
>-		ucr_set.append('interfaces/%s/%s' % (iface, k))
>+	ucr_set['interfaces/%s/%s' % (iface, k)] = inf.get(k, None)
> 
> # if old IP adress was set as nameserver, replace it with the new address
> oldip = configRegistry.get('interfaces/%s/address' % iface)
> if oldip:
> 	for k in ['nameserver1', 'nameserver2', 'nameserver3']:
> 		if oldip == configRegistry.get(k):
>-			ucr_set.append('%s=%s' % (k, inf.get('address')))
>+			ucr_set[k] = newip
> 
> # read gateway from proc
>-gateway=''
>+gateway = ''
> with open("/proc/net/route") as fh:
> 	for line in fh:
> 		fields = line.strip().split()
> 		if fields[1] != '00000000' or not int(fields[3], 16) & 2:
> 			continue
>-		gateway=socket.inet_ntoa(struct.pack("<L", int(fields[2], 16)))
>+		gateway = socket.inet_ntoa(struct.pack("<L", int(fields[2], 16)))
> # write to UCR
> if configRegistry.get('gateway') != gateway:
>-	ucr_set.append('gateway=%s' % gateway)
>+	ucr_set['gateway'] = gateway
> 
> # Redirect stdout
>-null = open(os.path.devnull, 'w' )
>-stdout = sys.stdout
>-sys.stdout = null
>-
>+sys.stdout = open(os.path.devnull, 'w')
> # Disable ifdown / ifup while setting new UCR variables to avoid an endless loop
>-restart = configRegistry.get('interfaces/restart/auto', 'true')
>-univention.config_registry.handler_set(['interfaces/restart/auto=false'], quiet=True)
>-univention.config_registry.handler_set(ucr_set, quiet=True)
>-univention.config_registry.handler_set(['interfaces/restart/auto=%s' % restart], quiet=True)
>-
>-sys.stdout = stdout
>-
>-sys.exit(0)
>-
>+ucr_update({'interfaces/restart/auto': 'false'})
>+ucr_update(ucr_set)
>-- 
>1.9.1
>
>
>From ef61e6757a8a5cb99c606eccb9e0edb819b25cd5 Mon Sep 17 00:00:00 2001
>Message-Id: <ef61e6757a8a5cb99c606eccb9e0edb819b25cd5.1421929143.git.hahn@univention.de>
>In-Reply-To: <f1014b91ab43332f55272c7210e50994009d3a67.1421929142.git.hahn@univention.de>
>References: <f1014b91ab43332f55272c7210e50994009d3a67.1421929142.git.hahn@univention.de>
>From: Philipp Hahn <hahn@univention.de>
>Date: Tue, 6 Jan 2015 08:26:39 +0100
>Subject: [PATCH 6/8] Bug #36532 net: Speed up DNS config
>Organization: Univention GmbH, Bremen, Germany
>
>1. Use fast bind9 reload instead of slow restart to just reload the
>configuration files.
>2. Rewrite if-up.d/00_resolvconf to use less useless shell pipes.
>---
> .../base/univention-network-manager/debian/control       |  2 ++
> .../etc/network/if-up.d/00_resolvconf                    | 16 ++++++----------
> 2 files changed, 8 insertions(+), 10 deletions(-)
>
>diff --git a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/debian/control b/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/debian/control
>index f8a1cb0..52aa473 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/debian/control
>+++ b/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/debian/control
>@@ -51,6 +51,8 @@ Replaces: univention-network-manager,
>  univention-ifplugd
> Suggests:
>  univention-management-console-server
>+Breaks:
>+ univention-bind (<< 9.0.5-1),
> Description: UCS - Network tools for ifplugd and network-manager (common)
>  This package installs tools required by univention-ifplugd and
>  univention-network-manager.
>diff --git a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/00_resolvconf b/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/00_resolvconf
>index 1740914..ab7ae56 100755
>--- a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/00_resolvconf
>+++ b/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/00_resolvconf
>@@ -77,7 +77,7 @@ then
> 		fi
> 		i=$((i+1))
> 	done </etc/resolv.conf
>-	"$need_restart" && invoke-rc.d bind9 restart
>+	"$need_restart" && invoke-rc.d bind9 reload
> 	ucr commit /etc/resolv.conf
> elif [ "$interface_type" = "dhcp" ]; then
> 	# Add the local configured nameserver to the resolv.conf
>@@ -85,8 +85,9 @@ elif [ "$interface_type" = "dhcp" ]; then
> 	# The given nameserver via DHCP should be the default nameserver, so split the 
> 	# current resolv.conf
> 	tempdir=$(mktemp -d)
>-	cat /etc/resolv.conf | grep -v ^nameserver >"${tempdir}/resolv.conf"
>-	cat /etc/resolv.conf | grep ^nameserver >"${tempdir}/nameserver_dhcp"
>+	trap "rm -rf '$tempdir'" EXIT
>+	grep -v ^nameserver /etc/resolv.conf >"${tempdir}/resolv.conf"
>+	grep ^nameserver /etc/resolv.conf >"${tempdir}/nameserver_dhcp"
> 	touch "${tempdir}/nameserver_local"
> 	for i in $(seq 1 3); do
> 		dns="nameserver$i"
>@@ -99,18 +100,13 @@ elif [ "$interface_type" = "dhcp" ]; then
> 	done
> 
> 	# Build resolv.conf
>-	cat "${tempdir}/resolv.conf" >/etc/resolv.conf
>-	cat "${tempdir}/nameserver_local" >>/etc/resolv.conf
>+	cat "${tempdir}/resolv.conf" "${tempdir}/nameserver_local" >/etc/resolv.conf
> 	# Don't add the DHCP nameservers twice
>-	cat "${tempdir}/nameserver_dhcp" | grep ^nameserver | awk '{print $2}' | while read ns; do
>+	awk '/^nameserver/{print $2}' <"${tempdir}/nameserver_dhcp" | while read ns; do
> 			if ! grep -q -s "nameserver *${ns}\$" /etc/resolv.conf; then
> 				echo "nameserver $ns" >>/etc/resolv.conf
> 			fi
> 	done
>-
>-	# remove tempdir
>-	rm -f "${tempdir}/resolv.conf" "${tempdir}/nameserver_local" "${tempdir}/nameserver_dhcp"
>-	rmdir "${tempdir}"
> fi
> 
> exit 0
>-- 
>1.9.1
>
>
>From a3eca4a12a1d4fa80d72be0d86e4a03eee8bfeff Mon Sep 17 00:00:00 2001
>Message-Id: <a3eca4a12a1d4fa80d72be0d86e4a03eee8bfeff.1421929143.git.hahn@univention.de>
>In-Reply-To: <f1014b91ab43332f55272c7210e50994009d3a67.1421929142.git.hahn@univention.de>
>References: <f1014b91ab43332f55272c7210e50994009d3a67.1421929142.git.hahn@univention.de>
>From: Philipp Hahn <hahn@univention.de>
>Date: Tue, 6 Jan 2015 08:26:39 +0100
>Subject: [PATCH 7/8] Bug #36532: Speed up if-*.d scripts
>Organization: Univention GmbH, Bremen, Germany
>
>Re-organize if-*.d/ scripts to run simple tests first.
>---
> .../etc/network/if-down.d/15_nscd                           | 11 +++++------
> .../etc/network/if-pre-up.d/10_dhclientconf                 |  6 +++---
> .../etc/network/if-up.d/00_resolvconf                       |  8 +++++---
> .../univention-network-manager/etc/network/if-up.d/05_rdate |  6 +++---
> .../univention-network-manager/etc/network/if-up.d/15_nscd  | 13 ++++++-------
> .../univention-network-manager/etc/network/if-up.d/20_mount |  6 +++---
> .../etc/network/if-up.d/30_univention-directory-policy      |  2 ++
> .../etc/network/if-up.d/90_dns_update                       |  9 +++------
> .../network/if-post-down.d/univention-directory-listener    |  4 ++--
> .../network/if-post-down.d/univention-directory-notifier    |  4 ++--
> .../etc/network/if-post-down.d/univention-s4-connector      |  6 +++---
> 11 files changed, 37 insertions(+), 38 deletions(-)
>
>diff --git a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-down.d/15_nscd b/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-down.d/15_nscd
>index 67c4f61..990e5a7 100755
>--- a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-down.d/15_nscd
>+++ b/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-down.d/15_nscd
>@@ -30,15 +30,14 @@
> # /usr/share/common-licenses/AGPL-3; if not, see
> # <http://www.gnu.org/licenses/>.
> 
>-[ ! -f /var/run/nscd/nscd.pid ] && exit 0
>+[ -x /etc/init.d/nscd ] || exit 0
>+[ -f /var/run/nscd/nscd.pid ] || exit 0
> 
> . /etc/network/ucs-network-tools
> ucs_ignore_interface
> 
>-if [ -x /etc/init.d/nscd ]; then
>-	/etc/init.d/nscd restart
>-	nscd -i passwd
>-	nscd -i group
>-fi
>+invoke-rc.d nscd restart
>+nscd -i passwd
>+nscd -i group
> 
> exit 0
>diff --git a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-pre-up.d/10_dhclientconf b/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-pre-up.d/10_dhclientconf
>index 0740354..20dc636 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-pre-up.d/10_dhclientconf
>+++ b/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-pre-up.d/10_dhclientconf
>@@ -30,11 +30,11 @@
> # /usr/share/common-licenses/AGPL-3; if not, see
> # <http://www.gnu.org/licenses/>.
> 
>+[ -e /etc/dhcp/dhclient.conf ] || exit 0
>+
> . /etc/network/ucs-network-tools
> ucs_ignore_interface
> 
>-if [ -e /etc/dhcp/dhclient.conf ]; then
>-	/usr/sbin/ucr commit /etc/dhcp/dhclient.conf
>-fi
>+ucr commit /etc/dhcp/dhclient.conf
> 
> exit 0
>diff --git a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/00_resolvconf b/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/00_resolvconf
>index ab7ae56..aed3116 100755
>--- a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/00_resolvconf
>+++ b/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/00_resolvconf
>@@ -42,7 +42,10 @@ then
> 	echo "options timeout:$nameserver_option_timeout" >> /etc/resolv.conf
> fi
> 
>-interface_type="$(ucr get interfaces/${IFACE}/type)"
>+case "$(ucr get interfaces/${IFACE}/type)" in
>+dhcp) ;;
>+*) exit 0 ;;
>+esac
> 
> is_ns ()
> {
>@@ -62,7 +65,6 @@ is_ns ()
> # must not be set to true
> if	[ -e /var/univention-join/joined ] && is_domain_controller && \
> 	[ -n "$nameserver1" -o -n "$nameserver2" -o -n "$nameserver3" ] && \
>-	[ "$interface_type" = "dhcp" ] && \
> 	! is_ucr_true "nameserver/external"
> then
> 	need_restart=false
>@@ -79,7 +81,7 @@ then
> 	done </etc/resolv.conf
> 	"$need_restart" && invoke-rc.d bind9 reload
> 	ucr commit /etc/resolv.conf
>-elif [ "$interface_type" = "dhcp" ]; then
>+else
> 	# Add the local configured nameserver to the resolv.conf
> 	
> 	# The given nameserver via DHCP should be the default nameserver, so split the 
>diff --git a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/05_rdate b/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/05_rdate
>index 6f725a5..f3a4f14 100755
>--- a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/05_rdate
>+++ b/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/05_rdate
>@@ -31,11 +31,11 @@
> # /usr/share/common-licenses/AGPL-3; if not, see
> # <http://www.gnu.org/licenses/>.
> 
>+[ -f /var/run/ntpd.pid ] && exit 0
>+
> . /etc/network/ucs-network-tools
> ucs_ignore_interface
> 
>-[ -f /var/run/ntpd.pid ] && exit 0
>-
>-/etc/init.d/rdate start
>+invoke-rc.d rdate start
> 
> exit 0
>diff --git a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/15_nscd b/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/15_nscd
>index 331abe1..1c97937 100755
>--- a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/15_nscd
>+++ b/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/15_nscd
>@@ -30,15 +30,14 @@
> # /usr/share/common-licenses/AGPL-3; if not, see
> # <http://www.gnu.org/licenses/>.
> 
>+[ -x /etc/init.d/nscd ] || exit 0
>+[ -f /var/run/nscd/nscd.pid ] || exit 0
>+
> . /etc/network/ucs-network-tools
> ucs_ignore_interface
> 
>-[ ! -f /var/run/nscd/nscd.pid ] && exit 0
>-
>-if [ -x /etc/init.d/nscd ]; then
>-	/etc/init.d/nscd restart
>-	nscd -i passwd
>-	nscd -i group
>-fi
>+invoke-rc.d nscd restart
>+nscd -i passwd
>+nscd -i group
> 
> exit 0
>diff --git a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/20_mount b/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/20_mount
>index 2bf1545..ff620b1 100755
>--- a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/20_mount
>+++ b/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/20_mount
>@@ -34,9 +34,9 @@
> . /etc/network/ucs-network-tools
> ucs_ignore_interface
> 
>-eval "$(univention-config-registry shell networkmanager/action/mount)"
>-[ "$networkmanager_action_mount" = "yes" -o "$networkmanager_action_mount" = "true" ] ||  exit 0
>+. /usr/share/univention-lib/ucr.sh
>+is_ucr_true networkmanager/action/mount || exit 0
> 
>-[ -x /bin/mount ] && /bin/mount -a
>+mount -a
> 
> exit 0
>diff --git a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/30_univention-directory-policy b/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/30_univention-directory-policy
>index dcd1a3f..63d19ae 100755
>--- a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/30_univention-directory-policy
>+++ b/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/30_univention-directory-policy
>@@ -30,6 +30,8 @@
> # /usr/share/common-licenses/AGPL-3; if not, see
> # <http://www.gnu.org/licenses/>.
> 
>+[ -x /etc/init.d/univention-directory-policy ] || exit 0
>+
> . /etc/network/ucs-network-tools
> ucs_ignore_interface
> 
>diff --git a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/90_dns_update b/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/90_dns_update
>index 8357271..eead7dc 100755
>--- a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/90_dns_update
>+++ b/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/90_dns_update
>@@ -31,18 +31,15 @@
> # <http://www.gnu.org/licenses/>.
> #
> 
>+[ -e /var/univention-join/joined ] || exit 0
>+
> . /etc/network/ucs-network-tools
> ucs_ignore_interface
> 
> eval "$(ucr shell server/role ldap/master)"
> 
>-# System must be joined
>-if [ ! -e /var/univention-join/joined ]; then
>-	exit 0
>-fi
>-
> # Is master available?
>-if /bin/netcat -q0 -w1 $ldap_master 6670 </dev/null; then
>+if /bin/netcat -q0 -w1 "$ldap_master" 6670 </dev/null; then
> 
> 	# If we are the master a restart of UMC is required
> 	if [ "$server_role" = "domaincontroller_master" ]; then
>diff --git a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/etc/network/if-post-down.d/univention-directory-listener b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/etc/network/if-post-down.d/univention-directory-listener
>index a8ebf13..bc6531f 100755
>--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/etc/network/if-post-down.d/univention-directory-listener
>+++ b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/etc/network/if-post-down.d/univention-directory-listener
>@@ -30,11 +30,11 @@
> # /usr/share/common-licenses/AGPL-3; if not, see
> # <http://www.gnu.org/licenses/>.
> 
>+[ -x /etc/init.d/univention-directory-listener ] || exit 0
>+
> . /etc/network/ucs-network-tools
> ucs_ignore_interface
> 
>-if [ -x /etc/init.d/univention-directory-listener ]; then
> 	/etc/init.d/univention-directory-listener crestart
>-fi
> 
> exit 0
>diff --git a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/etc/network/if-post-down.d/univention-directory-notifier b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/etc/network/if-post-down.d/univention-directory-notifier
>index 8f3593d..6f368c8 100755
>--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/etc/network/if-post-down.d/univention-directory-notifier
>+++ b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/etc/network/if-post-down.d/univention-directory-notifier
>@@ -30,11 +30,11 @@
> # /usr/share/common-licenses/AGPL-3; if not, see
> # <http://www.gnu.org/licenses/>.
> 
>+[ -x /etc/init.d/univention-directory-notifier ] || exit 0
>+
> . /etc/network/ucs-network-tools
> ucs_ignore_interface
> 
>-if [ -x /etc/init.d/univention-directory-notifier ]; then
> 	/etc/init.d/univention-directory-notifier crestart
>-fi
> 
> exit 0
>diff --git a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/etc/network/if-post-down.d/univention-s4-connector b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/etc/network/if-post-down.d/univention-s4-connector
>index a49450d..588d44c 100755
>--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/etc/network/if-post-down.d/univention-s4-connector
>+++ b/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/etc/network/if-post-down.d/univention-s4-connector
>@@ -30,11 +30,11 @@
> # /usr/share/common-licenses/AGPL-3; if not, see
> # <http://www.gnu.org/licenses/>.
> 
>+[ -x /etc/init.d/univention-s4-connector ] || exit 0
>+
> . /etc/network/ucs-network-tools
> ucs_ignore_interface
> 
>-if [ -x /etc/init.d/univention-s4-connector ]; then
>-	/etc/init.d/univention-s4-connector crestart
>-fi
>+invoke-rc.d univention-s4-connector crestart
> 
> exit 0
>-- 
>1.9.1
>
>
>From 2edc86dbe16ccd1f202f1e8437953022d6e2bae0 Mon Sep 17 00:00:00 2001
>Message-Id: <2edc86dbe16ccd1f202f1e8437953022d6e2bae0.1421929143.git.hahn@univention.de>
>In-Reply-To: <f1014b91ab43332f55272c7210e50994009d3a67.1421929142.git.hahn@univention.de>
>References: <f1014b91ab43332f55272c7210e50994009d3a67.1421929142.git.hahn@univention.de>
>From: Philipp Hahn <hahn@univention.de>
>Date: Thu, 22 Jan 2015 11:46:51 +0100
>Subject: [PATCH 8/8] Bug #36532: Restart listener/notifier asynchronously
>Organization: Univention GmbH, Bremen, Germany
>
>Use "sv t" to let runsv restart the services in the background, as this
>happens multiple times for each upped/downed interface.
>---
> .../etc/network/if-post-down.d/univention-directory-listener            | 2 +-
> .../etc/network/if-post-down.d/univention-directory-notifier            | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/etc/network/if-post-down.d/univention-directory-listener b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/etc/network/if-post-down.d/univention-directory-listener
>index bc6531f..d95ebe7 100755
>--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/etc/network/if-post-down.d/univention-directory-listener
>+++ b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/etc/network/if-post-down.d/univention-directory-listener
>@@ -35,6 +35,6 @@
> . /etc/network/ucs-network-tools
> ucs_ignore_interface
> 
>-	/etc/init.d/univention-directory-listener crestart
>+sv t univention-directory-listener
> 
> exit 0
>diff --git a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/etc/network/if-post-down.d/univention-directory-notifier b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/etc/network/if-post-down.d/univention-directory-notifier
>index 6f368c8..06945d0 100755
>--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/etc/network/if-post-down.d/univention-directory-notifier
>+++ b/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/etc/network/if-post-down.d/univention-directory-notifier
>@@ -35,6 +35,6 @@
> . /etc/network/ucs-network-tools
> ucs_ignore_interface
> 
>-	/etc/init.d/univention-directory-notifier crestart
>+sv t univention-directory-notifier
> 
> exit 0
>-- 
>1.9.1
>

Actions: View | Diff

Attachments on bug 36532: 6625 | 6626 | 6996