Attachment 6769 Details for Bug 38073 – patch

[patch] patch

38073.patch (text/plain), 2.29 KB, created by Florian Best on 2015-03-18 11:32:57 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Florian Best

Created: 2015-03-18 11:32:57 CET

Size: 2.29 KB

patch

obsolete

>diff --git a/ucs-4.0-1/management/univention-directory-manager-modules/modules/univention/admin/handlers/__init__.py b/ucs-4.0-1/management/univention-directory-manager-modules/modules/univention/admin/handlers/__init__.py
>index 4d76507..cf44816 100644
>--- a/ucs-4.0-1/management/univention-directory-manager-modules/modules/univention/admin/handlers/__init__.py
>+++ b/ucs-4.0-1/management/univention-directory-manager-modules/modules/univention/admin/handlers/__init__.py
>@@ -1420,7 +1420,8 @@ def __modify_dhcp_object( self, position, name, ip, mac ):
> 			results = self.lo.searchDn( base = position, scope = 'domain', filter = '(&(objectClass=univentionDhcpHost)(|(cn=%s)(cn=%s_uv*)))' % ( name, name ), unique = 0 )
> 			if not results:
> 				self.lo.add( 'cn = %s,%s'% ( name, position ), [
>-						( 'objectClass', [ 'top', 'univentionDhcpHost' ] ),\
>+						( 'objectClass', [ 'top', 'univentionObject', 'univentionDhcpHost' ] ),\
>+						( 'univentionObjectType', [ 'dhcp/host' ]),\
> 						( 'cn', name ),\
> 						( 'univentionDhcpFixedAddress', [ ip ] ),\
> 						( 'dhcpHWAddress', [ ethernet ] ) ] )
>@@ -1439,7 +1440,8 @@ def __modify_dhcp_object( self, position, name, ip, mac ):
> 								n = 1
> 
> 				self.lo.add( 'cn = %s_uv%d,%s'% ( name, n, position ), [
>-						( 'objectClass', [ 'top', 'univentionDhcpHost' ] ),\
>+						( 'objectClass', [ 'top', 'univentionObject', 'univentionDhcpHost' ] ),\
>+						( 'univentionObjectType', [ 'dhcp/host' ]),\
> 						( 'cn', '%s_uv%d' % ( name,n ) ),\
> 						( 'univentionDhcpFixedAddress', [ ip ] ),\
> 						( 'dhcpHWAddress', [ ethernet ] ) ] )
>@@ -1897,7 +1899,8 @@ def __add_dns_alias_object( self, name, dnsForwardZone, dnsAliasZoneContainer, a
> 			results = self.lo.search( base = dnsAliasZoneContainer, scope = 'domain', attr = [ 'cNAMERecord' ], filter = 'relativeDomainName=%s' % ( alias ), unique = 0 )
> 			if not results:
> 				self.lo.add( 'relativeDomainName=%s,%s'% ( alias, dnsAliasZoneContainer ), [\
>-									( 'objectClass', [ 'top', 'dNSZone' ]),\
>+									( 'objectClass', [ 'top', 'dNSZone', 'univentionObject' ]),\
>+									( 'univentionObjectType', [ 'dns/alias' ] ),\
> 									( 'zoneName', univention.admin.uldap.explodeDn( dnsAliasZoneContainer, 1 )[ 0 ]),\
> 									( 'cNAMERecord', [ "%s.%s." % (name, dnsForwardZone) ]),\
> 									( 'relativeDomainName', [ alias ])])

Actions: View | Diff

Attachments on bug 38073: 6769