@@ -, +, @@
=?UTF-8?q?et:=20=C2=A9=202015?=
---
.../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(-)
--- a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/debian/copyright
+++ a/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/
--- a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/debian/rules
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/debian/univention-ifplugd.postinst
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/debian/univention-ifplugd.preinst
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/debian/univention-network-common.init
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/debian/univention-network-common.postinst
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/debian/univention-network-manager.postinst
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/debian/univention-network-manager.postrm
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/debian/univention-network-manager.preinst
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/dhcp/dhclient-exit-hooks.d/resolvconf
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-down.d/00_rdate
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-down.d/15_nscd
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-pre-up.d/10_dhclientconf
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/00_resolvconf
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/05_rdate
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/12_univention_config_registry
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/15_nscd
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/20_mount
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/30_univention-directory-policy
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/90_dns_update
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/ucs-network-tools
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/univention-ifplugd-enter-hook
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/univention-register-network-address
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/03univention-directory-listener.inst
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/conffiles/etc/runit/univention-directory-listener/run
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/debian/copyright
+++ a/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/
--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/debian/rules
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/debian/univention-directory-listener.init
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/debian/univention-directory-listener.postinst
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/debian/univention-directory-listener.postrm
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/doc/univention-directory-listener-ctrl.8
+++ a/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
--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/doc/univention-directory-listener-dump.8
+++ a/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
--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/doc/univention-directory-listener-verify.8
+++ a/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
--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/doc/univention-directory-listener.8
+++ a/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
--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/etc/network/if-post-down.d/univention-directory-listener
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/python/get_notifier_id.py
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/python/ldap_server.py
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/python/listener.py
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/Makefile
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/base64.h
+++ a/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/
*
--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/cache.c
+++ a/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/
*
--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/cache.h
+++ a/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/
*
--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/cache_entry.c
+++ a/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/
*
--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/cache_entry.h
+++ a/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/
*
--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/cache_lowlevel.c
+++ a/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/
*
--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/cache_lowlevel.h
+++ a/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/
*
--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/change.c
+++ a/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/
*
--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/change.h
+++ a/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/
*
--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/common.h
+++ a/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/
*
--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/demo.c
+++ a/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/
*
--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/dump.c
+++ a/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/
*
--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/dump_signals.c
+++ a/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/
*
--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/filter.c
+++ a/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/
*
--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/filter.h
+++ a/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/
*
--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/handlers.c
+++ a/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/
*
--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/handlers.h
+++ a/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/
*
--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/listener-ctrl
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/main.c
+++ a/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/
*
--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/network.c
+++ a/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/
*
--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/network.h
+++ a/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/
*
--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/notifier.c
+++ a/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/
*
--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/notifier.h
+++ a/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/
*
--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/select_server.c
+++ a/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/
*
--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/select_server.h
+++ a/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/
*
--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/signals.c
+++ a/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/
*
--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/signals.h
+++ a/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/
*
--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/transfile.c
+++ a/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/
*
--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/transfile.h
+++ a/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/
*
--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/verify.c
+++ a/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/
*
--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/wrapper
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/tests/Makefile
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/02univention-directory-notifier.inst
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/15univention-directory-notifier-post.inst
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/conffiles/etc/runit/univention-directory-notifier/run
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/debian/copyright
+++ a/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/
--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/debian/rules
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/debian/univention-directory-notifier.init
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/debian/univention-directory-notifier.postinst
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/debian/univention-ldap-notifier.postinst
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/etc/network/if-post-down.d/univention-directory-notifier
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/src/Makefile
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/src/cache.c
+++ a/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/
*
--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/src/cache.h
+++ a/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/
*
--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/src/callback.c
+++ a/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/
*
--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/src/callback.h
+++ a/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/
*
--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/src/index-dump.c
+++ a/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/
*
--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/src/index.c
+++ a/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/
*
--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/src/index.h
+++ a/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/
*
--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/src/network.c
+++ a/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/
*
--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/src/network.h
+++ a/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/
*
--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/src/notify.c
+++ a/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/
*
--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/src/notify.h
+++ a/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/
*
--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/src/sem.c
+++ a/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/
*
--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/src/sem.h
+++ a/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/
*
--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/src/univention-directory-notifier.c
+++ a/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/
*
--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/univention-replicate-one
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/05univention-bind.inst
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/90univention-bind-post.inst
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/bind.py
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/conffiles/etc/init.d/bind9
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/conffiles/etc/runit/univention-bind-proxy/run
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/conffiles/etc/runit/univention-bind-samba4/run
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/conffiles/etc/runit/univention-bind/run
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/debian/copyright
+++ a/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/
--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/debian/rules
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/debian/univention-bind.postinst
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/import-zone
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/usr/lib/univention-server/server_password_change.d/univention-bind
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/03univention-s4-connector.uinst
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/97univention-s4-connector.inst
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/conffiles/etc/univention/s4connector/s4/mapping.py
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/debian/copyright
+++ a/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/
--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/debian/rules
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/debian/univention-s4-connector.init
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/debian/univention-s4-connector.postinst
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/debian/univention-s4-connector.postrm
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/debian/univention-s4-connector.prerm
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/etc/network/if-post-down.d/univention-s4-connector
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/ldap/msgpo.schema
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/ldap/mswmi.schema
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/modules/univention/admin/handlers/container/msgpo.py
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/modules/univention/admin/handlers/settings/mswmifilter.py
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/modules/univention/s4connector/__init__.py
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/modules/univention/s4connector/lockingdb.py
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/modules/univention/s4connector/s4/__init__.py
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/modules/univention/s4connector/s4/computer.py
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/modules/univention/s4connector/s4/dc.py
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/modules/univention/s4connector/s4/dns.py
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/modules/univention/s4connector/s4/main.py
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/modules/univention/s4connector/s4/mapping.py
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/modules/univention/s4connector/s4/password.py
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/modules/univention/s4connector/s4/query_config.py
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/modules/univention/s4connector/s4/sid_mapping.py
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/modules/univention/s4connector/s4cache.py
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/s4-connector.py
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/scripts/DN2base64Guid.py
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/scripts/base64Guid2DN.py
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/scripts/msGPOWQLFilter.py
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/scripts/msgpo.py
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/scripts/remove_s4_rejected.py
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/scripts/remove_ucs_rejected.py
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/scripts/resync_object_from_s4.py
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/scripts/resync_object_from_ucs.py
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/scripts/upgrade_groupPolicyContainer.py
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/scripts/upgrade_msWMI-Som.py
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/scripts/write_password_settings.py
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/server_password_change.d/univention-s4-connector
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/sync_krbtgt
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/univention-password_sync_ucs_to_s4
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/univention-s4-connector
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/univention-s4-position-sync
+++ a/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/
#
--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/univention-s4connector-list-rejected
+++ a/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/
#
--
---
.../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
--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/conffiles/etc/bind/named.conf
+++ a/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 ):
--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/conffiles/etc/bind/named.conf.proxy
+++ a/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')
--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/conffiles/etc/bind/named.conf.samba4
+++ a/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')
--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/conffiles/etc/init.d/bind9
+++ a/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: ||
--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/conffiles/etc/network/if-down.d/bind9
+++ a/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
+# .
+#
+
+[ -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
--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/conffiles/etc/network/if-up.d/bind9
+++ a/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
+# .
+#
+
+[ -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
--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/debian/changelog
+++ a/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 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
--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/debian/univention-bind.univention-config-registry
+++ a/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
--
---
.../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(-)
--- a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-down.d/15_nscd
+++ a/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
--- a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/12_univention_config_registry
+++ a/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?
--- a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/ucs-network-tools
+++ a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/ucs-network-tools
@@ -31,8 +31,8 @@
# .
ucs_ignore_interface () {
- case "${IFACE:-}" in
- lo|--all) exit 0 ;;
+ case "${METHOD:-}" in
+ loopback) exit 0 ;;
esac
case "${ADDRFAM:-}" in
meta) exit 0 ;;
--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/debian/changelog
+++ a/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 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)
--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/etc/network/if-post-down.d/univention-directory-listener
+++ a/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
# .
+. /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
--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/debian/changelog
+++ a/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 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-
--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/etc/network/if-post-down.d/univention-directory-notifier
+++ a/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
# .
+. /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
--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/debian/changelog
+++ a/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 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
--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/etc/network/if-post-down.d/univention-s4-connector
+++ a/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
# .
+. /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
--
---
.../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
--- a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/debian/univention-network-common.maintscript
+++ a/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~
--- a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-down.d/00_rdate
+++ a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-down.d/00_rdate
@@ -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
-# .
-
-[ ! -f /var/run/ntpd.pid ] && exit 0
-
-/etc/init.d/ntp stop
-
-exit 0
--- a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/05_rdate
+++ a/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
--
---
.../network/if-up.d/12_univention_config_registry | 54 +++++++++-------------
1 file changed, 21 insertions(+), 33 deletions(-)
--- a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/12_univention_config_registry
+++ a/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(""${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
--
---
.../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(-)
--- a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-down.d/15_nscd
+++ a/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
# .
-[ ! -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
--- a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-pre-up.d/10_dhclientconf
+++ a/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
# .
+[ -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
--- a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/00_resolvconf
+++ a/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 .
+[ -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
--- a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/15_nscd
+++ a/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
# .
+[ -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
--- a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/20_mount
+++ a/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
--- a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/30_univention-directory-policy
+++ a/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
# .
+[ -x /etc/init.d/univention-directory-policy ] || exit 0
+
. /etc/network/ucs-network-tools
ucs_ignore_interface
--- a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/90_dns_update
+++ a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/90_dns_update
@@ -31,18 +31,15 @@
# .
#
+[ -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 .
+[ -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
--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/etc/network/if-post-down.d/univention-directory-notifier
+++ a/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
# .
+[ -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
--- a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/etc/network/if-post-down.d/univention-s4-connector
+++ a/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
# .
+[ -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
--
---
.../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(-)
--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/etc/network/if-post-down.d/univention-directory-listener
+++ a/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
--- a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/etc/network/if-post-down.d/univention-directory-notifier
+++ a/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
--