Attachment 8498 Details for Bug 43748 – patch

[patch] patch

43748.patch (text/plain), 1.30 KB, created by Florian Best on 2017-03-07 16:45:04 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Florian Best

Created: 2017-03-07 16:45:04 CET

Size: 1.30 KB

patch

obsolete

>diff --git a/ucs-school-import/usr/share/ucs-school-import/scripts/ucs-school-import b/ucs-school-import/usr/share/ucs-school-import/scripts/ucs-school-import
>index 7196aee..284df03 100755
>--- a/ucs-school-import/usr/share/ucs-school-import/scripts/ucs-school-import
>+++ b/ucs-school-import/usr/share/ucs-school-import/scripts/ucs-school-import
>@@ -809,6 +809,7 @@ def verify_school_ou(schoolNr, co, lo, baseDN, dcName=None, ShareFileServer=None
> 		if not service_exists:
> 			position.setDn("cn=dhcp,%s" % (getDN(schoolNr), ))
> 			object = dhcp_service_module.object(co, lo, position=position, superordinate=superordinate)
>+			object.options.append('options')
> 			object.open()
> 			object["service"] = schoolNr.lower()
> 			object['option'] = ['wpad "http://%s.%s/proxy.pac"' % (dccn, domainname)]
>diff --git a/ucs-school-lib/python/models/dhcp.py b/ucs-school-lib/python/models/dhcp.py
>index 4172303..701c107 100644
>--- a/ucs-school-lib/python/models/dhcp.py
>+++ b/ucs-school-lib/python/models/dhcp.py
>@@ -45,6 +45,7 @@ class DHCPService(UCSSchoolHelperAbstractClass):
> 	domainname = Attribute(_('Domain'))
> 
> 	def do_create(self, udm_obj, lo):
>+		udm_obj.options.append('options')
> 		udm_obj['option'] = ['wpad "http://%s.%s/proxy.pac"' % (self.hostname, self.domainname)]
> 		return super(DHCPService, self).do_create(udm_obj, lo)
>

Actions: View | Diff

Attachments on bug 43748: 8498