Attachment #4500 for bug #27829

(-)a/branches/ucs-3.0/ucs/base/univention-network-manager/conffiles/etc/dhcp/dhclient.conf (-6 / +9 lines)

Lines 13-18	Link Here

#	few changes must be made to this file, if any.

#	few changes must be made to this file, if any.

option rfc3442-classless-static-routes code 121 = array of unsigned integer 8;

@!@

@!@

if configRegistry.is_true('dhclient/options/ddns', False):

if configRegistry.is_true('dhclient/options/ddns', False):

    print 'send host-name "%s";' % configRegistry.get('hostname', '')

    print 'send host-name "%s";' % configRegistry.get('hostname', '')

Lines 21-29 if configRegistry.is_true('dhclient/options/ddns', False):	Link Here

    else:

    else:

        print 'send fqdn.fqdn "%s.%s";' % (configRegistry.get('hostname', ''), configRegistry.get('domainname', ''))

        print 'send fqdn.fqdn "%s.%s";' % (configRegistry.get('hostname', ''), configRegistry.get('domainname', ''))

    if configRegistry.is_true('dhclient/options/ddns/serverupdate', True):

    if configRegistry.is_true('dhclient/options/ddns/serverupdate', True):

    	print 'send fqdn.server-update on;'

        print 'send fqdn.server-update on;'

    else:

    else:

    	print 'send fqdn.server-update off;'

        print 'send fqdn.server-update off;'

    print 'send fqdn.encoded on;'

    print 'send fqdn.encoded on;'

@!@

@!@

#send host-name "andare.fugue.com";

#send host-name "andare.fugue.com";

Lines 32-46 if configRegistry.is_true('dhclient/options/ddns', False):	Link Here

#supersede domain-name "fugue.com home.vix.com";

#supersede domain-name "fugue.com home.vix.com";

#prepend domain-name-servers 127.0.0.1;

#prepend domain-name-servers 127.0.0.1;

request subnet-mask, broadcast-address, time-offset, routers,

request subnet-mask, broadcast-address, time-offset, routers,

	domain-name, domain-name-servers, host-name,

	domain-name, domain-name-servers, domain-search, host-name,

	netbios-name-servers, netbios-scope, interface-mtu;

	netbios-name-servers, netbios-scope, interface-mtu,

	rfc3442-classless-static-routes, ntp-servers;

#require subnet-mask, domain-name-servers;

#require subnet-mask, domain-name-servers;

@!@

@!@

print 'timeout %s;' % configRegistry.get( 'dhclient/options/timeout', '30' )

print 'timeout %s;' % configRegistry.get( 'dhclient/options/timeout', '30' )

print 'retry %s;' % configRegistry.get( 'dhclient/options/retry', '60' )

print 'retry %s;' % configRegistry.get( 'dhclient/options/retry', '60' )

@!@

@!@

# reboot + timout should be below the 45 secs that NetworkManager waits before terminating dhclient, otherwise fallback script is not run

# reboot + timout should be below the 45 secs that NetworkManager waits before terminating dhclient, otherwise fallback script is not run

reboot 5;

reboot 5;

#select-timeout 5;

#select-timeout 5;

#initial-interval 2;

#initial-interval 2;

#script "/etc/dhcp3/dhclient-script";

#script "/etc/dhcp3/dhclient-script";

Lines 78-84 if configRegistry.is_true('dhclient/linklocal/fallback', True):	Link Here

			iface = k.split('/')[1]

			iface = k.split('/')[1]

			r1 = random.randrange(0, 255) # 0 to 254

			r1 = random.randrange(0, 255) # 0 to 254

			r2 = random.randrange(0, 255) # 0 to 254

			r2 = random.randrange(0, 255) # 0 to 254

			d = datetime.fromtimestamp(time.time() + (6*3600)) # expire in six hours

			d = datetime.fromtimestamp(time.time() + (6*3600)) # expire in six hours

			print 'lease {'

			print 'lease {'




univention-network-manager (3.0.23-1) unstable; urgency=low

  * Transition from /etc/dhcp3/ to /etc/dhcp/ (Bug #27829)
  * Move common data to univention-network-common.
  * Update /etc/dhcp/dhclient.conf template from lates Debian file.
  * Move debug files to /var/run/ to prevent symlink attack.

 -- Philipp Hahn <hahn@univention.de>  Wed, 04 Jul 2012 20:29:33 +0200

univention-network-manager (3.0.21-1) unstable; urgency=low

  * added differentiation between server side ddns and

(-)a/branches/ucs-3.0/ucs/base/univention-network-manager/debian/control (+4 lines)

Lines 26-31 Package: univention-ifplugd	Link Here

Architecture: all

Architecture: all

Conflicts: network-manager,

Conflicts: network-manager,

 univention-network-manager

 univention-network-manager

Pre-Depends: dpkg (>= 1.15.7.2)

Depends: ${misc:Depends},

Depends: ${misc:Depends},

 univention-network-common,

 univention-network-common,

 ifplugd,

 ifplugd,

Lines 41-48 Description: UCS - Support for ifplugd	Link Here

Package: univention-network-common

Package: univention-network-common

Architecture: all

Architecture: all

Depends: ${misc:Depends},

Depends: ${misc:Depends},

 ${python:Depends},

 univention-management-console-server,

 univention-management-console-server,

 python-netifaces

 python-netifaces

Replaces: univention-network-manager,

 univention-ifplugd

Description: UCS - Network tools for ifplugd and network-manager (common)

Description: UCS - Network tools for ifplugd and network-manager (common)

 This package installs tools required by univention-ifplugd and

 This package installs tools required by univention-ifplugd and

 univention-network-manager.

 univention-network-manager.

(-)a/branches/ucs-3.0/ucs/base/univention-network-manager/debian/rules (-3 / +2 lines)

Lines 37-45 override_dh_auto_test:	Link Here

override_dh_fixperms:

override_dh_fixperms:

	dh_fixperms

	dh_fixperms

	chmod 755 debian/univention-network-manager/usr/lib/NetworkManager/nm-dhcp-client.action

	chmod 755 debian/univention-network-manager/usr/lib/NetworkManager/nm-dhcp-client.action

	chmod 755 debian/univention-network-manager/etc/network/if-pre-up.d/10_dhclientconf

	chmod 755 debian/univention-network-common/etc/network/if-pre-up.d/10_dhclientconf

	chmod 755 debian/univention-ifplugd/etc/network/if-pre-up.d/10_dhclientconf

	chmod 755 debian/univention-ifplugd/etc/dhcp/dhclient-enter-hooks.d/univention-ifplugd-enter-hook

	chmod 755 debian/univention-ifplugd/etc/dhcp3/dhclient-enter-hooks.d/univention-ifplugd-enter-hook

override_dh_installinit:

override_dh_installinit:

	dh_installinit -punivention-network-common --no-start -u"defaults 99"

	dh_installinit -punivention-network-common --no-start -u"defaults 99"

(-)a/branches/ucs-3.0/ucs/base/univention-network-manager/debian/univention-ifplugd.dirs (-4 / +4 lines)

Lines 1-4	Link Here

etc/network/if-up.d/

etc/network/if-up.d

etc/network/if-down.d/

etc/network/if-down.d

etc/dhcp3/dhclient-enter-hooks.d

etc/dhcp/dhclient-enter-hooks.d

etc/dhcp3/dhclient-enter-hooks.univention.d

etc/dhcp/dhclient-enter-hooks.univention.d

(-)a/branches/ucs-3.0/ucs/base/univention-network-manager/debian/univention-ifplugd.install (-6 / +1 lines)

Lines 1-6	Link Here

etc/network/ucs-network-tools etc/network/

univention-ifplugd-enter-hook etc/dhcp/dhclient-enter-hooks.d/

etc/network/if-up.d/[0-9]* etc/network/if-up.d/

etc/network/if-down.d/[0-9]* etc/network/if-down.d/

etc/network/if-pre-up.d/[0-9]* etc/network/if-pre-up.d/

etc/dhcp/* etc/dhcp/

univention-ifplugd-enter-hook etc/dhcp3/dhclient-enter-hooks.d/




eval "$(univention-config-registry shell)"

if [ -z "$ifplugd_action_mount" ]; then
	ifplugd_action_mount="yes"
fi

# set "interfaces/handler" in any case to "ifplugd"
univention-config-registry set \
	interfaces/handler=ifplugd \
	networkmanager/action/mount?"no" \
	networkmanager/dhcp/options/fallback?"no" \
	dhclient/options/timeout?"40" \
	dhclient/options/retry?"60"
univention-config-registry set dhclient/options/retry?"60"

for i in $(seq 0 10); do
	var="interfaces_eth${i}_networkmanager"

	fi
fi

# Transition from /etc/dhcp3/ to /etc/dhcp/
dpkg-maintscript-helper mv_conffile \
    "/etc/dhcp3/dhclient-enter-hooks.d/univention-ifplugd-enter-hook" \
    "/etc/dhcp/dhclient-enter-hooks.d/univention-ifplugd-enter-hook" \
    3.0.23~ univention-ifplugd -- "$@"
dpkg-maintscript-helper rm_conffile \
    "/etc/dhcp3/dhclient-enter-hooks.univention.d/00_fallback.py" \
    3.0.23~ univention-ifplugd -- "$@"
if [ "$1" = "configure" -a -n "$2" ] && dpkg --compare-versions "$2" lt 3.0.23~;
then
    rmdir -p /etc/dhcp3/dhclient-enter-hooks.d /etc/dhcp3/dhclient-enter-hooks.univention.d 2>/dev/null || true
fi

exit 0




#! /bin/sh
#
# Univention Network ifplugd
#  preinst script
#
# Copyright 2004-2012 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/>.

set -e

#DEBHELPER#

dpkg-maintscript-helper mv_conffile \
    "/etc/dhcp3/dhclient-enter-hooks.d/univention-ifplugd-enter-hook" \
    "/etc/dhcp/dhclient-enter-hooks.d/univention-ifplugd-enter-hook" \
    3.0.23~ univention-ifplugd -- "$@"
dpkg-maintscript-helper rm_conffile \
    "/etc/dhcp3/dhclient-enter-hooks.univention.d/00_fallback.py" \
    3.0.23~ univention-ifplugd -- "$@"

exit 0




Type: file
File: etc/dhcp/dhclient.conf
Variables: dhclient/options/timeout
Variables: dhclient/options/retry
Variables: dhclient/options/ddns
Variables: dhclient/options/ddns/zone
Variables: dhclient/options/ddns/serverupdate
Variables: dhclient/linklocal/fallback
Variables: hostname
Variables: domainname

Type: file
File: etc/default/ifplugd
Variables: interfaces/.*




Description[en]=If this variable is set the home directory share will be mounted via NFS if possible
Type=bool
Categories=system-base

[dhclient/options/timeout]
Description[de]=Definiert die Zeit in Sekunden, die der DHCP-Client versucht eine IP-Konfiguration zu beziehen
Description[en]=Defines the amount of time in seconds that the DHCP clients tries to get an IP configuration
Type=int
Categories=system-base

[dhclient/options/retry]
Description[de]=Definiert die Zeit in Sekunden, die der DHCP-Client vor einem erneuten Versuch wartet
Description[en]=Defines the amount of time in seconds that the DHCP clients waits before trying again
Type=int
Categories=system-base

[dhclient/linklocal/fallback]
Description[de]=Definiert ob eine Link Local IP Adresse konfiguriert wird, wenn per DHCP keine IP Adresse bezogen werden konnte (Default: true)
Description[en]=Defines whether a link local IP address is configured if no IP address could be obtained via DHCP (default: true)
Type=str
Categories=system-base

(-)a/branches/ucs-3.0/ucs/base/univention-network-manager/debian/univention-network-common.install (+5 lines)

Line 1	Link Here

etc/network/ucs-network-tools etc/network/

etc/network/if-up.d/[0-9]* etc/network/if-up.d/

etc/network/if-down.d/[0-9]* etc/network/if-down.d/

etc/network/if-pre-up.d/[0-9]* etc/network/if-pre-up.d/

etc/dhcp/* etc/dhcp/

univention-register-network-address usr/sbin

univention-register-network-address usr/sbin

(-)a/branches/ucs-3.0/ucs/base/univention-network-manager/debian/univention-network-common.univention-config-registry (+10 lines)

Line 0	Link Here

Type: file

File: etc/dhcp/dhclient.conf

Variables: dhclient/options/timeout

Variables: dhclient/options/retry

Variables: dhclient/options/ddns

Variables: dhclient/options/ddns/zone

Variables: dhclient/options/ddns/serverupdate

Variables: dhclient/linklocal/fallback

Variables: hostname

Variables: domainname




[dhclient/options/timeout]
Description[de]=Definiert die Zeit in Sekunden, die der DHCP-Client versucht eine IP-Konfiguration zu beziehen
Description[en]=Defines the amount of time in seconds that the DHCP clients tries to get an IP configuration
Type=int
Categories=system-base

[dhclient/options/retry]
Description[de]=Definiert die Zeit in Sekunden, die der DHCP-Client vor einem erneuten Versuch wartet
Description[en]=Defines the amount of time in seconds that the DHCP clients waits before trying again
Type=int
Categories=system-base

[dhclient/linklocal/fallback]
Description[de]=Definiert ob eine Link Local IP Adresse konfiguriert wird, wenn per DHCP keine IP Adresse bezogen werden konnte (Default: true)
Description[en]=Defines whether a link local IP address is configured if no IP address could be obtained via DHCP (default: true)
Type=str
Categories=system-base

[dhclient/options/ddns]
Description[de]=Aktiviert DDNS per DHCP für externe DNS-Dienste [disabled]
Description[en]=Activates DDNS via DHCP for external DNS-Services [disabled]
Type=bool
Categories=system-base

[dhclient/options/ddns/zone]
Description[de]=Definiert die DNS Zone, die bei aktiviertem DDNS per DHCP verwendet werden soll [domainname]
Description[en]=Defines the DNS Zone which will be updated when DDNS via DHCP is enabled [domainname]
Type=str
Categories=system-base

[dhclient/options/ddns/serverupdate]
Description[de]=Ersucht den DHCP-Server den A-Record in der Forward-Zone zu aktualisieren (Standard: yes)
Description[en]=Request DHCP server to update the A record in the forward zone (default: yes)
Type=bool
Categories=system-base

(-)a/branches/ucs-3.0/ucs/base/univention-network-manager/debian/univention-network-manager.install (-4 lines)

Lines 1-5	Link Here

etc/network/ucs-network-tools etc/network/

etc/network/if-up.d/[0-9]* etc/network/if-up.d/

etc/network/if-down.d/[0-9]* etc/network/if-down.d/

etc/network/if-pre-up.d/[0-9]* etc/network/if-pre-up.d/

nm-dhcp-client.action usr/lib/NetworkManager/

nm-dhcp-client.action usr/lib/NetworkManager/




Variables: networkmanager/group

Type: file
File: etc/dhcp/dhclient.conf
Variables: dhclient/options/timeout
Variables: dhclient/options/retry
Variables: dhclient/options/ddns
Variables: dhclient/options/ddns/zone
Variables: dhclient/options/ddns/serverupdate
Variables: dhclient/linklocal/fallback
Variables: hostname
Variables: domainname

Type: file
File: etc/NetworkManager/nm-system-settings.conf
Variables: networkmanager/all_interfaces




Description[en]=If this variable is set the home directory share will be mounted via NFS if possible
Type=bool
Categories=system-base

[dhclient/options/timeout]
Description[de]=Definiert die Zeit in Sekunden, die der DHCP-Client versucht eine IP-Konfiguration zu beziehen
Description[en]=Defines the amount of time in seconds that the DHCP clients tries to get an IP configuration
Type=int
Categories=system-base

[dhclient/options/retry]
Description[de]=Definiert die Zeit in Sekunden, die der DHCP-Client vor einem erneuten Versuch wartet
Description[en]=Defines the amount of time in seconds that the DHCP clients waits before trying again
Type=int
Categories=system-base

[dhclient/linklocal/fallback]
Description[de]=Definiert ob eine Link Local IP Adresse konfiguriert wird, wenn per DHCP keine IP Adresse bezogen werden konnte (Default: true)
Description[en]=Defines whether a link local IP address is configured if no IP address could be obtained via DHCP (default: true)
Type=str
Categories=system-base

[dhclient/options/ddns]
Description[de]=Aktiviert DDNS per DHCP für externe DNS-Dienste [disabled]
Description[en]=Activates DDNS via DHCP for external DNS-Services [disabled]
Type=bool
Categories=system-base

[dhclient/options/ddns/zone]
Description[de]=Definiert die DNS Zone, die bei aktiviertem DDNS per DHCP verwendet werden soll [domainname]
Description[en]=Defines the DNS Zone which will be updated when DDNS via DHCP is enabled [domainname]
Type=str
Categories=system-base

[dhclient/options/ddns/serverupdate]
Description[de]=Ersucht den DHCP-Server den A-Record in der Forward-Zone zu aktualisieren (Standard: yes)
Description[en]=Request DHCP server to update the A record in the forward zone (default: yes)
Type=bool
Categories=system-base

(-)a/branches/ucs-3.0/ucs/base/univention-network-manager/nm-dhcp-client.action (-4 / +2 lines)

Lines 42-51 for script in $(find ${HOOKS_DIR} -type f -name ".py" -o -name ".sh"); do	Link Here

done

done

# debugging

# debugging

set | egrep '(new_|old_|reason)' > /tmp/nm-env

env | egrep '(new_|old_|reason)' > /var/run/nm-env

/usr/lib/NetworkManager/nm-dhcp-client.action.real

/usr/lib/NetworkManager/nm-dhcp-client.action.real

exit 0

exit 0

(-)a/branches/ucs-3.0/ucs/base/univention-network-manager/univention-ifplugd-enter-hook (-3 / +3 lines)

Lines 30-39	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

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

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

HOOKS_DIR=/etc/dhcp3/dhclient-enter-hooks.univention.d/

HOOKS_DIR=/etc/dhcp/dhclient-enter-hooks.univention.d/

# debugging

# debugging

set | egrep '(new_|old_|reason)' > /tmp/ifplugd-env-old

env | egrep '(new_|old_|reason)' > /var/run/ifplugd-env-old

# call hooks: each hook script might write shell script to standard output to change environment variables

# call hooks: each hook script might write shell script to standard output to change environment variables

for script in $(find ${HOOKS_DIR} -type f -name "*.py" -o -name "*.sh"); do

for script in $(find ${HOOKS_DIR} -type f -name "*.py" -o -name "*.sh"); do

Lines 41-44 for script in $(find ${HOOKS_DIR} -type f -name ".py" -o -name ".sh"); do	Link Here

done

done

# debugging

# debugging

set | egrep '(new_|old_|reason)' > /tmp/ifplugd-env-new

env | egrep '(new_|old_|reason)' > /var/run/ifplugd-env-new

(-)a/branches/ucs-3.0/ucs/base/univention-network-manager/univention-register-network-address (-1 / +1 lines)

Lines 91-95 if __name__ == '__main__':	Link Here

				retcode += 1

				retcode += 1

		elif options.verbose:

		elif options.verbose:

			print 'INFO: %s is not configured as dhcp device.' % iface

			print 'INFO: %s is not configured as dhcp device.' % iface

	sys.exit(retcode)

	sys.exit(retcode)

(-)a/branches/ucs-3.0/ucs/services/univention-dhcp/debian/univention-dhcp.preinst (-2 / +2 lines)

Lines 1-9	Link Here

#! /bin/sh

#! /bin/sh

# Univention DHCP

# Univention DHCP

#  ppreinst script

#  preinst script

# Copyright 2004-2011 Univention GmbH

# Copyright 2004-2012 Univention GmbH

# http://www.univention.de/

# http://www.univention.de/

Return to bug 27829