Attachment #6626 for bug #36532

View | Details | Raw Unified | Return to bug 36532
Collapse All | Expand All

Lines 1-4 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/debian/copyright (-1 / +1 lines)
1	Copyright 2003-2014 Univention GmbH	1	Copyright 2003-2015 Univention GmbH
2		2
3	http://www.univention.de/	3	http://www.univention.de/
4		4

Lines 3-9 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/debian/rules (-1 / +1 lines)
3	# Univention Network Manager	3	# Univention Network Manager
4	# rules file for the debian package	4	# rules file for the debian package
5	#	5	#
6	# Copyright 2009-2014 Univention GmbH	6	# Copyright 2009-2015 Univention GmbH
7	#	7	#
8	# http://www.univention.de/	8	# http://www.univention.de/
9	#	9	#

Lines 3-9 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/debian/univention-ifplugd.postinst (-1 / +1 lines)
3	# Univention ifplugd	3	# Univention ifplugd
4	# postinst script	4	# postinst script
5	#	5	#
6	# Copyright 2009-2014 Univention GmbH	6	# Copyright 2009-2015 Univention GmbH
7	#	7	#
8	# http://www.univention.de/	8	# http://www.univention.de/
9	#	9	#

Lines 3-9 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/debian/univention-ifplugd.preinst (-1 / +1 lines)
3	# Univention Network ifplugd	3	# Univention Network ifplugd
4	# preinst script	4	# preinst script
5	#	5	#
6	# Copyright 2004-2014 Univention GmbH	6	# Copyright 2004-2015 Univention GmbH
7	#	7	#
8	# http://www.univention.de/	8	# http://www.univention.de/
9	#	9	#

Lines 3-9 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/debian/univention-network-common.init (-1 / +1 lines)
3	# Univention Network Common	3	# Univention Network Common
4	# Save the dhclient result in LDAP	4	# Save the dhclient result in LDAP
5	#	5	#
6	# Copyright (C) 2012-2014 Univention GmbH	6	# Copyright (C) 2012-2015 Univention GmbH
7	#	7	#
8	# http://www.univention.de/	8	# http://www.univention.de/
9	#	9	#

Lines 3-9 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/debian/univention-network-common.postinst (-1 / +1 lines)
3	# Univention Network Manager	3	# Univention Network Manager
4	# postinst script	4	# postinst script
5	#	5	#
6	# Copyright 2009-2014 Univention GmbH	6	# Copyright 2009-2015 Univention GmbH
7	#	7	#
8	# http://www.univention.de/	8	# http://www.univention.de/
9	#	9	#

Lines 3-9 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/debian/univention-network-manager.postinst (-1 / +1 lines)
3	# Univention Network Manager	3	# Univention Network Manager
4	# postinst script	4	# postinst script
5	#	5	#
6	# Copyright 2009-2014 Univention GmbH	6	# Copyright 2009-2015 Univention GmbH
7	#	7	#
8	# http://www.univention.de/	8	# http://www.univention.de/
9	#	9	#

Lines 3-9 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/debian/univention-network-manager.postrm (-1 / +1 lines)
3	# Univention Network Manager	3	# Univention Network Manager
4	# postrm script	4	# postrm script
5	#	5	#
6	# Copyright 2009-2014 Univention GmbH	6	# Copyright 2009-2015 Univention GmbH
7	#	7	#
8	# http://www.univention.de/	8	# http://www.univention.de/
9	#	9	#

Lines 3-9 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/debian/univention-network-manager.preinst (-1 / +1 lines)
3	# Univention Network Manager	3	# Univention Network Manager
4	# preinst script	4	# preinst script
5	#	5	#
6	# Copyright 2009-2014 Univention GmbH	6	# Copyright 2009-2015 Univention GmbH
7	#	7	#
8	# http://www.univention.de/	8	# http://www.univention.de/
9	#	9	#

Lines 3-9 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/dhcp/dhclient-exit-hooks.d/resolvconf (-1 / +1 lines)
3	# Univention Server	3	# Univention Server
4	# network script: modify resolv.conf	4	# network script: modify resolv.conf
5	#	5	#
6	# Copyright 2003-2014 Univention GmbH	6	# Copyright 2003-2015 Univention GmbH
7	#	7	#
8	# http://www.univention.de/	8	# http://www.univention.de/
9	#	9	#

Lines 4-10 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-down.d/00_rdate (-1 / +1 lines)
4	# network script: fix time	4	# network script: fix time
5	# the network link is down	5	# the network link is down
6	#	6	#
7	# Copyright 2008-2014 Univention GmbH	7	# Copyright 2008-2015 Univention GmbH
8	#	8	#
9	# http://www.univention.de/	9	# http://www.univention.de/
10	#	10	#

Lines 3-9 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-down.d/15_nscd (-1 / +1 lines)
3	# Univention Server	3	# Univention Server
4	# network script: restarts nscd when network state changes	4	# network script: restarts nscd when network state changes
5	#	5	#
6	# Copyright 2004-2014 Univention GmbH	6	# Copyright 2004-2015 Univention GmbH
7	#	7	#
8	# http://www.univention.de/	8	# http://www.univention.de/
9	#	9	#

Lines 3-9 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-pre-up.d/10_dhclientconf (-1 / +1 lines)
3	# Univention Network	3	# Univention Network
4	# Commit dhclient.conf to ensure the expire date is correct	4	# Commit dhclient.conf to ensure the expire date is correct
5	#	5	#
6	# Copyright 2004-2014 Univention GmbH	6	# Copyright 2004-2015 Univention GmbH
7	#	7	#
8	# http://www.univention.de/	8	# http://www.univention.de/
9	#	9	#

Lines 3-9 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/00_resolvconf (-1 / +1 lines)
3	# Univention Server	3	# Univention Server
4	# network script: modify resolv.conf	4	# network script: modify resolv.conf
5	#	5	#
6	# Copyright 2009-2014 Univention GmbH	6	# Copyright 2009-2015 Univention GmbH
7	#	7	#
8	# http://www.univention.de/	8	# http://www.univention.de/
9	#	9	#

Lines 4-10 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/05_rdate (-1 / +1 lines)
4	# network script: fix time	4	# network script: fix time
5	# the network link is active	5	# the network link is active
6	#	6	#
7	# Copyright 2008-2014 Univention GmbH	7	# Copyright 2008-2015 Univention GmbH
8	#	8	#
9	# http://www.univention.de/	9	# http://www.univention.de/
10	#	10	#

Lines 3-9 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/12_univention_config_registry (-1 / +1 lines)
3	# Univention Network	3	# Univention Network
4	# network script: save dhclient result in UCR	4	# network script: save dhclient result in UCR
5	#	5	#
6	# Copyright 2004-2014 Univention GmbH	6	# Copyright 2004-2015 Univention GmbH
7	#	7	#
8	# http://www.univention.de/	8	# http://www.univention.de/
9	#	9	#

Lines 3-9 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/15_nscd (-1 / +1 lines)
3	# Univention Server	3	# Univention Server
4	# network script: set authentication methods	4	# network script: set authentication methods
5	#	5	#
6	# Copyright 2004-2014 Univention GmbH	6	# Copyright 2004-2015 Univention GmbH
7	#	7	#
8	# http://www.univention.de/	8	# http://www.univention.de/
9	#	9	#

Lines 4-10 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/20_mount (-1 / +1 lines)
4	# network script: (re)mounts all entries from /etc/fstab when	4	# network script: (re)mounts all entries from /etc/fstab when
5	# the network link is active	5	# the network link is active
6	#	6	#
7	# Copyright 2004-2014 Univention GmbH	7	# Copyright 2004-2015 Univention GmbH
8	#	8	#
9	# http://www.univention.de/	9	# http://www.univention.de/
10	#	10	#

Lines 3-9 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/30_univention-directory-policy (-1 / +1 lines)
3	# Univention Network Manager	3	# Univention Network Manager
4	# network script: calls univention-directory-policy	4	# network script: calls univention-directory-policy
5	#	5	#
6	# Copyright 2009-2014 Univention GmbH	6	# Copyright 2009-2015 Univention GmbH
7	#	7	#
8	# http://www.univention.de/	8	# http://www.univention.de/
9	#	9	#

Lines 3-9 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/90_dns_update (-1 / +1 lines)
3	# Univention Network	3	# Univention Network
4	# network script: register IP in LDAP	4	# network script: register IP in LDAP
5	#	5	#
6	# Copyright 2004-2014 Univention GmbH	6	# Copyright 2004-2015 Univention GmbH
7	#	7	#
8	# http://www.univention.de/	8	# http://www.univention.de/
9	#	9	#

Lines 3-9 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/ucs-network-tools (-1 / +1 lines)
3	# Univention Network Manager	3	# Univention Network Manager
4	# network script helper functions	4	# network script helper functions
5	#	5	#
6	# Copyright 2009-2014 Univention GmbH	6	# Copyright 2009-2015 Univention GmbH
7	#	7	#
8	# http://www.univention.de/	8	# http://www.univention.de/
9	#	9	#

Lines 3-9 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/univention-ifplugd-enter-hook (-1 / +1 lines)
3	# Univention ifplugd	3	# Univention ifplugd
4	# dhclient hook script	4	# dhclient hook script
5	#	5	#
6	# Copyright 2009-2014 Univention GmbH	6	# Copyright 2009-2015 Univention GmbH
7	#	7	#
8	# http://www.univention.de/	8	# http://www.univention.de/
9	#	9	#

Lines 3-9 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/univention-register-network-address (-1 / +1 lines)
3	# Univention Network Common	3	# Univention Network Common
4	# Save the ip address in LDAP	4	# Save the ip address in LDAP
5	#	5	#
6	# Copyright (C) 2012-2014 Univention GmbH	6	# Copyright (C) 2012-2015 Univention GmbH
7	#	7	#
8	# http://www.univention.de/	8	# http://www.univention.de/
9	#	9	#

Lines 3-9 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/03univention-directory-listener.inst (-1 / +1 lines)
3	# Univention Directory Listener	3	# Univention Directory Listener
4	# join script	4	# join script
5	#	5	#
6	# Copyright 2004-2014 Univention GmbH	6	# Copyright 2004-2015 Univention GmbH
7	#	7	#
8	# http://www.univention.de/	8	# http://www.univention.de/
9	#	9	#

Lines 1-7 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/conffiles/etc/runit/univention-directory-listener/run (-1 / +1 lines)
1	#!/bin/sh -e	1	#!/bin/sh -e
2	@%@UCRWARNING=# @%@	2	@%@UCRWARNING=# @%@
3	#	3	#
4	# Copyright 2004-2014 Univention GmbH	4	# Copyright 2004-2015 Univention GmbH
5	#	5	#
6	# http://www.univention.de/	6	# http://www.univention.de/
7	#	7	#

Lines 1-4 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/debian/copyright (-1 / +1 lines)
1	Copyright 2002-2014 Univention GmbH	1	Copyright 2002-2015 Univention GmbH
2		2
3	http://www.univention.de/	3	http://www.univention.de/
4		4

Lines 3-9 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/debian/rules (-1 / +1 lines)
3	# Univention Directory Listener	3	# Univention Directory Listener
4	# rules file for the debian package	4	# rules file for the debian package
5	#	5	#
6	# Copyright 2004-2014 Univention GmbH	6	# Copyright 2004-2015 Univention GmbH
7	#	7	#
8	# http://www.univention.de/	8	# http://www.univention.de/
9	#	9	#

Lines 3-9 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/debian/univention-directory-listener.init (-1 / +1 lines)
3	# Univention Directory Listener	3	# Univention Directory Listener
4	# init script	4	# init script
5	#	5	#
6	# Copyright 2004-2014 Univention GmbH	6	# Copyright 2004-2015 Univention GmbH
7	#	7	#
8	# http://www.univention.de/	8	# http://www.univention.de/
9	#	9	#

Lines 3-9 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/debian/univention-directory-listener.postinst (-1 / +1 lines)
3	# Univention Directory Listener	3	# Univention Directory Listener
4	# postinst script	4	# postinst script
5	#	5	#
6	# Copyright 2004-2014 Univention GmbH	6	# Copyright 2004-2015 Univention GmbH
7	#	7	#
8	# http://www.univention.de/	8	# http://www.univention.de/
9	#	9	#

Lines 3-9 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/debian/univention-directory-listener.postrm (-1 / +1 lines)
3	# Univention LDAP Listener	3	# Univention LDAP Listener
4	# postrm script	4	# postrm script
5	#	5	#
6	# Copyright 2004-2014 Univention GmbH	6	# Copyright 2004-2015 Univention GmbH
7	#	7	#
8	# http://www.univention.de/	8	# http://www.univention.de/
9	#	9	#

Lines 27-30 Directory containing the state files. Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/doc/univention-directory-listener-ctrl.8 (-1 / +1 lines)
27	This program is documented fully in the	27	This program is documented fully in the
28	.IR "Univention Corporate Server Manual" .	28	.IR "Univention Corporate Server Manual" .
29	.SH AUTHOR	29	.SH AUTHOR
30	Copyright (c) 2001-2014 Univention GmbH, Germany	30	Copyright (c) 2001-2015 Univention GmbH, Germany

Lines 38-41 Default directory used by the Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/doc/univention-directory-listener-dump.8 (-1 / +1 lines)
38	This program is documented fully in the	38	This program is documented fully in the
39	.IR "Univention Corporate Server Manual" .	39	.IR "Univention Corporate Server Manual" .
40	.SH AUTHOR	40	.SH AUTHOR
41	Copyright (c) 2001-2014 Univention GmbH, Germany	41	Copyright (c) 2001-2015 Univention GmbH, Germany

Lines 41-44 Default directory used by the Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/doc/univention-directory-listener-verify.8 (-1 / +1 lines)
41	This program is documented fully in the	41	This program is documented fully in the
42	.IR "Univention Corporate Server Manual" .	42	.IR "Univention Corporate Server Manual" .
43	.SH AUTHOR	43	.SH AUTHOR
44	Copyright (c) 2001-2014 Univention GmbH, Germany	44	Copyright (c) 2001-2015 Univention GmbH, Germany

Lines 134-137 This program is documented fully in the Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/doc/univention-directory-listener.8 (-1 / +1 lines)
134	.IR "Univention Corporate Server Manual" .	134	.IR "Univention Corporate Server Manual" .
135		135
136	.SH AUTHOR	136	.SH AUTHOR
137	Copyright (c) 2001-2014 Univention GmbH, Germany	137	Copyright (c) 2001-2015 Univention GmbH, Germany

Lines 3-9 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/etc/network/if-post-down.d/univention-directory-listener (-1 / +1 lines)
3	# Restart the Directory Listener after an interface was stopped.	3	# Restart the Directory Listener after an interface was stopped.
4	# See https://forge.univention.org/bugzilla/show_bug.cgi?id=30408	4	# See https://forge.univention.org/bugzilla/show_bug.cgi?id=30408
5	#	5	#
6	# Copyright 2013-2014 Univention GmbH	6	# Copyright 2013-2015 Univention GmbH
7	#	7	#
8	# http://www.univention.de/	8	# http://www.univention.de/
9	#	9	#

Lines 4-10 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/python/get_notifier_id.py (-1 / +1 lines)
4	# Univention Directory Listener	4	# Univention Directory Listener
5	"""Read the notifier id from the DC master"""	5	"""Read the notifier id from the DC master"""
6	#	6	#
7	# Copyright 2004-2014 Univention GmbH	7	# Copyright 2004-2015 Univention GmbH
8	#	8	#
9	# http://www.univention.de/	9	# http://www.univention.de/
10	#	10	#

Lines 3-9 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/python/ldap_server.py (-1 / +1 lines)
3	# Univention Directory Listener	3	# Univention Directory Listener
4	"""listener script for setting ldap server."""	4	"""listener script for setting ldap server."""
5	#	5	#
6	# Copyright 2004-2014 Univention GmbH	6	# Copyright 2004-2015 Univention GmbH
7	#	7	#
8	# http://www.univention.de/	8	# http://www.univention.de/
9	#	9	#

Lines 3-9 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/python/listener.py (-1 / +1 lines)
3	# Univention Directory Listener	3	# Univention Directory Listener
4	# listener script	4	# listener script
5	#	5	#
6	# Copyright 2004-2014 Univention GmbH	6	# Copyright 2004-2015 Univention GmbH
7	#	7	#
8	# http://www.univention.de/	8	# http://www.univention.de/
9	#	9	#

Lines 2-8 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/Makefile (-1 / +1 lines)
2	# Univention Directory Listener	2	# Univention Directory Listener
3	# Makefile for the listener	3	# Makefile for the listener
4	#	4	#
5	# Copyright 2004-2014 Univention GmbH	5	# Copyright 2004-2015 Univention GmbH
6	#	6	#
7	# http://www.univention.de/	7	# http://www.univention.de/
8	#	8	#

Lines 2-8 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/base64.h (-1 / +1 lines)
2	* Univention Directory Listener	2	* Univention Directory Listener
3	* header information for base64.c	3	* header information for base64.c
4	*	4	*
5	* Copyright 2004-2014 Univention GmbH	5	* Copyright 2004-2015 Univention GmbH
6	*	6	*
7	* http://www.univention.de/	7	* http://www.univention.de/
8	*	8	*

Lines 2-8 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/cache.c (-1 / +1 lines)
2	* Univention Directory Listener	2	* Univention Directory Listener
3	* ldap listener caching system	3	* ldap listener caching system
4	*	4	*
5	* Copyright 2004-2014 Univention GmbH	5	* Copyright 2004-2015 Univention GmbH
6	*	6	*
7	* http://www.univention.de/	7	* http://www.univention.de/
8	*	8	*

Lines 2-8 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/cache.h (-1 / +1 lines)
2	* Univention Directory Listener	2	* Univention Directory Listener
3	* header information for cache.c	3	* header information for cache.c
4	*	4	*
5	* Copyright 2004-2014 Univention GmbH	5	* Copyright 2004-2015 Univention GmbH
6	*	6	*
7	* http://www.univention.de/	7	* http://www.univention.de/
8	*	8	*

Lines 2-8 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/cache_entry.c (-1 / +1 lines)
2	* Univention Directory Listener	2	* Univention Directory Listener
3	* entries in the cache	3	* entries in the cache
4	*	4	*
5	* Copyright 2004-2014 Univention GmbH	5	* Copyright 2004-2015 Univention GmbH
6	*	6	*
7	* http://www.univention.de/	7	* http://www.univention.de/
8	*	8	*

Lines 2-8 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/cache_entry.h (-1 / +1 lines)
2	* Univention Directory Listener	2	* Univention Directory Listener
3	* cache entry header information	3	* cache entry header information
4	*	4	*
5	* Copyright 2004-2014 Univention GmbH	5	* Copyright 2004-2015 Univention GmbH
6	*	6	*
7	* http://www.univention.de/	7	* http://www.univention.de/
8	*	8	*

Lines 2-8 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/cache_lowlevel.c (-1 / +1 lines)
2	* Univention Directory Listener	2	* Univention Directory Listener
3	* cache_lowlevel.c	3	* cache_lowlevel.c
4	*	4	*
5	* Copyright 2004-2014 Univention GmbH	5	* Copyright 2004-2015 Univention GmbH
6	*	6	*
7	* http://www.univention.de/	7	* http://www.univention.de/
8	*	8	*

Lines 2-8 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/cache_lowlevel.h (-1 / +1 lines)
2	* Univention Directory Listener	2	* Univention Directory Listener
3	* header information for cache_lowlevel.c	3	* header information for cache_lowlevel.c
4	*	4	*
5	* Copyright 2004-2014 Univention GmbH	5	* Copyright 2004-2015 Univention GmbH
6	*	6	*
7	* http://www.univention.de/	7	* http://www.univention.de/
8	*	8	*

Lines 2-8 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/change.c (-1 / +1 lines)
2	* Univention Directory Listener	2	* Univention Directory Listener
3	* abstract change handling	3	* abstract change handling
4	*	4	*
5	* Copyright 2004-2014 Univention GmbH	5	* Copyright 2004-2015 Univention GmbH
6	*	6	*
7	* http://www.univention.de/	7	* http://www.univention.de/
8	*	8	*

Lines 2-8 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/change.h (-1 / +1 lines)
2	* Univention Directory Listener	2	* Univention Directory Listener
3	* header information for change.c	3	* header information for change.c
4	*	4	*
5	* Copyright 2004-2014 Univention GmbH	5	* Copyright 2004-2015 Univention GmbH
6	*	6	*
7	* http://www.univention.de/	7	* http://www.univention.de/
8	*	8	*

Lines 2-8 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/common.h (-1 / +1 lines)
2	* Univention Directory Listener	2	* Univention Directory Listener
3	* header information common.h	3	* header information common.h
4	*	4	*
5	* Copyright 2004-2014 Univention GmbH	5	* Copyright 2004-2015 Univention GmbH
6	*	6	*
7	* http://www.univention.de/	7	* http://www.univention.de/
8	*	8	*

Lines 2-8 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/demo.c (-1 / +1 lines)
2	* Univention Directory Listener	2	* Univention Directory Listener
3	* demo program for the notifier client API.	3	* demo program for the notifier client API.
4	*	4	*
5	* Copyright 2004-2014 Univention GmbH	5	* Copyright 2004-2015 Univention GmbH
6	*	6	*
7	* http://www.univention.de/	7	* http://www.univention.de/
8	*	8	*

Lines 3-9 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/dump.c (-1 / +1 lines)
3	* header information for base64.c	3	* header information for base64.c
4	* tool to dump the cache.	4	* tool to dump the cache.
5	*	5	*
6	* Copyright 2004-2014 Univention GmbH	6	* Copyright 2004-2015 Univention GmbH
7	*	7	*
8	* http://www.univention.de/	8	* http://www.univention.de/
9	*	9	*

Lines 2-8 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/dump_signals.c (-1 / +1 lines)
2	* Univention Directory Listener	2	* Univention Directory Listener
3	* dump_signals.c	3	* dump_signals.c
4	*	4	*
5	* Copyright 2004-2014 Univention GmbH	5	* Copyright 2004-2015 Univention GmbH
6	*	6	*
7	* http://www.univention.de/	7	* http://www.univention.de/
8	*	8	*

Lines 2-8 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/filter.c (-1 / +1 lines)
2	* Univention Directory Listener	2	* Univention Directory Listener
3	* filter.c	3	* filter.c
4	*	4	*
5	* Copyright 2004-2014 Univention GmbH	5	* Copyright 2004-2015 Univention GmbH
6	*	6	*
7	* http://www.univention.de/	7	* http://www.univention.de/
8	*	8	*

Lines 2-8 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/filter.h (-1 / +1 lines)
2	* Univention Directory Listener	2	* Univention Directory Listener
3	* header information for filter.c	3	* header information for filter.c
4	*	4	*
5	* Copyright 2004-2014 Univention GmbH	5	* Copyright 2004-2015 Univention GmbH
6	*	6	*
7	* http://www.univention.de/	7	* http://www.univention.de/
8	*	8	*

Lines 2-8 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/handlers.c (-1 / +1 lines)
2	* Univention Directory Listener	2	* Univention Directory Listener
3	* handler.c	3	* handler.c
4	*	4	*
5	* Copyright 2004-2014 Univention GmbH	5	* Copyright 2004-2015 Univention GmbH
6	*	6	*
7	* http://www.univention.de/	7	* http://www.univention.de/
8	*	8	*

Lines 2-8 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/handlers.h (-1 / +1 lines)
2	* Univention Directory Listener	2	* Univention Directory Listener
3	* header information for handlers.c	3	* header information for handlers.c
4	*	4	*
5	* Copyright 2004-2014 Univention GmbH	5	* Copyright 2004-2015 Univention GmbH
6	*	6	*
7	* http://www.univention.de/	7	* http://www.univention.de/
8	*	8	*

Lines 3-9 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/listener-ctrl (-1 / +1 lines)
3	# Univention Directory Listener	3	# Univention Directory Listener
4	# resync modules	4	# resync modules
5	#	5	#
6	# Copyright 2004-2014 Univention GmbH	6	# Copyright 2004-2015 Univention GmbH
7	#	7	#
8	# http://www.univention.de/	8	# http://www.univention.de/
9	#	9	#

Lines 2-8 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/main.c (-1 / +1 lines)
2	* Univention Directory Listener	2	* Univention Directory Listener
3	* main.c	3	* main.c
4	*	4	*
5	* Copyright 2004-2014 Univention GmbH	5	* Copyright 2004-2015 Univention GmbH
6	*	6	*
7	* http://www.univention.de/	7	* http://www.univention.de/
8	*	8	*

Lines 2-8 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/network.c (-1 / +1 lines)
2	* Univention Directory Listener	2	* Univention Directory Listener
3	* an asyncronous notifier client API.	3	* an asyncronous notifier client API.
4	*	4	*
5	* Copyright 2004-2014 Univention GmbH	5	* Copyright 2004-2015 Univention GmbH
6	*	6	*
7	* http://www.univention.de/	7	* http://www.univention.de/
8	*	8	*

Lines 2-8 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/network.h (-1 / +1 lines)
2	* Univention Directory Listener	2	* Univention Directory Listener
3	* header information for network.c	3	* header information for network.c
4	*	4	*
5	* Copyright 2004-2014 Univention GmbH	5	* Copyright 2004-2015 Univention GmbH
6	*	6	*
7	* http://www.univention.de/	7	* http://www.univention.de/
8	*	8	*

Lines 2-8 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/notifier.c (-1 / +1 lines)
2	* Univention Directory Listener	2	* Univention Directory Listener
3	* notifier.c	3	* notifier.c
4	*	4	*
5	* Copyright 2004-2014 Univention GmbH	5	* Copyright 2004-2015 Univention GmbH
6	*	6	*
7	* http://www.univention.de/	7	* http://www.univention.de/
8	*	8	*

Lines 2-8 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/notifier.h (-1 / +1 lines)
2	* Univention Directory Listener	2	* Univention Directory Listener
3	* header information for notifier.c	3	* header information for notifier.c
4	*	4	*
5	* Copyright 2004-2014 Univention GmbH	5	* Copyright 2004-2015 Univention GmbH
6	*	6	*
7	* http://www.univention.de/	7	* http://www.univention.de/
8	*	8	*

Lines 2-8 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/select_server.c (-1 / +1 lines)
2	* Univention Directory Listener	2	* Univention Directory Listener
3	* select_server.c	3	* select_server.c
4	*	4	*
5	* Copyright 2004-2014 Univention GmbH	5	* Copyright 2004-2015 Univention GmbH
6	*	6	*
7	* http://www.univention.de/	7	* http://www.univention.de/
8	*	8	*

Lines 2-8 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/select_server.h (-1 / +1 lines)
2	* Univention Directory Listener	2	* Univention Directory Listener
3	* header information for select_server.c	3	* header information for select_server.c
4	*	4	*
5	* Copyright 2004-2014 Univention GmbH	5	* Copyright 2004-2015 Univention GmbH
6	*	6	*
7	* http://www.univention.de/	7	* http://www.univention.de/
8	*	8	*

Lines 2-8 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/signals.c (-1 / +1 lines)
2	* Univention Directory Listener	2	* Univention Directory Listener
3	* signal handlers are initialized and defined here.	3	* signal handlers are initialized and defined here.
4	*	4	*
5	* Copyright 2004-2014 Univention GmbH	5	* Copyright 2004-2015 Univention GmbH
6	*	6	*
7	* http://www.univention.de/	7	* http://www.univention.de/
8	*	8	*

Lines 2-8 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/signals.h (-1 / +1 lines)
2	* Univention Directory Listener	2	* Univention Directory Listener
3	* signal handling	3	* signal handling
4	*	4	*
5	* Copyright 2004-2014 Univention GmbH	5	* Copyright 2004-2015 Univention GmbH
6	*	6	*
7	* http://www.univention.de/	7	* http://www.univention.de/
8	*	8	*

Lines 2-8 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/transfile.c (-1 / +1 lines)
2	* Univention Directory Listener	2	* Univention Directory Listener
3	* transfile.c	3	* transfile.c
4	*	4	*
5	* Copyright 2004-2014 Univention GmbH	5	* Copyright 2004-2015 Univention GmbH
6	*	6	*
7	* http://www.univention.de/	7	* http://www.univention.de/
8	*	8	*

Lines 2-8 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/transfile.h (-1 / +1 lines)
2	* Univention Directory Listener	2	* Univention Directory Listener
3	* header information for transfile.c	3	* header information for transfile.c
4	*	4	*
5	* Copyright 2004-2014 Univention GmbH	5	* Copyright 2004-2015 Univention GmbH
6	*	6	*
7	* http://www.univention.de/	7	* http://www.univention.de/
8	*	8	*

Lines 2-8 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/verify.c (-1 / +1 lines)
2	* Univention Directory Listener	2	* Univention Directory Listener
3	* verify that Listener DB and local LDAP match	3	* verify that Listener DB and local LDAP match
4	*	4	*
5	* Copyright 2004-2014 Univention GmbH	5	* Copyright 2004-2015 Univention GmbH
6	*	6	*
7	* http://www.univention.de/	7	* http://www.univention.de/
8	*	8	*

Lines 3-9 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/src/wrapper (-1 / +1 lines)
3	# Univention Baseconfig	3	# Univention Baseconfig
4	# wrapper script	4	# wrapper script
5	#	5	#
6	# Copyright 2004-2014 Univention GmbH	6	# Copyright 2004-2015 Univention GmbH
7	#	7	#
8	# http://www.univention.de/	8	# http://www.univention.de/
9	#	9	#

Lines 2-8 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/tests/Makefile (-1 / +1 lines)
2	# Univention Directory Listener	2	# Univention Directory Listener
3	# Makefile for testing the listener	3	# Makefile for testing the listener
4	#	4	#
5	# Copyright 2004-2014 Univention GmbH	5	# Copyright 2004-2015 Univention GmbH
6	#	6	#
7	# http://www.univention.de/	7	# http://www.univention.de/
8	#	8	#

Lines 3-9 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/02univention-directory-notifier.inst (-1 / +1 lines)
3	# Univention Directory Notifier	3	# Univention Directory Notifier
4	# join script	4	# join script
5	#	5	#
6	# Copyright 2007-2014 Univention GmbH	6	# Copyright 2007-2015 Univention GmbH
7	#	7	#
8	# http://www.univention.de/	8	# http://www.univention.de/
9	#	9	#

Lines 3-9 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/15univention-directory-notifier-post.inst (-1 / +1 lines)
3	# Univention Directory Notifier	3	# Univention Directory Notifier
4	# join script	4	# join script
5	#	5	#
6	# Copyright 2007-2014 Univention GmbH	6	# Copyright 2007-2015 Univention GmbH
7	#	7	#
8	# http://www.univention.de/	8	# http://www.univention.de/
9	#	9	#

Lines 1-7 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/conffiles/etc/runit/univention-directory-notifier/run (-1 / +1 lines)
1	#!/bin/sh -e	1	#!/bin/sh -e
2	@%@UCRWARNING=# @%@	2	@%@UCRWARNING=# @%@
3	#	3	#
4	# Copyright 2004-2014 Univention GmbH	4	# Copyright 2004-2015 Univention GmbH
5	#	5	#
6	# http://www.univention.de/	6	# http://www.univention.de/
7	#	7	#

Lines 1-4 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/debian/copyright (-1 / +1 lines)
1	Copyright 2002-2014 Univention GmbH	1	Copyright 2002-2015 Univention GmbH
2		2
3	http://www.univention.de/	3	http://www.univention.de/
4		4

Lines 3-9 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/debian/rules (-1 / +1 lines)
3	# Univention Directory Notifier	3	# Univention Directory Notifier
4	# rules file for the debian package	4	# rules file for the debian package
5	#	5	#
6	# Copyright 2004-2014 Univention GmbH	6	# Copyright 2004-2015 Univention GmbH
7	#	7	#
8	# http://www.univention.de/	8	# http://www.univention.de/
9	#	9	#

Lines 3-9 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/debian/univention-directory-notifier.init (-1 / +1 lines)
3	# Univention Directory Notifier	3	# Univention Directory Notifier
4	# init script	4	# init script
5	#	5	#
6	# Copyright 2004-2014 Univention GmbH	6	# Copyright 2004-2015 Univention GmbH
7	#	7	#
8	# http://www.univention.de/	8	# http://www.univention.de/
9	#	9	#

Lines 3-9 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/debian/univention-directory-notifier.postinst (-1 / +1 lines)
3	# Univention Directory Notifier	3	# Univention Directory Notifier
4	# postinst	4	# postinst
5	#	5	#
6	# Copyright 2004-2014 Univention GmbH	6	# Copyright 2004-2015 Univention GmbH
7	#	7	#
8	# http://www.univention.de/	8	# http://www.univention.de/
9	#	9	#

Lines 3-9 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/debian/univention-ldap-notifier.postinst (-1 / +1 lines)
3	# Univention LDAP Notifier	3	# Univention LDAP Notifier
4	# postinst	4	# postinst
5	#	5	#
6	# Copyright 2004-2014 Univention GmbH	6	# Copyright 2004-2015 Univention GmbH
7	#	7	#
8	# http://www.univention.de/	8	# http://www.univention.de/
9	#	9	#

Lines 3-9 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/etc/network/if-post-down.d/univention-directory-notifier (-1 / +1 lines)
3	# Restart the Directory Notifier after an interface was stopped.	3	# Restart the Directory Notifier after an interface was stopped.
4	# See https://forge.univention.org/bugzilla/show_bug.cgi?id=30408	4	# See https://forge.univention.org/bugzilla/show_bug.cgi?id=30408
5	#	5	#
6	# Copyright 2013-2014 Univention GmbH	6	# Copyright 2013-2015 Univention GmbH
7	#	7	#
8	# http://www.univention.de/	8	# http://www.univention.de/
9	#	9	#

Lines 2-8 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/src/Makefile (-1 / +1 lines)
2	# Univention Directory Notifier	2	# Univention Directory Notifier
3	# Makefile	3	# Makefile
4	#	4	#
5	# Copyright 2004-2014 Univention GmbH	5	# Copyright 2004-2015 Univention GmbH
6	#	6	#
7	# http://www.univention.de/	7	# http://www.univention.de/
8	#	8	#

Lines 2-8 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/src/cache.c (-1 / +1 lines)
2	* Univention Directory Notifier	2	* Univention Directory Notifier
3	* cache.c	3	* cache.c
4	*	4	*
5	* Copyright 2004-2014 Univention GmbH	5	* Copyright 2004-2015 Univention GmbH
6	*	6	*
7	* http://www.univention.de/	7	* http://www.univention.de/
8	*	8	*

Lines 2-8 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/src/cache.h (-1 / +1 lines)
2	* Univention Directory Notifier	2	* Univention Directory Notifier
3	* cache.h	3	* cache.h
4	*	4	*
5	* Copyright 2004-2014 Univention GmbH	5	* Copyright 2004-2015 Univention GmbH
6	*	6	*
7	* http://www.univention.de/	7	* http://www.univention.de/
8	*	8	*

Lines 1-7 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/src/callback.c (-1 / +1 lines)
1	/*	1	/*
2	* Univention Directory Notifier	2	* Univention Directory Notifier
3	*	3	*
4	* Copyright 2004-2014 Univention GmbH	4	* Copyright 2004-2015 Univention GmbH
5	*	5	*
6	* http://www.univention.de/	6	* http://www.univention.de/
7	*	7	*

Lines 1-7 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/src/callback.h (-1 / +1 lines)
1	/*	1	/*
2	* Univention Directory Notifier	2	* Univention Directory Notifier
3	*	3	*
4	* Copyright 2004-2014 Univention GmbH	4	* Copyright 2004-2015 Univention GmbH
5	*	5	*
6	* http://www.univention.de/	6	* http://www.univention.de/
7	*	7	*

Lines 1-7 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/src/index-dump.c (-1 / +1 lines)
1	/*	1	/*
2	* Univention Directory Notifier	2	* Univention Directory Notifier
3	*	3	*
4	* Copyright 2004-2014 Univention GmbH	4	* Copyright 2004-2015 Univention GmbH
5	*	5	*
6	* http://www.univention.de/	6	* http://www.univention.de/
7	*	7	*

Lines 1-7 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/src/index.c (-1 / +1 lines)
1	/*	1	/*
2	* Univention Directory Notifier	2	* Univention Directory Notifier
3	*	3	*
4	* Copyright 2004-2014 Univention GmbH	4	* Copyright 2004-2015 Univention GmbH
5	*	5	*
6	* http://www.univention.de/	6	* http://www.univention.de/
7	*	7	*

Lines 1-7 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/src/index.h (-1 / +1 lines)
1	/*	1	/*
2	* Univention Directory Notifier	2	* Univention Directory Notifier
3	*	3	*
4	* Copyright 2004-2014 Univention GmbH	4	* Copyright 2004-2015 Univention GmbH
5	*	5	*
6	* http://www.univention.de/	6	* http://www.univention.de/
7	*	7	*

Lines 1-7 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/src/network.c (-1 / +1 lines)
1	/*	1	/*
2	* Univention Directory Notifier	2	* Univention Directory Notifier
3	*	3	*
4	* Copyright 2004-2014 Univention GmbH	4	* Copyright 2004-2015 Univention GmbH
5	*	5	*
6	* http://www.univention.de/	6	* http://www.univention.de/
7	*	7	*

Lines 1-7 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/src/network.h (-1 / +1 lines)
1	/*	1	/*
2	* Univention Directory Notifier	2	* Univention Directory Notifier
3	*	3	*
4	* Copyright 2004-2014 Univention GmbH	4	* Copyright 2004-2015 Univention GmbH
5	*	5	*
6	* http://www.univention.de/	6	* http://www.univention.de/
7	*	7	*

Lines 1-7 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/src/notify.c (-1 / +1 lines)
1	/*	1	/*
2	* Univention Directory Notifier	2	* Univention Directory Notifier
3	*	3	*
4	* Copyright 2004-2014 Univention GmbH	4	* Copyright 2004-2015 Univention GmbH
5	*	5	*
6	* http://www.univention.de/	6	* http://www.univention.de/
7	*	7	*

Lines 1-7 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/src/notify.h (-1 / +1 lines)
1	/*	1	/*
2	* Univention Directory Notifier	2	* Univention Directory Notifier
3	*	3	*
4	* Copyright 2004-2014 Univention GmbH	4	* Copyright 2004-2015 Univention GmbH
5	*	5	*
6	* http://www.univention.de/	6	* http://www.univention.de/
7	*	7	*

Lines 1-7 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/src/sem.c (-1 / +1 lines)
1	/*	1	/*
2	* Univention Directory Notifier	2	* Univention Directory Notifier
3	*	3	*
4	* Copyright 2004-2014 Univention GmbH	4	* Copyright 2004-2015 Univention GmbH
5	*	5	*
6	* http://www.univention.de/	6	* http://www.univention.de/
7	*	7	*

Lines 1-7 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/src/sem.h (-1 / +1 lines)
1	/*	1	/*
2	* Univention Directory Notifier	2	* Univention Directory Notifier
3	*	3	*
4	* Copyright 2004-2014 Univention GmbH	4	* Copyright 2004-2015 Univention GmbH
5	*	5	*
6	* http://www.univention.de/	6	* http://www.univention.de/
7	*	7	*

Lines 1-7 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/src/univention-directory-notifier.c (-1 / +1 lines)
1	/*	1	/*
2	* Univention Directory Notifier	2	* Univention Directory Notifier
3	*	3	*
4	* Copyright 2004-2014 Univention GmbH	4	* Copyright 2004-2015 Univention GmbH
5	*	5	*
6	* http://www.univention.de/	6	* http://www.univention.de/
7	*	7	*

Lines 3-9 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/univention-replicate-one (-1 / +1 lines)
3	# Univention Directory Notifier	3	# Univention Directory Notifier
4	# Replicate one DN	4	# Replicate one DN
5	#	5	#
6	# Copyright 2012-2014 Univention GmbH	6	# Copyright 2012-2015 Univention GmbH
7	#	7	#
8	# http://www.univention.de/	8	# http://www.univention.de/
9	#	9	#

Lines 3-9 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/05univention-bind.inst (-1 / +1 lines)
3	# Univention Bind	3	# Univention Bind
4	# join script	4	# join script
5	#	5	#
6	# Copyright 2001-2014 Univention GmbH	6	# Copyright 2001-2015 Univention GmbH
7	#	7	#
8	# http://www.univention.de/	8	# http://www.univention.de/
9	#	9	#

Lines 3-9 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/90univention-bind-post.inst (-1 / +1 lines)
3	# Univention Bind	3	# Univention Bind
4	# join script	4	# join script
5	#	5	#
6	# Copyright 2001-2014 Univention GmbH	6	# Copyright 2001-2015 Univention GmbH
7	#	7	#
8	# http://www.univention.de/	8	# http://www.univention.de/
9	#	9	#

Lines 9-15 the proxy. Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/bind.py (-1 / +1 lines)
9	During the quiet period check the cache directory (is-state) against the	9	During the quiet period check the cache directory (is-state) against the
10	configuration directory (should-state) and reload/restart as appropriate.	10	configuration directory (should-state) and reload/restart as appropriate.
11	"""	11	"""
12	# Copyright 2001-2014 Univention GmbH	12	# Copyright 2001-2015 Univention GmbH
13	#	13	#
14	# http://www.univention.de/	14	# http://www.univention.de/
15	#	15	#

Lines 1-7 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/conffiles/etc/init.d/bind9 (-1 / +1 lines)
1	#!/bin/sh	1	#!/bin/sh
2	@%@UCRWARNING=# @%@	2	@%@UCRWARNING=# @%@
3	#	3	#
4	# Copyright 2001-2014 Univention GmbH	4	# Copyright 2001-2015 Univention GmbH
5	#	5	#
6	# http://www.univention.de/	6	# http://www.univention.de/
7	#	7	#

Lines 1-6 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/conffiles/etc/runit/univention-bind-proxy/run (-1 / +1 lines)
1	#!/bin/sh	1	#!/bin/sh
2	#	2	#
3	# Copyright 2001-2014 Univention GmbH	3	# Copyright 2001-2015 Univention GmbH
4	#	4	#
5	# http://www.univention.de/	5	# http://www.univention.de/
6	#	6	#

Lines 1-6 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/conffiles/etc/runit/univention-bind-samba4/run (-1 / +1 lines)
1	#!/bin/sh	1	#!/bin/sh
2	#	2	#
3	# Copyright 2001-2014 Univention GmbH	3	# Copyright 2001-2015 Univention GmbH
4	#	4	#
5	# http://www.univention.de/	5	# http://www.univention.de/
6	#	6	#

Lines 1-6 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/conffiles/etc/runit/univention-bind/run (-1 / +1 lines)
1	#!/bin/sh	1	#!/bin/sh
2	#	2	#
3	# Copyright 2001-2014 Univention GmbH	3	# Copyright 2001-2015 Univention GmbH
4	#	4	#
5	# http://www.univention.de/	5	# http://www.univention.de/
6	#	6	#

Lines 1-4 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/debian/copyright (-1 / +1 lines)
1	Copyright 2001-2014 Univention GmbH	1	Copyright 2001-2015 Univention GmbH
2		2
3	http://www.univention.de/	3	http://www.univention.de/
4		4

Lines 3-9 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/debian/rules (-1 / +1 lines)
3	# Univention Bind	3	# Univention Bind
4	# rules file for the debian package	4	# rules file for the debian package
5	#	5	#
6	# Copyright 2001-2014 Univention GmbH	6	# Copyright 2001-2015 Univention GmbH
7	#	7	#
8	# http://www.univention.de/	8	# http://www.univention.de/
9	#	9	#

Lines 3-9 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/debian/univention-bind.postinst (-1 / +1 lines)
3	# Univention Bind	3	# Univention Bind
4	# postinst script for the univention-bind debian package	4	# postinst script for the univention-bind debian package
5	#	5	#
6	# Copyright 2001-2014 Univention GmbH	6	# Copyright 2001-2015 Univention GmbH
7	#	7	#
8	# http://www.univention.de/	8	# http://www.univention.de/
9	#	9	#

Lines 4-10 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/import-zone (-1 / +1 lines)
4	# Univention Bind	4	# Univention Bind
5	# join script	5	# join script
6	#	6	#
7	# Copyright 2001-2014 Univention GmbH	7	# Copyright 2001-2015 Univention GmbH
8	#	8	#
9	# http://www.univention.de/	9	# http://www.univention.de/
10	#	10	#

Lines 2-8 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/usr/lib/univention-server/server_password_change.d/univention-bind (-1 / +1 lines)
2	#	2	#
3	# Univention Bind	3	# Univention Bind
4	#	4	#
5	# Copyright 2011-2014 Univention GmbH	5	# Copyright 2011-2015 Univention GmbH
6	#	6	#
7	# http://www.univention.de/	7	# http://www.univention.de/
8	#	8	#

Lines 3-9 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/03univention-s4-connector.uinst (-1 / +1 lines)
3	# Univention S4 Connector	3	# Univention S4 Connector
4	# join script	4	# join script
5	#	5	#
6	# Copyright 2004-2014 Univention GmbH	6	# Copyright 2004-2015 Univention GmbH
7	#	7	#
8	# http://www.univention.de/	8	# http://www.univention.de/
9	#	9	#

Lines 3-9 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/97univention-s4-connector.inst (-1 / +1 lines)
3	# Univention S4 Connector	3	# Univention S4 Connector
4	# join script	4	# join script
5	#	5	#
6	# Copyright 2004-2014 Univention GmbH	6	# Copyright 2004-2015 Univention GmbH
7	#	7	#
8	# http://www.univention.de/	8	# http://www.univention.de/
9	#	9	#

Lines 3-9 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/conffiles/etc/univention/s4connector/s4/mapping.py (-1 / +1 lines)
3	# Univention S4 Connector	3	# Univention S4 Connector
4	# this file defines the mapping beetween S4 and UCS	4	# this file defines the mapping beetween S4 and UCS
5	#	5	#
6	# Copyright 2004-2014 Univention GmbH	6	# Copyright 2004-2015 Univention GmbH
7	#	7	#
8	# http://www.univention.de/	8	# http://www.univention.de/
9	#	9	#

Lines 1-4 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/debian/copyright (-1 / +1 lines)
1	Copyright 2002-2014 Univention GmbH	1	Copyright 2002-2015 Univention GmbH
2		2
3	http://www.univention.de/	3	http://www.univention.de/
4		4

Lines 3-9 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/debian/rules (-1 / +1 lines)
3	# Univention AD Connector	3	# Univention AD Connector
4	# rules file for the ad connector debian package	4	# rules file for the ad connector debian package
5	#	5	#
6	# Copyright 2004-2014 Univention GmbH	6	# Copyright 2004-2015 Univention GmbH
7	#	7	#
8	# http://www.univention.de/	8	# http://www.univention.de/
9	#	9	#

Lines 3-9 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/debian/univention-s4-connector.init (-1 / +1 lines)
3	# Univention S4 Connector	3	# Univention S4 Connector
4	# init script of the ad connector	4	# init script of the ad connector
5	#	5	#
6	# Copyright 2004-2014 Univention GmbH	6	# Copyright 2004-2015 Univention GmbH
7	#	7	#
8	# http://www.univention.de/	8	# http://www.univention.de/
9	#	9	#

Lines 3-9 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/debian/univention-s4-connector.postinst (-1 / +1 lines)
3	# Univention Samba4 Connector	3	# Univention Samba4 Connector
4	# postinst script of the samba4 connector package	4	# postinst script of the samba4 connector package
5	#	5	#
6	# Copyright 2004-2014 Univention GmbH	6	# Copyright 2004-2015 Univention GmbH
7	#	7	#
8	# http://www.univention.de/	8	# http://www.univention.de/
9	#	9	#

Lines 3-9 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/debian/univention-s4-connector.postrm (-1 / +1 lines)
3	# Univention S4 Connector	3	# Univention S4 Connector
4	# postinst script of the samba4 connector package	4	# postinst script of the samba4 connector package
5	#	5	#
6	# Copyright 2013-2014 Univention GmbH	6	# Copyright 2013-2015 Univention GmbH
7	#	7	#
8	# http://www.univention.de/	8	# http://www.univention.de/
9	#	9	#

Lines 3-9 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/debian/univention-s4-connector.prerm (-1 / +1 lines)
3	# Univention S4 Connector	3	# Univention S4 Connector
4	# prerm script	4	# prerm script
5	#	5	#
6	# Copyright 2013-2014 Univention GmbH	6	# Copyright 2013-2015 Univention GmbH
7	#	7	#
8	# http://www.univention.de/	8	# http://www.univention.de/
9	#	9	#

Lines 3-9 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/etc/network/if-post-down.d/univention-s4-connector (-1 / +1 lines)
3	# Restart the S4 connector if an interface was stopped.	3	# Restart the S4 connector if an interface was stopped.
4	# See https://forge.univention.org/bugzilla/show_bug.cgi?id=30119	4	# See https://forge.univention.org/bugzilla/show_bug.cgi?id=30119
5	#	5	#
6	# Copyright 2013-2014 Univention GmbH	6	# Copyright 2013-2015 Univention GmbH
7	#	7	#
8	# http://www.univention.de/	8	# http://www.univention.de/
9	#	9	#

Lines 1-4 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/ldap/msgpo.schema (-1 / +1 lines)
1	# Copyright 2012-2014 Univention GmbH	1	# Copyright 2012-2015 Univention GmbH
2	#	2	#
3	# http://www.univention.de/	3	# http://www.univention.de/
4	#	4	#

Lines 1-4 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/ldap/mswmi.schema (-1 / +1 lines)
1	# Copyright 2013-2014 Univention GmbH	1	# Copyright 2013-2015 Univention GmbH
2	#	2	#
3	# http://www.univention.de/	3	# http://www.univention.de/
4	#	4	#

Lines 3-9 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/modules/univention/admin/handlers/container/msgpo.py (-1 / +1 lines)
3	# Univention S4 Connector	3	# Univention S4 Connector
4	# UDM module for MS GPOs	4	# UDM module for MS GPOs
5	#	5	#
6	# Copyright 2012-2014 Univention GmbH	6	# Copyright 2012-2015 Univention GmbH
7	#	7	#
8	# http://www.univention.de/	8	# http://www.univention.de/
9	#	9	#

Lines 3-9 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/modules/univention/admin/handlers/settings/mswmifilter.py (-1 / +1 lines)
3	# Univention S4 Connector	3	# Univention S4 Connector
4	# UDM module for MS GPOs	4	# UDM module for MS GPOs
5	#	5	#
6	# Copyright 2012-2014 Univention GmbH	6	# Copyright 2012-2015 Univention GmbH
7	#	7	#
8	# http://www.univention.de/	8	# http://www.univention.de/
9	#	9	#

Lines 4-10 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/modules/univention/s4connector/__init__.py (-1 / +1 lines)
4	# Univention S4 Connector	4	# Univention S4 Connector
5	# Basic class for the UCS connector part	5	# Basic class for the UCS connector part
6	#	6	#
7	# Copyright 2004-2014 Univention GmbH	7	# Copyright 2004-2015 Univention GmbH
8	#	8	#
9	# http://www.univention.de/	9	# http://www.univention.de/
10	#	10	#

Lines 4-10 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/modules/univention/s4connector/lockingdb.py (-1 / +1 lines)
4	# Univention S4 Connector	4	# Univention S4 Connector
5	# LockingDB	5	# LockingDB
6	#	6	#
7	# Copyright 2014 Univention GmbH	7	# Copyright 2014-2015 Univention GmbH
8	#	8	#
9	# http://www.univention.de/	9	# http://www.univention.de/
10	#	10	#

Lines 4-10 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/modules/univention/s4connector/s4/__init__.py (-1 / +1 lines)
4	# Univention S4 Connector	4	# Univention S4 Connector
5	# Basic class for the AD connector part	5	# Basic class for the AD connector part
6	#	6	#
7	# Copyright 2004-2014 Univention GmbH	7	# Copyright 2004-2015 Univention GmbH
8	#	8	#
9	# http://www.univention.de/	9	# http://www.univention.de/
10	#	10	#

Lines 4-10 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/modules/univention/s4connector/s4/computer.py (-1 / +1 lines)
4	# Univention S4 Connector	4	# Univention S4 Connector
5	# computer object helper functions	5	# computer object helper functions
6	#	6	#
7	# Copyright 2013-2014 Univention GmbH	7	# Copyright 2013-2015 Univention GmbH
8	#	8	#
9	# http://www.univention.de/	9	# http://www.univention.de/
10	#	10	#

Lines 4-10 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/modules/univention/s4connector/s4/dc.py (-1 / +1 lines)
4	# Univention S4 Connector	4	# Univention S4 Connector
5	# dc sync	5	# dc sync
6	#	6	#
7	# Copyright 2004-2014 Univention GmbH	7	# Copyright 2004-2015 Univention GmbH
8	#	8	#
9	# http://www.univention.de/	9	# http://www.univention.de/
10	#	10	#

Lines 4-10 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/modules/univention/s4connector/s4/dns.py (-1 / +1 lines)
4	# Univention S4 Connector	4	# Univention S4 Connector
5	# dns helper functions	5	# dns helper functions
6	#	6	#
7	# Copyright 2004-2014 Univention GmbH	7	# Copyright 2004-2015 Univention GmbH
8	#	8	#
9	# http://www.univention.de/	9	# http://www.univention.de/
10	#	10	#

Lines 4-10 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/modules/univention/s4connector/s4/main.py (-1 / +1 lines)
4	# Univention S4 Connector	4	# Univention S4 Connector
5	# the main start script	5	# the main start script
6	#	6	#
7	# Copyright 2004-2014 Univention GmbH	7	# Copyright 2004-2015 Univention GmbH
8	#	8	#
9	# http://www.univention.de/	9	# http://www.univention.de/
10	#	10	#

Lines 4-10 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/modules/univention/s4connector/s4/mapping.py (-1 / +1 lines)
4	# Univention S4 Connector	4	# Univention S4 Connector
5	# some mapping helper functions	5	# some mapping helper functions
6	#	6	#
7	# Copyright 2004-2014 Univention GmbH	7	# Copyright 2004-2015 Univention GmbH
8	#	8	#
9	# http://www.univention.de/	9	# http://www.univention.de/
10	#	10	#

Lines 4-10 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/modules/univention/s4connector/s4/password.py (-1 / +1 lines)
4	# Univention S4 Connector	4	# Univention S4 Connector
5	# control the password sync communication with the s4 password service	5	# control the password sync communication with the s4 password service
6	#	6	#
7	# Copyright 2004-2014 Univention GmbH	7	# Copyright 2004-2015 Univention GmbH
8	#	8	#
9	# http://www.univention.de/	9	# http://www.univention.de/
10	#	10	#

Lines 4-10 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/modules/univention/s4connector/s4/query_config.py (-1 / +1 lines)
4	# Univention S4 Connector	4	# Univention S4 Connector
5	# reads the internal configuration	5	# reads the internal configuration
6	#	6	#
7	# Copyright 2004-2014 Univention GmbH	7	# Copyright 2004-2015 Univention GmbH
8	#	8	#
9	# http://www.univention.de/	9	# http://www.univention.de/
10	#	10	#

Lines 4-10 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/modules/univention/s4connector/s4/sid_mapping.py (-1 / +1 lines)
4	# Univention S4 Connector	4	# Univention S4 Connector
5	# sid sync	5	# sid sync
6	#	6	#
7	# Copyright 2004-2014 Univention GmbH	7	# Copyright 2004-2015 Univention GmbH
8	#	8	#
9	# http://www.univention.de/	9	# http://www.univention.de/
10	#	10	#

Lines 4-10 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/modules/univention/s4connector/s4cache.py (-1 / +1 lines)
4	# Univention S4 Connector	4	# Univention S4 Connector
5	# s4 cache	5	# s4 cache
6	#	6	#
7	# Copyright 2014 Univention GmbH	7	# Copyright 2014-2015 Univention GmbH
8	#	8	#
9	# http://www.univention.de/	9	# http://www.univention.de/
10	#	10	#

Lines 4-10 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/s4-connector.py (-1 / +1 lines)
4	# Univention S4 Connector	4	# Univention S4 Connector
5	# Univention Directory Listener script for the s4 connector	5	# Univention Directory Listener script for the s4 connector
6	#	6	#
7	# Copyright 2004-2014 Univention GmbH	7	# Copyright 2004-2015 Univention GmbH
8	#	8	#
9	# http://www.univention.de/	9	# http://www.univention.de/
10	#	10	#

Lines 4-10 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/scripts/DN2base64Guid.py (-1 / +1 lines)
4	# Univention S4 Connector	4	# Univention S4 Connector
5	# Convert S4 DN to base64 objectGuid as used in s4cache.sqlite	5	# Convert S4 DN to base64 objectGuid as used in s4cache.sqlite
6	#	6	#
7	# Copyright 2014 Univention GmbH	7	# Copyright 2014-2015 Univention GmbH
8	#	8	#
9	# http://www.univention.de/	9	# http://www.univention.de/
10	#	10	#

Lines 5-11 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/scripts/base64Guid2DN.py (-1 / +1 lines)
5	# Upgrade script for gPLink	5	# Upgrade script for gPLink
6	# Convert base64 objectGuid to S4 DN as used in s4cache.sqlite	6	# Convert base64 objectGuid to S4 DN as used in s4cache.sqlite
7	#	7	#
8	# Copyright 2014 Univention GmbH	8	# Copyright 2014-2015 Univention GmbH
9	#	9	#
10	# http://www.univention.de/	10	# http://www.univention.de/
11	#	11	#

Lines 4-10 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/scripts/msGPOWQLFilter.py (-1 / +1 lines)
4	# Univention S4 Connector	4	# Univention S4 Connector
5	# Upgrade script for msGPOWQLFilter attributes	5	# Upgrade script for msGPOWQLFilter attributes
6	#	6	#
7	# Copyright 2013-2014 Univention GmbH	7	# Copyright 2013-2015 Univention GmbH
8	#	8	#
9	# http://www.univention.de/	9	# http://www.univention.de/
10	#	10	#

Lines 4-10 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/scripts/msgpo.py (-1 / +1 lines)
4	# Univention S4 Connector	4	# Univention S4 Connector
5	# Upgrade script for gPLink	5	# Upgrade script for gPLink
6	#	6	#
7	# Copyright 2012-2014 Univention GmbH	7	# Copyright 2012-2015 Univention GmbH
8	#	8	#
9	# http://www.univention.de/	9	# http://www.univention.de/
10	#	10	#

Lines 4-10 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/scripts/remove_s4_rejected.py (-1 / +1 lines)
4	# Univention S4 Connector	4	# Univention S4 Connector
5	# Remove rejected S4 object	5	# Remove rejected S4 object
6	#	6	#
7	# Copyright 2014 Univention GmbH	7	# Copyright 2014-2015 Univention GmbH
8	#	8	#
9	# http://www.univention.de/	9	# http://www.univention.de/
10	#	10	#

Lines 4-10 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/scripts/remove_ucs_rejected.py (-1 / +1 lines)
4	# Univention S4 Connector	4	# Univention S4 Connector
5	# Remove rejected UCS object	5	# Remove rejected UCS object
6	#	6	#
7	# Copyright 2014 Univention GmbH	7	# Copyright 2014-2015 Univention GmbH
8	#	8	#
9	# http://www.univention.de/	9	# http://www.univention.de/
10	#	10	#

Lines 4-10 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/scripts/resync_object_from_s4.py (-1 / +1 lines)
4	# Univention S4 Connector	4	# Univention S4 Connector
5	# Resync object from S4 to OpenLDAP	5	# Resync object from S4 to OpenLDAP
6	#	6	#
7	# Copyright 2014 Univention GmbH	7	# Copyright 2014-2015 Univention GmbH
8	#	8	#
9	# http://www.univention.de/	9	# http://www.univention.de/
10	#	10	#

Lines 4-10 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/scripts/resync_object_from_ucs.py (-1 / +1 lines)
4	# Univention S4 Connector	4	# Univention S4 Connector
5	# Resync object from OpenLDAP to S4	5	# Resync object from OpenLDAP to S4
6	#	6	#
7	# Copyright 2014 Univention GmbH	7	# Copyright 2014-2015 Univention GmbH
8	#	8	#
9	# http://www.univention.de/	9	# http://www.univention.de/
10	#	10	#

Lines 4-10 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/scripts/upgrade_groupPolicyContainer.py (-1 / +1 lines)
4	# Univention S4 Connector	4	# Univention S4 Connector
5	# Added groupPolicyContainer objects to rejected table	5	# Added groupPolicyContainer objects to rejected table
6	#	6	#
7	# Copyright 2012-2014 Univention GmbH	7	# Copyright 2012-2015 Univention GmbH
8	#	8	#
9	# http://www.univention.de/	9	# http://www.univention.de/
10	#	10	#

Lines 4-10 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/scripts/upgrade_msWMI-Som.py (-1 / +1 lines)
4	# Univention S4 Connector	4	# Univention S4 Connector
5	# Trigger Synchronization of msWMI-Som objects	5	# Trigger Synchronization of msWMI-Som objects
6	#	6	#
7	# Copyright 2013-2014 Univention GmbH	7	# Copyright 2013-2015 Univention GmbH
8	#	8	#
9	# http://www.univention.de/	9	# http://www.univention.de/
10	#	10	#

Lines 4-10 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/scripts/write_password_settings.py (-1 / +1 lines)
4	# Univention S4 Connector	4	# Univention S4 Connector
5	# Upgrade script for samba domain password setting attributes	5	# Upgrade script for samba domain password setting attributes
6	#	6	#
7	# Copyright 2012-2014 Univention GmbH	7	# Copyright 2012-2015 Univention GmbH
8	#	8	#
9	# http://www.univention.de/	9	# http://www.univention.de/
10	#	10	#

Lines 2-8 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/server_password_change.d/univention-s4-connector (-1 / +1 lines)
2	#	2	#
3	# Univention S4 Connector	3	# Univention S4 Connector
4	#	4	#
5	# Copyright 2013-2014 Univention GmbH	5	# Copyright 2013-2015 Univention GmbH
6	#	6	#
7	# http://www.univention.de/	7	# http://www.univention.de/
8	#	8	#

Lines 4-10 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/sync_krbtgt (-1 / +1 lines)
4	# sync_krbtgt	4	# sync_krbtgt
5	# sync the password of krbtgt from Samba4 to UCS	5	# sync the password of krbtgt from Samba4 to UCS
6	#	6	#
7	# Copyright 2010-2014 Univention GmbH	7	# Copyright 2010-2015 Univention GmbH
8	#	8	#
9	# http://www.univention.de/	9	# http://www.univention.de/
10	#	10	#

Lines 4-10 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/univention-password_sync_ucs_to_s4 (-1 / +1 lines)
4	# Univention Samba4 Password sync	4	# Univention Samba4 Password sync
5	# sync the password from UCS to Samba4	5	# sync the password from UCS to Samba4
6	#	6	#
7	# Copyright 2010-2014 Univention GmbH	7	# Copyright 2010-2015 Univention GmbH
8	#	8	#
9	# http://www.univention.de/	9	# http://www.univention.de/
10	#	10	#

Lines 3-9 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/univention-s4-connector (-1 / +1 lines)
3	# Univention S4 Connector	3	# Univention S4 Connector
4	# Start script for the AD Conenctor	4	# Start script for the AD Conenctor
5	#	5	#
6	# Copyright 2004-2014 Univention GmbH	6	# Copyright 2004-2015 Univention GmbH
7	#	7	#
8	# http://www.univention.de/	8	# http://www.univention.de/
9	#	9	#

Lines 4-10 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/univention-s4-position-sync (-1 / +1 lines)
4	# Univention S4 Connector	4	# Univention S4 Connector
5	# List all rejected objects	5	# List all rejected objects
6	#	6	#
7	# Copyright 2004-2014 Univention GmbH	7	# Copyright 2004-2015 Univention GmbH
8	#	8	#
9	# http://www.univention.de/	9	# http://www.univention.de/
10	#	10	#




# Univention S4 Connector
#  List all rejected objects
#
# 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

Lines 10-15 options { Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/conffiles/etc/bind/named.conf (+1 lines)
10	also-notify {	10	also-notify {
11	127.0.0.1;	11	127.0.0.1;
12	};	12	};
		13	listen-on { any; };
13	@!@	14	@!@
14	val = 'none'	15	val = 'none'
15	if configRegistry.is_true('dns/ipv6', True ):	16	if configRegistry.is_true('dns/ipv6', True ):

Lines 7-12 controls{ Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/conffiles/etc/bind/named.conf.proxy (+1 lines)
7	};	7	};
8	options {	8	options {
9	directory "/var/cache/bind";	9	directory "/var/cache/bind";
		10	listen-on { any; };
10	@!@	11	@!@
11	dns_allow_query = configRegistry.get('dns/allow/query')	12	dns_allow_query = configRegistry.get('dns/allow/query')
12	dns_allow_query_cache = configRegistry.get('dns/allow/query/cache')	13	dns_allow_query_cache = configRegistry.get('dns/allow/query/cache')

Lines 6-11 controls{ Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/conffiles/etc/bind/named.conf.samba4 (+1 lines)
6	};	6	};
7	options {	7	options {
8	tkey-gssapi-keytab "/var/lib/samba/private/dns.keytab";	8	tkey-gssapi-keytab "/var/lib/samba/private/dns.keytab";
		9	listen-on { any; };
9	@!@	10	@!@
10	dns_allow_query = configRegistry.get('dns/allow/query')	11	dns_allow_query = configRegistry.get('dns/allow/query')
11	dns_allow_query_cache = configRegistry.get('dns/allow/query/cache')	12	dns_allow_query_cache = configRegistry.get('dns/allow/query/cache')




			. "/usr/share/univention-config-registry/init-autostart.lib"
			check_autostart univention-bind bind/autostart
		fi
		log_action_begin_msg "Starting bind9 daemon:"
		if [ "$dns_backend" = "samba4" ]; then
			sv_action up univention-bind-samba4
		elif [ "$dns_backend" = "ldap" ]; then

		log_action_end_msg 0
		;;
	stop)
		log_action_begin_msg "Stopping bind9 daemon: "
		sv_action down univention-bind-proxy
		sv_action down univention-bind
		sv_action down univention-bind-samba4

			check_autostart univention-bind bind/autostart
		fi

		log_action_begin_msg "Restarting bind9 daemon: "
		if [ "$dns_backend" = "samba4" ]; then
			sv_action stop univention-bind
			sv_action stop univention-bind-proxy

				"$0" restart
			fi
		elif [ "$dns_backend" = "ldap" ]; then
			if sv_running univention-bind || sv_running univention-bind-proxy
			then
				"$0" restart
			fi
			if 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: ||




#!/bin/sh -e
@%@UCRWARNING=# @%@
#
# Copyright 2015 Univention GmbH
#
# http://www.univention.de/
#
# All rights reserved.
#
# The source code of this program is made available
# under the terms of the GNU Affero General Public License version 3
# (GNU AGPL V3) as published by the Free Software Foundation.
#
# Binary versions of this program provided by Univention to you as
# well as other copyrighted, protected or trademarked materials like
# Logos, graphics, fonts, specific documentations and configurations,
# cryptographic keys etc. are subject to a license agreement between
# you and Univention and not subject to the GNU AGPL V3.
#
# In the case you use this program under the terms of the GNU AGPL V3,
# the program is provided in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public
# License with the Debian GNU/Linux or Univention distribution in file
# /usr/share/common-licenses/AGPL-3; if not, see
# <http://www.gnu.org/licenses/>.
#

[ -x /usr/sbin/rndc ] || exit 0
[ -e /etc/init.d/univention-bind9 ] || exit 0

# Always reload, even for loopback
invoke-rc.d univention-bind9 reload

exit 0




#!/bin/sh -e
@%@UCRWARNING=# @%@
#
# Copyright 2015 Univention GmbH
#
# http://www.univention.de/
#
# All rights reserved.
#
# The source code of this program is made available
# under the terms of the GNU Affero General Public License version 3
# (GNU AGPL V3) as published by the Free Software Foundation.
#
# Binary versions of this program provided by Univention to you as
# well as other copyrighted, protected or trademarked materials like
# Logos, graphics, fonts, specific documentations and configurations,
# cryptographic keys etc. are subject to a license agreement between
# you and Univention and not subject to the GNU AGPL V3.
#
# In the case you use this program under the terms of the GNU AGPL V3,
# the program is provided in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public
# License with the Debian GNU/Linux or Univention distribution in file
# /usr/share/common-licenses/AGPL-3; if not, see
# <http://www.gnu.org/licenses/>.
#

[ -d /usr/sbin ] || exit 0
[ -x /etc/init.d/univention-bind9 ] || exit 0

# Always reload, even for loopback
invoke-rc.d univention-bind9 reload

exit 0

Lines 1-3 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/debian/changelog (+6 lines)
		1	univention-bind (9.0.5-1) unstable; urgency=low
		2
		3	* Bug #36532: Improve restart of bind9 on network reconfiguration
		4
		5	-- Philipp Hahn <hahn@univention.de> Thu, 22 Jan 2015 09:21:43 +0100
		6
1	univention-bind (9.0.4-1) unstable; urgency=low	7	univention-bind (9.0.4-1) unstable; urgency=low
2		8
3	* If no dns/forwarder is set, use the nameserver variables as forwarder	9	* If no dns/forwarder is set, use the nameserver variables as forwarder




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(-)

Lines 32-37 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-down.d/15_nscd (+3 lines)
32		32
33	[ ! -f /var/run/nscd/nscd.pid ] && exit 0	33	[ ! -f /var/run/nscd/nscd.pid ] && exit 0
34		34
		35	. /etc/network/ucs-network-tools
		36	ucs_ignore_interface
		37
35	if [ -x /etc/init.d/nscd ]; then	38	if [ -x /etc/init.d/nscd ]; then
36	/etc/init.d/nscd restart	39	/etc/init.d/nscd restart
37	nscd -i passwd	40	nscd -i passwd

Lines 41-47 configRegistry.load() Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/12_univention_config_registry (-1 / +1 lines)
41	iface = os.environ.get('IFACE')	41	iface = os.environ.get('IFACE')
42		42
43	# ignore lo and all	43	# ignore lo and all
44	if iface in ['lo', 'all']:	44	if os.environ.get('METHOD') == 'loopback' or os.environ.get('ADDRFAM') == 'meta':
45	sys.exit(0)	45	sys.exit(0)
46		46
47	# is interface configured as DHCP?	47	# is interface configured as DHCP?

Lines 31-38 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/ucs-network-tools (-2 / +2 lines)
31	# <http://www.gnu.org/licenses/>.	31	# <http://www.gnu.org/licenses/>.
32		32
33	ucs_ignore_interface () {	33	ucs_ignore_interface () {
34	case "${IFACE:-}" in	34	case "${METHOD:-}" in
35	lo\|--all) exit 0 ;;	35	loopback) exit 0 ;;
36	esac	36	esac
37	case "${ADDRFAM:-}" in	37	case "${ADDRFAM:-}" in
38	meta) exit 0 ;;	38	meta) exit 0 ;;

Lines 1-3 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/debian/changelog (+6 lines)
		1	univention-directory-listener (9.0.3-1) unstable; urgency=low
		2
		3	* Bug #36532: Speed up network re-config
		4
		5	-- Philipp Hahn <hahn@univention.de> Thu, 22 Jan 2015 11:23:42 +0100
		6
1	univention-directory-listener (9.0.2-1) unstable; urgency=medium	7	univention-directory-listener (9.0.2-1) unstable; urgency=medium
2		8
3	* Do atomic locking on the cache (Bug #34013)	9	* Do atomic locking on the cache (Bug #34013)

Lines 30-35 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/etc/network/if-post-down.d/univention-directory-listener (+3 lines)
30	# /usr/share/common-licenses/AGPL-3; if not, see	30	# /usr/share/common-licenses/AGPL-3; if not, see
31	# <http://www.gnu.org/licenses/>.	31	# <http://www.gnu.org/licenses/>.
32		32
		33	. /etc/network/ucs-network-tools
		34	ucs_ignore_interface
		35
33	if [ -x /etc/init.d/univention-directory-listener ]; then	36	if [ -x /etc/init.d/univention-directory-listener ]; then
34	/etc/init.d/univention-directory-listener crestart	37	/etc/init.d/univention-directory-listener crestart
35	fi	38	fi

Lines 1-3 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/debian/changelog (+6 lines)
		1	univention-directory-notifier (9.0.4-1) unstable; urgency=low
		2
		3	* Bug #36532: Speed up network re-config
		4
		5	-- Philipp Hahn <hahn@univention.de> Thu, 22 Jan 2015 11:24:47 +0100
		6
1	univention-directory-notifier (9.0.3-1) unstable; urgency=medium	7	univention-directory-notifier (9.0.3-1) unstable; urgency=medium
2		8
3	* Wait for the notifier start in 15univention-directory-notifier-	9	* Wait for the notifier start in 15univention-directory-notifier-

Lines 30-35 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/etc/network/if-post-down.d/univention-directory-notifier (+3 lines)
30	# /usr/share/common-licenses/AGPL-3; if not, see	30	# /usr/share/common-licenses/AGPL-3; if not, see
31	# <http://www.gnu.org/licenses/>.	31	# <http://www.gnu.org/licenses/>.
32		32
		33	. /etc/network/ucs-network-tools
		34	ucs_ignore_interface
		35
33	if [ -x /etc/init.d/univention-directory-notifier ]; then	36	if [ -x /etc/init.d/univention-directory-notifier ]; then
34	/etc/init.d/univention-directory-notifier crestart	37	/etc/init.d/univention-directory-notifier crestart
35	fi	38	fi

Lines 1-3 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/services/univention-s4-connector/debian/changelog (+6 lines)
		1	univention-s4-connector (9.0.16-11) unstable; urgency=low
		2
		3	* Bug #36532: Speed up network re-config
		4
		5	-- Philipp Hahn <hahn@univention.de> Thu, 22 Jan 2015 11:26:43 +0100
		6
1	univention-s4-connector (9.0.16-10) unstable; urgency=medium	7	univention-s4-connector (9.0.16-10) unstable; urgency=medium
2		8
3	* Bug #33110: Cleanup S4 LDAP base lookup code	9	* Bug #33110: Cleanup S4 LDAP base lookup code




# /usr/share/common-licenses/AGPL-3; if not, see
# <http://www.gnu.org/licenses/>.

. /etc/network/ucs-network-tools
ucs_ignore_interface

if [ -x /etc/init.d/univention-s4-connector ]; then
	/etc/init.d/univention-s4-connector crestart
fi
- 
--
.../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

Line 0 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/debian/univention-network-common.maintscript (+1 lines)
	1	rm_conffile etc/network/if-down.d/00_rdate 6.0.0-2~




#!/bin/sh
#
# Univention Server
#  network script: fix time
#  the network link is down
#
# Copyright 2008-2015 Univention GmbH
#
# http://www.univention.de/
#
# All rights reserved.
#
# The source code of this program is made available
# under the terms of the GNU Affero General Public License version 3
# (GNU AGPL V3) as published by the Free Software Foundation.
#
# Binary versions of this program provided by Univention to you as
# well as other copyrighted, protected or trademarked materials like
# Logos, graphics, fonts, specific documentations and configurations,
# cryptographic keys etc. are subject to a license agreement between
# you and Univention and not subject to the GNU AGPL V3.
#
# In the case you use this program under the terms of the GNU AGPL V3,
# the program is provided in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public
# License with the Debian GNU/Linux or Univention distribution in file
# /usr/share/common-licenses/AGPL-3; if not, see
# <http://www.gnu.org/licenses/>.

[ ! -f /var/run/ntpd.pid ] && exit 0

/etc/init.d/ntp stop

exit 0

Lines 38-43 ucs_ignore_interface Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/05_rdate (-4 lines)
38		38
39	/etc/init.d/rdate start	39	/etc/init.d/rdate start
40		40
41	/etc/init.d/ntp start
42
43	exit 0	41	exit 0
44	-
45	--
46	.../network/if-up.d/12_univention_config_registry \| 54 +++++++++-------------	42	.../network/if-up.d/12_univention_config_registry \| 54 +++++++++-------------
47	1 file changed, 21 insertions(+), 33 deletions(-)	43	1 file changed, 21 insertions(+), 33 deletions(-)




import sys, os, ipaddr, netifaces
import socket, struct

from univention.config_registry.frontend import ConfigRegistry, ucr_update

configRegistry = univention.config_registry.ConfigRegistry()
configRegistry.load()

iface = os.environ.get('IFACE')

# 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]
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 = {
	'interfaces/restart/auto': configRegistry.get('interfaces/restart/auto'),
}
for k in ['netmask', 'address', 'broadcast', 'network']:
	ucr_set['interfaces/%s/%s' % (iface, k)] = inf.get(k, None)
		ucr_set.append('interfaces/%s/%s=%s' % (iface, k, inf.get(k)))
	else:
		ucr_set.append('interfaces/%s/%s' % (iface, k))

# 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[k] = newip

# read gateway from proc
gateway = ''
with open("/proc/net/route") as fh:
	for line in fh:
		fields = line.strip().split()
		if fields[1] != '00000000' or not int(fields[3], 16) & 2:
			continue
		gateway = socket.inet_ntoa(struct.pack("<L", int(fields[2], 16)))
# write to UCR
if configRegistry.get('gateway') != gateway:
	ucr_set['gateway'] = gateway

# Redirect stdout
sys.stdout = open(os.path.devnull, 'w')
stdout = sys.stdout
sys.stdout = null

# Disable ifdown / ifup while setting new UCR variables to avoid an endless loop
ucr_update({'interfaces/restart/auto': 'false'})
ucr_update(ucr_set)
univention.config_registry.handler_set(ucr_set, quiet=True)
univention.config_registry.handler_set(['interfaces/restart/auto=%s' % restart], quiet=True)

sys.stdout = stdout

sys.exit(0)

- 
--
.../base/univention-network-manager/debian/control       |  2 ++
.../etc/network/if-up.d/00_resolvconf                    | 16 ++++++----------
2 files changed, 8 insertions(+), 10 deletions(-)

Lines 51-56 Replaces: univention-network-manager, Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/debian/control (+2 lines)
51	univention-ifplugd	51	univention-ifplugd
52	Suggests:	52	Suggests:
53	univention-management-console-server	53	univention-management-console-server
		54	Breaks:
		55	univention-bind (<< 9.0.5-1),
54	Description: UCS - Network tools for ifplugd and network-manager (common)	56	Description: UCS - Network tools for ifplugd and network-manager (common)
55	This package installs tools required by univention-ifplugd and	57	This package installs tools required by univention-ifplugd and
56	univention-network-manager.	58	univention-network-manager.




		fi
		i=$((i+1))
	done </etc/resolv.conf
	"$need_restart" && invoke-rc.d bind9 reload
	ucr commit /etc/resolv.conf
elif [ "$interface_type" = "dhcp" ]; then
	# Add the local configured nameserver to the resolv.conf

	# The given nameserver via DHCP should be the default nameserver, so split the 
	# current resolv.conf
	tempdir=$(mktemp -d)
	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"

	done

	# Build resolv.conf
	cat "${tempdir}/resolv.conf" "${tempdir}/nameserver_local" >/etc/resolv.conf
	cat "${tempdir}/nameserver_local" >>/etc/resolv.conf
	# Don't add the DHCP nameservers twice
	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(-)




# /usr/share/common-licenses/AGPL-3; if not, see
# <http://www.gnu.org/licenses/>.

[ -x /etc/init.d/nscd ] || exit 0
[ -f /var/run/nscd/nscd.pid ] || exit 0

. /etc/network/ucs-network-tools
ucs_ignore_interface

invoke-rc.d nscd restart
nscd -i passwd
nscd -i group
	nscd -i group
fi

exit 0

Lines 30-40 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-pre-up.d/10_dhclientconf (-3 / +3 lines)
30	# /usr/share/common-licenses/AGPL-3; if not, see	30	# /usr/share/common-licenses/AGPL-3; if not, see
31	# <http://www.gnu.org/licenses/>.	31	# <http://www.gnu.org/licenses/>.
32		32
		33	[ -e /etc/dhcp/dhclient.conf ] \|\| exit 0
		34
33	. /etc/network/ucs-network-tools	35	. /etc/network/ucs-network-tools
34	ucs_ignore_interface	36	ucs_ignore_interface
35		37
36	if [ -e /etc/dhcp/dhclient.conf ]; then	38	ucr commit /etc/dhcp/dhclient.conf
37	/usr/sbin/ucr commit /etc/dhcp/dhclient.conf
38	fi
39		39
40	exit 0	40	exit 0

Lines 42-48 then Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/00_resolvconf (-3 / +5 lines)
42	echo "options timeout:$nameserver_option_timeout" >> /etc/resolv.conf	42	echo "options timeout:$nameserver_option_timeout" >> /etc/resolv.conf
43	fi	43	fi
44		44
45	interface_type="$(ucr get interfaces/${IFACE}/type)"	45	case "$(ucr get interfaces/${IFACE}/type)" in
		46	dhcp) ;;
		47	*) exit 0 ;;
		48	esac
46		49
47	is_ns ()	50	is_ns ()
48	{	51	{
Lines 62-68 is_ns () Link Here
62	# must not be set to true	65	# must not be set to true
63	if [ -e /var/univention-join/joined ] && is_domain_controller && \	66	if [ -e /var/univention-join/joined ] && is_domain_controller && \
64	[ -n "$nameserver1" -o -n "$nameserver2" -o -n "$nameserver3" ] && \	67	[ -n "$nameserver1" -o -n "$nameserver2" -o -n "$nameserver3" ] && \
65	[ "$interface_type" = "dhcp" ] && \
66	! is_ucr_true "nameserver/external"	68	! is_ucr_true "nameserver/external"
67	then	69	then
68	need_restart=false	70	need_restart=false
Lines 79-85 then Link Here
79	done </etc/resolv.conf	81	done </etc/resolv.conf
80	"$need_restart" && invoke-rc.d bind9 reload	82	"$need_restart" && invoke-rc.d bind9 reload
81	ucr commit /etc/resolv.conf	83	ucr commit /etc/resolv.conf
82	elif [ "$interface_type" = "dhcp" ]; then	84	else
83	# Add the local configured nameserver to the resolv.conf	85	# Add the local configured nameserver to the resolv.conf
84		86
85	# The given nameserver via DHCP should be the default nameserver, so split the	87	# The given nameserver via DHCP should be the default nameserver, so split the

Lines 31-41 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/05_rdate (-3 / +3 lines)
31	# /usr/share/common-licenses/AGPL-3; if not, see	31	# /usr/share/common-licenses/AGPL-3; if not, see
32	# <http://www.gnu.org/licenses/>.	32	# <http://www.gnu.org/licenses/>.
33		33
		34	[ -f /var/run/ntpd.pid ] && exit 0
		35
34	. /etc/network/ucs-network-tools	36	. /etc/network/ucs-network-tools
35	ucs_ignore_interface	37	ucs_ignore_interface
36		38
37	[ -f /var/run/ntpd.pid ] && exit 0	39	invoke-rc.d rdate start
38
39	/etc/init.d/rdate start
40		40
41	exit 0	41	exit 0




# /usr/share/common-licenses/AGPL-3; if not, see
# <http://www.gnu.org/licenses/>.

[ -x /etc/init.d/nscd ] || exit 0
[ -f /var/run/nscd/nscd.pid ] || exit 0

. /etc/network/ucs-network-tools
ucs_ignore_interface

invoke-rc.d nscd restart
nscd -i passwd
nscd -i group
	/etc/init.d/nscd restart
	nscd -i passwd
	nscd -i group
fi

exit 0

Lines 34-42 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/20_mount (-3 / +3 lines)
34	. /etc/network/ucs-network-tools	34	. /etc/network/ucs-network-tools
35	ucs_ignore_interface	35	ucs_ignore_interface
36		36
37	eval "$(univention-config-registry shell networkmanager/action/mount)"	37	. /usr/share/univention-lib/ucr.sh
38	[ "$networkmanager_action_mount" = "yes" -o "$networkmanager_action_mount" = "true" ] \|\| exit 0	38	is_ucr_true networkmanager/action/mount \|\| exit 0
39		39
40	[ -x /bin/mount ] && /bin/mount -a	40	mount -a
41		41
42	exit 0	42	exit 0

Lines 30-35 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/30_univention-directory-policy (+2 lines)
30	# /usr/share/common-licenses/AGPL-3; if not, see	30	# /usr/share/common-licenses/AGPL-3; if not, see
31	# <http://www.gnu.org/licenses/>.	31	# <http://www.gnu.org/licenses/>.
32		32
		33	[ -x /etc/init.d/univention-directory-policy ] \|\| exit 0
		34
33	. /etc/network/ucs-network-tools	35	. /etc/network/ucs-network-tools
34	ucs_ignore_interface	36	ucs_ignore_interface
35		37




# <http://www.gnu.org/licenses/>.
#

[ -e /var/univention-join/joined ] || exit 0

. /etc/network/ucs-network-tools
ucs_ignore_interface

eval "$(ucr shell server/role ldap/master)"

# System must be joined
if [ ! -e /var/univention-join/joined ]; then
	exit 0
fi

# Is master available?
if /bin/netcat -q0 -w1 "$ldap_master" 6670 </dev/null; then

	# If we are the master a restart of UMC is required
	if [ "$server_role" = "domaincontroller_master" ]; then

Lines 30-40 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/etc/network/if-post-down.d/univention-directory-listener (-2 / +2 lines)
30	# /usr/share/common-licenses/AGPL-3; if not, see	30	# /usr/share/common-licenses/AGPL-3; if not, see
31	# <http://www.gnu.org/licenses/>.	31	# <http://www.gnu.org/licenses/>.
32		32
		33	[ -x /etc/init.d/univention-directory-listener ] \|\| exit 0
		34
33	. /etc/network/ucs-network-tools	35	. /etc/network/ucs-network-tools
34	ucs_ignore_interface	36	ucs_ignore_interface
35		37
36	if [ -x /etc/init.d/univention-directory-listener ]; then
37	/etc/init.d/univention-directory-listener crestart	38	/etc/init.d/univention-directory-listener crestart
38	fi
39		39
40	exit 0	40	exit 0

Lines 30-40 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/etc/network/if-post-down.d/univention-directory-notifier (-2 / +2 lines)
30	# /usr/share/common-licenses/AGPL-3; if not, see	30	# /usr/share/common-licenses/AGPL-3; if not, see
31	# <http://www.gnu.org/licenses/>.	31	# <http://www.gnu.org/licenses/>.
32		32
		33	[ -x /etc/init.d/univention-directory-notifier ] \|\| exit 0
		34
33	. /etc/network/ucs-network-tools	35	. /etc/network/ucs-network-tools
34	ucs_ignore_interface	36	ucs_ignore_interface
35		37
36	if [ -x /etc/init.d/univention-directory-notifier ]; then
37	/etc/init.d/univention-directory-notifier crestart	38	/etc/init.d/univention-directory-notifier crestart
38	fi
39		39
40	exit 0	40	exit 0




# /usr/share/common-licenses/AGPL-3; if not, see
# <http://www.gnu.org/licenses/>.

[ -x /etc/init.d/univention-s4-connector ] || exit 0

. /etc/network/ucs-network-tools
ucs_ignore_interface

invoke-rc.d univention-s4-connector crestart
	/etc/init.d/univention-s4-connector crestart
fi

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(-)

Lines 35-40 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-listener/etc/network/if-post-down.d/univention-directory-listener (-1 / +1 lines)
35	. /etc/network/ucs-network-tools	35	. /etc/network/ucs-network-tools
36	ucs_ignore_interface	36	ucs_ignore_interface
37		37
38	/etc/init.d/univention-directory-listener crestart	38	sv t univention-directory-listener
39		39
40	exit 0	40	exit 0

Lines 35-40 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/management/univention-directory-notifier/etc/network/if-post-down.d/univention-directory-notifier (-2 / +1 lines)
35	. /etc/network/ucs-network-tools	35	. /etc/network/ucs-network-tools
36	ucs_ignore_interface	36	ucs_ignore_interface
37		37
38	/etc/init.d/univention-directory-notifier crestart	38	sv t univention-directory-notifier
39		39
40	exit 0	40	exit 0
41	-

Return to bug 36532

Lines 58-64 case "$1" in Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/conffiles/etc/init.d/bind9 (-8 / +17 lines)
58	. "/usr/share/univention-config-registry/init-autostart.lib"	58	. "/usr/share/univention-config-registry/init-autostart.lib"
59	check_autostart univention-bind bind/autostart	59	check_autostart univention-bind bind/autostart
60	fi	60	fi
61	log_action_msg "Starting bind9 daemon:"	61	log_action_begin_msg "Starting bind9 daemon:"
62	if [ "$dns_backend" = "samba4" ]; then	62	if [ "$dns_backend" = "samba4" ]; then
63	sv_action up univention-bind-samba4	63	sv_action up univention-bind-samba4
64	elif [ "$dns_backend" = "ldap" ]; then	64	elif [ "$dns_backend" = "ldap" ]; then
Lines 68-74 case "$1" in Link Here
68	log_action_end_msg 0	68	log_action_end_msg 0
69	;;	69	;;
70	stop)	70	stop)
71	log_action_msg "Stopping bind9 daemon: "	71	log_action_begin_msg "Stopping bind9 daemon: "
72	sv_action down univention-bind-proxy	72	sv_action down univention-bind-proxy
73	sv_action down univention-bind	73	sv_action down univention-bind
74	sv_action down univention-bind-samba4	74	sv_action down univention-bind-samba4
Lines 81-87 case "$1" in Link Here
81	check_autostart univention-bind bind/autostart	81	check_autostart univention-bind bind/autostart
82	fi	82	fi
83		83
84	log_action_msg "Restarting bind9 daemon: "	84	log_action_begin_msg "Restarting bind9 daemon: "
85	if [ "$dns_backend" = "samba4" ]; then	85	if [ "$dns_backend" = "samba4" ]; then
86	sv_action stop univention-bind	86	sv_action stop univention-bind
87	sv_action stop univention-bind-proxy	87	sv_action stop univention-bind-proxy
Lines 105-120 case "$1" in Link Here
105	"$0" restart	105	"$0" restart
106	fi	106	fi
107	elif [ "$dns_backend" = "ldap" ]; then	107	elif [ "$dns_backend" = "ldap" ]; then
108	if sv_running univention-bind	108	if sv_running univention-bind \|\| sv_running univention-bind-proxy
109	then
110	"$0" restart
111	fi
112	if sv_running univention-bind-proxy
113	then	109	then
114	"$0" restart	110	"$0" restart
115	fi	111	fi
116	fi	112	fi
117	;;	113	;;
		114	reload)
		115	log_action_begin_msg "Reloading bind9 daemon: "
		116	case "$dns_backend" in
		117	samba4)
		118	log_action_cont_msg "samba4" && rndc -p 953 reload >/dev/null
		119	;;
		120	ldap)
		121	log_action_cont_msg "ldap" && rndc -p 55555 reload >/dev/null
		122	log_action_cont_msg "proxy" && rndc -p 953 reload >/dev/null
		123	;;
		124	esac
		125	log_action_end_msg 0
		126	;;
118	status)	127	status)
119	if sv status univention-bind-samba4 \| grep -qs ^run: \|\|	128	if sv status univention-bind-samba4 \| grep -qs ^run: \|\|
120	sv status univention-bind \| grep -qs ^run: \|\|	129	sv status univention-bind \| grep -qs ^run: \|\|

Lines 37-39 Variables: dns/dlz/debug/level Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/services/univention-bind/debian/univention-bind.univention-config-registry (-2 / +8 lines)
37	Type: file	37	Type: file
38	Mode: 755	38	Mode: 755
39	File: etc/init.d/bind9	39	File: etc/init.d/bind9
40	-	40
41	--	41	Type: file
		42	Mode: 755
		43	File: etc/network/if-up.d/bind9
		44
		45	Type: file
		46	Mode: 755
		47	File: etc/network/if-down.d/bind9
42	.../base/univention-network-manager/etc/network/if-down.d/15_nscd \| 3 +++	48	.../base/univention-network-manager/etc/network/if-down.d/15_nscd \| 3 +++
43	.../etc/network/if-up.d/12_univention_config_registry \| 2 +-	49	.../etc/network/if-up.d/12_univention_config_registry \| 2 +-
44	.../base/univention-network-manager/etc/network/ucs-network-tools \| 4 ++--	50	.../base/univention-network-manager/etc/network/ucs-network-tools \| 4 ++--
45	.../management/univention-directory-listener/debian/changelog \| 6 ++++++	51	.../management/univention-directory-listener/debian/changelog \| 6 ++++++
46	.../etc/network/if-post-down.d/univention-directory-listener \| 3 +++	52	.../etc/network/if-post-down.d/univention-directory-listener \| 3 +++
47	.../management/univention-directory-notifier/debian/changelog \| 6 ++++++	53	.../management/univention-directory-notifier/debian/changelog \| 6 ++++++
48	.../etc/network/if-post-down.d/univention-directory-notifier \| 3 +++	54	.../etc/network/if-post-down.d/univention-directory-notifier \| 3 +++
49	.../ucs-4.0-0/services/univention-s4-connector/debian/changelog \| 6 ++++++	55	.../ucs-4.0-0/services/univention-s4-connector/debian/changelog \| 6 ++++++
50	.../etc/network/if-post-down.d/univention-s4-connector \| 3 +++	56	.../etc/network/if-post-down.d/univention-s4-connector \| 3 +++
51	9 files changed, 33 insertions(+), 3 deletions(-)	57	9 files changed, 33 insertions(+), 3 deletions(-)

Lines 33-101 Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/12_univention_config_registry (-35 / +21 lines)
33	import sys, os, ipaddr, netifaces	33	import sys, os, ipaddr, netifaces
34	import socket, struct	34	import socket, struct
35		35
36	import univention.config_registry	36	from univention.config_registry.frontend import ConfigRegistry, ucr_update
37
38	configRegistry = univention.config_registry.ConfigRegistry()
39	configRegistry.load()
40
41	iface = os.environ.get('IFACE')
42		37
43	# ignore lo and all	38	# ignore lo and all
44	if os.environ.get('METHOD') == 'loopback' or os.environ.get('ADDRFAM') == 'meta':	39	if os.environ.get('METHOD') == 'loopback' or os.environ.get('ADDRFAM') == 'meta':
45	sys.exit(0)	40	sys.exit(0)
46		41
47	# is interface configured as DHCP?	42	# is interface configured as DHCP?
		43	iface = os.environ.get('IFACE')
		44	configRegistry = ConfigRegistry()
		45	configRegistry.load()
48	if configRegistry.get('interfaces/%s/type' % iface) != 'dhcp':	46	if configRegistry.get('interfaces/%s/type' % iface) != 'dhcp':
49	sys.exit(0)	47	sys.exit(0)
50		48
51	# get first AF_INET interface	49	# get first AF_INET interface
52	inf = netifaces.ifaddresses(iface).get(netifaces.AF_INET)[0]	50	inf = netifaces.ifaddresses(iface).get(netifaces.AF_INET)[0]
53		51	try:
54	ip = ipaddr.IPv4Network('%s/%s' % ( inf.get('addr'), inf.get('netmask') ) )	52	newip = inf.get('addr')
		53	ip = ipaddr.IPv4Network('%(addr)s/%(netmask)s' % inf)
		54	except KeyError:
		55	sys.exit(0)
		56	inf['address'] = newip
55	inf['network'] = ip.network	57	inf['network'] = ip.network
56		58
57	# make the key equal to UCR
58	inf['address'] = inf.get('addr')
59
60	# save to UCR	59	# save to UCR
61	ucr_set = []	60	ucr_set = {
		61	'interfaces/restart/auto': configRegistry.get('interfaces/restart/auto'),
		62	}
62	for k in ['netmask', 'address', 'broadcast', 'network']:	63	for k in ['netmask', 'address', 'broadcast', 'network']:
63	if inf.get(k):	64	ucr_set['interfaces/%s/%s' % (iface, k)] = inf.get(k, None)
64	ucr_set.append('interfaces/%s/%s=%s' % (iface, k, inf.get(k)))
65	else:
66	ucr_set.append('interfaces/%s/%s' % (iface, k))
67		65
68	# if old IP adress was set as nameserver, replace it with the new address	66	# if old IP adress was set as nameserver, replace it with the new address
69	oldip = configRegistry.get('interfaces/%s/address' % iface)	67	oldip = configRegistry.get('interfaces/%s/address' % iface)
70	if oldip:	68	if oldip:
71	for k in ['nameserver1', 'nameserver2', 'nameserver3']:	69	for k in ['nameserver1', 'nameserver2', 'nameserver3']:
72	if oldip == configRegistry.get(k):	70	if oldip == configRegistry.get(k):
73	ucr_set.append('%s=%s' % (k, inf.get('address')))	71	ucr_set[k] = newip
74		72
75	# read gateway from proc	73	# read gateway from proc
76	gateway=''	74	gateway = ''
77	with open("/proc/net/route") as fh:	75	with open("/proc/net/route") as fh:
78	for line in fh:	76	for line in fh:
79	fields = line.strip().split()	77	fields = line.strip().split()
80	if fields[1] != '00000000' or not int(fields[3], 16) & 2:	78	if fields[1] != '00000000' or not int(fields[3], 16) & 2:
81	continue	79	continue
82	gateway=socket.inet_ntoa(struct.pack("<L", int(fields[2], 16)))	80	gateway = socket.inet_ntoa(struct.pack("<L", int(fields[2], 16)))
83	# write to UCR	81	# write to UCR
84	if configRegistry.get('gateway') != gateway:	82	if configRegistry.get('gateway') != gateway:
85	ucr_set.append('gateway=%s' % gateway)	83	ucr_set['gateway'] = gateway
86		84
87	# Redirect stdout	85	# Redirect stdout
88	null = open(os.path.devnull, 'w' )	86	sys.stdout = open(os.path.devnull, 'w')
89	stdout = sys.stdout
90	sys.stdout = null
91
92	# Disable ifdown / ifup while setting new UCR variables to avoid an endless loop	87	# Disable ifdown / ifup while setting new UCR variables to avoid an endless loop
93	restart = configRegistry.get('interfaces/restart/auto', 'true')	88	ucr_update({'interfaces/restart/auto': 'false'})
94	univention.config_registry.handler_set(['interfaces/restart/auto=false'], quiet=True)	89	ucr_update(ucr_set)
95	univention.config_registry.handler_set(ucr_set, quiet=True)
96	univention.config_registry.handler_set(['interfaces/restart/auto=%s' % restart], quiet=True)
97
98	sys.stdout = stdout
99
100	sys.exit(0)
101
102	-
103	--
104	.../base/univention-network-manager/debian/control \| 2 ++	90	.../base/univention-network-manager/debian/control \| 2 ++
105	.../etc/network/if-up.d/00_resolvconf \| 16 ++++++----------	91	.../etc/network/if-up.d/00_resolvconf \| 16 ++++++----------
106	2 files changed, 8 insertions(+), 10 deletions(-)	92	2 files changed, 8 insertions(+), 10 deletions(-)

Lines 77-83 then Link Here

(-)a/branches/ucs-4.0/ucs-4.0-0/base/univention-network-manager/etc/network/if-up.d/00_resolvconf (-12 / +6 lines)
77	fi	77	fi
78	i=$((i+1))	78	i=$((i+1))
79	done </etc/resolv.conf	79	done </etc/resolv.conf
80	"$need_restart" && invoke-rc.d bind9 restart	80	"$need_restart" && invoke-rc.d bind9 reload
81	ucr commit /etc/resolv.conf	81	ucr commit /etc/resolv.conf
82	elif [ "$interface_type" = "dhcp" ]; then	82	elif [ "$interface_type" = "dhcp" ]; then
83	# Add the local configured nameserver to the resolv.conf	83	# Add the local configured nameserver to the resolv.conf
Lines 85-92 elif [ "$interface_type" = "dhcp" ]; then Link Here
85	# The given nameserver via DHCP should be the default nameserver, so split the	85	# The given nameserver via DHCP should be the default nameserver, so split the
86	# current resolv.conf	86	# current resolv.conf
87	tempdir=$(mktemp -d)	87	tempdir=$(mktemp -d)
88	cat /etc/resolv.conf \| grep -v ^nameserver >"${tempdir}/resolv.conf"	88	trap "rm -rf '$tempdir'" EXIT
89	cat /etc/resolv.conf \| grep ^nameserver >"${tempdir}/nameserver_dhcp"	89	grep -v ^nameserver /etc/resolv.conf >"${tempdir}/resolv.conf"
		90	grep ^nameserver /etc/resolv.conf >"${tempdir}/nameserver_dhcp"
90	touch "${tempdir}/nameserver_local"	91	touch "${tempdir}/nameserver_local"
91	for i in $(seq 1 3); do	92	for i in $(seq 1 3); do
92	dns="nameserver$i"	93	dns="nameserver$i"
Lines 99-116 elif [ "$interface_type" = "dhcp" ]; then Link Here
99	done	100	done
100		101
101	# Build resolv.conf	102	# Build resolv.conf
102	cat "${tempdir}/resolv.conf" >/etc/resolv.conf	103	cat "${tempdir}/resolv.conf" "${tempdir}/nameserver_local" >/etc/resolv.conf
103	cat "${tempdir}/nameserver_local" >>/etc/resolv.conf
104	# Don't add the DHCP nameservers twice	104	# Don't add the DHCP nameservers twice
105	cat "${tempdir}/nameserver_dhcp" \| grep ^nameserver \| awk '{print $2}' \| while read ns; do	105	awk '/^nameserver/{print $2}' <"${tempdir}/nameserver_dhcp" \| while read ns; do
106	if ! grep -q -s "nameserver *${ns}\$" /etc/resolv.conf; then	106	if ! grep -q -s "nameserver *${ns}\$" /etc/resolv.conf; then
107	echo "nameserver $ns" >>/etc/resolv.conf	107	echo "nameserver $ns" >>/etc/resolv.conf
108	fi	108	fi
109	done	109	done
110
111	# remove tempdir
112	rm -f "${tempdir}/resolv.conf" "${tempdir}/nameserver_local" "${tempdir}/nameserver_dhcp"
113	rmdir "${tempdir}"
114	fi	110	fi
115		111
116	exit 0	112	exit 0
117	-
118	--
119	.../etc/network/if-down.d/15_nscd \| 11 +++++------	113	.../etc/network/if-down.d/15_nscd \| 11 +++++------
120	.../etc/network/if-pre-up.d/10_dhclientconf \| 6 +++---	114	.../etc/network/if-pre-up.d/10_dhclientconf \| 6 +++---
121	.../etc/network/if-up.d/00_resolvconf \| 8 +++++---	115	.../etc/network/if-up.d/00_resolvconf \| 8 +++++---
122	.../univention-network-manager/etc/network/if-up.d/05_rdate \| 6 +++---	116	.../univention-network-manager/etc/network/if-up.d/05_rdate \| 6 +++---
123	.../univention-network-manager/etc/network/if-up.d/15_nscd \| 13 ++++++-------	117	.../univention-network-manager/etc/network/if-up.d/15_nscd \| 13 ++++++-------
124	.../univention-network-manager/etc/network/if-up.d/20_mount \| 6 +++---	118	.../univention-network-manager/etc/network/if-up.d/20_mount \| 6 +++---
125	.../etc/network/if-up.d/30_univention-directory-policy \| 2 ++	119	.../etc/network/if-up.d/30_univention-directory-policy \| 2 ++
126	.../etc/network/if-up.d/90_dns_update \| 9 +++------	120	.../etc/network/if-up.d/90_dns_update \| 9 +++------
127	.../network/if-post-down.d/univention-directory-listener \| 4 ++--	121	.../network/if-post-down.d/univention-directory-listener \| 4 ++--
128	.../network/if-post-down.d/univention-directory-notifier \| 4 ++--	122	.../network/if-post-down.d/univention-directory-notifier \| 4 ++--
129	.../etc/network/if-post-down.d/univention-s4-connector \| 6 +++---	123	.../etc/network/if-post-down.d/univention-s4-connector \| 6 +++---
130	11 files changed, 37 insertions(+), 38 deletions(-)	124	11 files changed, 37 insertions(+), 38 deletions(-)