Attachment 6627 Details for Bug 37119 – patch

[patch] patch

37119.patch (text/plain), 8.46 KB, created by Florian Best on 2015-01-23 10:19:32 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Florian Best

Created: 2015-01-23 10:19:32 CET

Size: 8.46 KB

patch

obsolete

>diff --git a/ucs-4.0-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/domaincontroller_backup.py b/ucs-4.0-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/domaincontroller_backup.py
>index 39a281a..af936f8 100644
>--- a/ucs-4.0-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/domaincontroller_backup.py
>+++ b/ucs-4.0-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/domaincontroller_backup.py
>@@ -428,7 +428,7 @@ def open(self):
> 
> 		tmppos=univention.admin.uldap.position(self.position.getDomain())
> 
>-		if self.dn:
>+		if self.exists():
> 
> 			if 'posix' in self.options and not self.info.get( 'primaryGroup' ):
> 				primaryGroupNumber=self.oldattr.get('gidNumber',[''])[0]
>diff --git a/ucs-4.0-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/domaincontroller_master.py b/ucs-4.0-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/domaincontroller_master.py
>index 370c20d..fe68958 100644
>--- a/ucs-4.0-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/domaincontroller_master.py
>+++ b/ucs-4.0-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/domaincontroller_master.py
>@@ -427,7 +427,7 @@ def open(self):
> 		self.oldPrimaryGroupDn=0
> 
> 
>-		if self.dn:
>+		if self.exists():
> 
> 			if 'posix' in self.options and not self.info.get( 'primaryGroup' ):
> 				primaryGroupNumber=self.oldattr.get('gidNumber',[''])[0]
>diff --git a/ucs-4.0-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/domaincontroller_slave.py b/ucs-4.0-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/domaincontroller_slave.py
>index de856c6..afbc893 100644
>--- a/ucs-4.0-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/domaincontroller_slave.py
>+++ b/ucs-4.0-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/domaincontroller_slave.py
>@@ -429,7 +429,7 @@ def open(self):
> 
> 		tmppos=univention.admin.uldap.position(self.position.getDomain())
> 
>-		if self.dn:
>+		if self.exists():
> 
> 			if 'posix' in self.options and not self.info.get( 'primaryGroup' ):
> 				primaryGroupNumber=self.oldattr.get('gidNumber',[''])[0]
>diff --git a/ucs-4.0-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/ipmanagedclient.py b/ucs-4.0-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/ipmanagedclient.py
>index 345bf1c..df8f088 100644
>--- a/ucs-4.0-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/ipmanagedclient.py
>+++ b/ucs-4.0-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/ipmanagedclient.py
>@@ -261,7 +261,7 @@ def open(self):
> 		univention.admin.handlers.simpleComputer.open( self )
> 		self.nagios_open()
> 
>-		if not self.dn:
>+		if not self.exists():
> 			return
> 
> 		self.save()
>diff --git a/ucs-4.0-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/linux.py b/ucs-4.0-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/linux.py
>index 036b653..5189415 100644
>--- a/ucs-4.0-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/linux.py
>+++ b/ucs-4.0-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/linux.py
>@@ -374,7 +374,7 @@ def open(self):
> 		self.modifypassword=0
> 
> 
>-		if self.dn:
>+		if self.exists():
> 
> 			if 'posix' in self.options and not self.info.get( 'primaryGroup' ):
> 				primaryGroupNumber=self.oldattr.get('gidNumber',[''])[0]
>diff --git a/ucs-4.0-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/macos.py b/ucs-4.0-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/macos.py
>index f67d12d..67cf1a3 100644
>--- a/ucs-4.0-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/macos.py
>+++ b/ucs-4.0-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/macos.py
>@@ -389,7 +389,7 @@ def open(self):
> 
> 		tmppos=univention.admin.uldap.position(self.position.getDomain())
> 
>-		if self.dn:
>+		if self.exists():
> 
> 			if 'posix' in self.options and not self.info.get( 'primaryGroup' ):
> 				primaryGroupNumber=self.oldattr.get('gidNumber',[''])[0]
>diff --git a/ucs-4.0-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/memberserver.py b/ucs-4.0-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/memberserver.py
>index e75477b..6c55d8d 100644
>--- a/ucs-4.0-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/memberserver.py
>+++ b/ucs-4.0-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/memberserver.py
>@@ -418,7 +418,7 @@ def open(self):
> 		self.newPrimaryGroupDn=0
> 		self.oldPrimaryGroupDn=0
> 
>-		if self.dn:
>+		if self.exists():
> 
> 			if 'posix' in self.options and not self.info.get( 'primaryGroup' ):
> 				primaryGroupNumber=self.oldattr.get('gidNumber',[''])[0]
>diff --git a/ucs-4.0-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/trustaccount.py b/ucs-4.0-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/trustaccount.py
>index e6b59a7..0050085 100644
>--- a/ucs-4.0-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/trustaccount.py
>+++ b/ucs-4.0-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/trustaccount.py
>@@ -119,7 +119,7 @@ def open(self):
> 
> 		self.options=['samba']
> 		self.modifypassword=1
>-		if self.dn:
>+		if self.exists():
> 			self['password']='********'
> 			self.modifypassword=0
> 
>diff --git a/ucs-4.0-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/ubuntu.py b/ucs-4.0-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/ubuntu.py
>index 2beac3e..59cd47f 100644
>--- a/ucs-4.0-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/ubuntu.py
>+++ b/ucs-4.0-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/ubuntu.py
>@@ -374,7 +374,7 @@ def open(self):
> 		self.modifypassword=0
> 
> 
>-		if self.dn:
>+		if self.exists():
> 
> 			if 'posix' in self.options and not self.info.get( 'primaryGroup' ):
> 				primaryGroupNumber=self.oldattr.get('gidNumber',[''])[0]
>diff --git a/ucs-4.0-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/windows.py b/ucs-4.0-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/windows.py
>index 55675cc..d4fedf3 100644
>--- a/ucs-4.0-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/windows.py
>+++ b/ucs-4.0-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/windows.py
>@@ -406,7 +406,7 @@ def open(self):
> 
> 		tmppos=univention.admin.uldap.position(self.position.getDomain())
> 
>-		if self.dn:
>+		if self.exists():
> 
> 			if 'posix' in self.options and not self.info.get( 'primaryGroup' ):
> 				primaryGroupNumber=self.oldattr.get('gidNumber',[''])[0]
>diff --git a/ucs-4.0-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/windows_domaincontroller.py b/ucs-4.0-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/windows_domaincontroller.py
>index bf0b30d..5d8235e 100644
>--- a/ucs-4.0-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/windows_domaincontroller.py
>+++ b/ucs-4.0-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/windows_domaincontroller.py
>@@ -415,7 +415,7 @@ def open(self):
> 
> 		tmppos=univention.admin.uldap.position(self.position.getDomain())
> 
>-		if self.dn:
>+		if self.exists():
> 
> 			if 'posix' in self.options and not self.info.get( 'primaryGroup' ):
> 				primaryGroupNumber=self.oldattr.get('gidNumber',[''])[0]

Actions: View | Diff

Attachments on bug 37119: 6627