|
Line
Link Here
|
| 0 |
-- a/ucs/management/univention-directory-manager-modules/modules/univention/admin/handlers/__init__.py |
0 |
++ b/ucs/management/univention-directory-manager-modules/modules/univention/admin/handlers/__init__.py |
|
Lines 2001-2012
class simpleComputer( simpleLdap ):
Link Here
|
| 2001 |
univention.admin.allocators.release( self.lo, self.position, 'aRecord', ipAddress ) |
2001 |
univention.admin.allocators.release( self.lo, self.position, 'aRecord', ipAddress ) |
| 2002 |
|
2002 |
|
| 2003 |
# remove computer from groups |
2003 |
# remove computer from groups |
| 2004 |
for group in self['groups']: |
2004 |
groups = copy.deepcopy(self['groups']) |
| 2005 |
groupObject=univention.admin.objects.get(univention.admin.modules.get('groups/group'), self.co, self.lo, self.position, group) |
2005 |
if self.oldinfo.get('primaryGroup'): |
| 2006 |
groupObject.open() |
2006 |
groups.append( self.oldinfo.get('primaryGroup') ) |
| 2007 |
if self.dn in groupObject['hosts']: |
2007 |
for group in groups: |
| 2008 |
groupObject['hosts'].remove(self.dn) |
2008 |
groupObject = univention.admin.objects.get(univention.admin.modules.get('groups/group'), self.co, self.lo, self.position, group) |
| 2009 |
groupObject.modify(ignore_license=1) |
2009 |
groupObject.fast_member_remove( [ self.dn ], self.oldattr.get('uid',[]), ignore_license=1 ) |
| 2010 |
|
2010 |
|
| 2011 |
def update_groups(self): |
2011 |
def update_groups(self): |
| 2012 |
if not self.hasChanged('groups') and \ |
2012 |
if not self.hasChanged('groups') and \ |
| 2013 |
-- a/ucs/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/domaincontroller_backup.py |
2013 |
++ b/ucs/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/domaincontroller_backup.py |
|
Lines 450-456
class object(univention.admin.handlers.simpleComputer, nagios.Support):
Link Here
|
| 450 |
res=univention.admin.config.getDefaultValue(self.lo, 'univentionDefaultDomainControllerMasterGroup', position=self.position) |
450 |
res=univention.admin.config.getDefaultValue(self.lo, 'univentionDefaultDomainControllerMasterGroup', position=self.position) |
| 451 |
if res: |
451 |
if res: |
| 452 |
self['primaryGroup']=res |
452 |
self['primaryGroup']=res |
| 453 |
self.save() |
453 |
#self.save() |
| 454 |
|
454 |
|
| 455 |
|
455 |
|
| 456 |
|
456 |
|
| 457 |
-- a/ucs/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/domaincontroller_master.py |
457 |
++ b/ucs/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/domaincontroller_master.py |
|
Lines 448-454
class object(univention.admin.handlers.simpleComputer, nagios.Support):
Link Here
|
| 448 |
res=univention.admin.config.getDefaultValue(self.lo, 'univentionDefaultDomainControllerMasterGroup', position=self.position) |
448 |
res=univention.admin.config.getDefaultValue(self.lo, 'univentionDefaultDomainControllerMasterGroup', position=self.position) |
| 449 |
if res: |
449 |
if res: |
| 450 |
self['primaryGroup']=res |
450 |
self['primaryGroup']=res |
| 451 |
self.save() |
451 |
#self.save() |
| 452 |
|
452 |
|
| 453 |
|
453 |
|
| 454 |
|
454 |
|
| 455 |
-- a/ucs/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/domaincontroller_slave.py |
455 |
++ b/ucs/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/domaincontroller_slave.py |
|
Lines 450-456
class object(univention.admin.handlers.simpleComputer, nagios.Support):
Link Here
|
| 450 |
res=univention.admin.config.getDefaultValue(self.lo, 'univentionDefaultDomainControllerGroup', position=self.position) |
450 |
res=univention.admin.config.getDefaultValue(self.lo, 'univentionDefaultDomainControllerGroup', position=self.position) |
| 451 |
if res: |
451 |
if res: |
| 452 |
self['primaryGroup']=res |
452 |
self['primaryGroup']=res |
| 453 |
self.save() |
453 |
#self.save() |
| 454 |
|
454 |
|
| 455 |
|
455 |
|
| 456 |
|
456 |
|
| 457 |
-- a/ucs/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/macos.py |
457 |
++ b/ucs/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/macos.py |
|
Lines 361-367
class object(univention.admin.handlers.simpleComputer, nagios.Support):
Link Here
|
| 361 |
self['primaryGroup']=res |
361 |
self['primaryGroup']=res |
| 362 |
|
362 |
|
| 363 |
|
363 |
|
| 364 |
self.save() |
364 |
# self.save() |
| 365 |
|
365 |
|
| 366 |
def exists(self): |
366 |
def exists(self): |
| 367 |
return self._exists |
367 |
return self._exists |
| 368 |
-- a/ucs/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/managedclient.py |
368 |
++ b/ucs/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/managedclient.py |
|
Lines 415-421
class object(univention.admin.handlers.simpleComputer, nagios.Support):
Link Here
|
| 415 |
self['primaryGroup']=res |
415 |
self['primaryGroup']=res |
| 416 |
|
416 |
|
| 417 |
|
417 |
|
| 418 |
self.save() |
418 |
# self.save() |
| 419 |
|
419 |
|
| 420 |
def exists(self): |
420 |
def exists(self): |
| 421 |
return self._exists |
421 |
return self._exists |
| 422 |
-- a/ucs/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/memberserver.py |
422 |
++ b/ucs/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/memberserver.py |
|
Lines 440-446
class object(univention.admin.handlers.simpleComputer, nagios.Support):
Link Here
|
| 440 |
res=univention.admin.config.getDefaultValue(self.lo, 'univentionDefaultMemberserverGroup', position=self.position) |
440 |
res=univention.admin.config.getDefaultValue(self.lo, 'univentionDefaultMemberserverGroup', position=self.position) |
| 441 |
if res: |
441 |
if res: |
| 442 |
self['primaryGroup']=res |
442 |
self['primaryGroup']=res |
| 443 |
self.save() |
443 |
#self.save() |
| 444 |
|
444 |
|
| 445 |
|
445 |
|
| 446 |
def exists(self): |
446 |
def exists(self): |
| 447 |
-- a/ucs/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/mobileclient.py |
447 |
++ b/ucs/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/mobileclient.py |
|
Lines 412-418
class object(univention.admin.handlers.simpleComputer, nagios.Support):
Link Here
|
| 412 |
self['primaryGroup']=res |
412 |
self['primaryGroup']=res |
| 413 |
|
413 |
|
| 414 |
|
414 |
|
| 415 |
self.save() |
415 |
# self.save() |
| 416 |
|
416 |
|
| 417 |
def exists(self): |
417 |
def exists(self): |
| 418 |
return self._exists |
418 |
return self._exists |