View | Details | Raw Unified | Return to bug 36570
Collapse All | Expand All

(-)modules/univention/admin/handlers/computers/windows.py (-3 / +6 lines)
 Lines 457-465    Link Here 
457
		if 'samba' in self.options:
457
		if 'samba' in self.options:
458
			acctFlags=univention.admin.samba.acctFlags(flags={'W':1})
458
			acctFlags=univention.admin.samba.acctFlags(flags={'W':1})
459
			if self.s4connector_present:
459
			if self.s4connector_present:
460
				# In this case Samba 4 must create the SID, the s4 connector will sync the
460
				if hasattr(self, 'sambaRID') and self.info['sambaRID']:
461
				# new sambaSID back from Samba 4.
461
					self.machineSid = self.getMachineSid(self.lo, self.position, self.uidNum, self.get('sambaRID'))
462
				self.machineSid='S-1-4-%s' % self.uidNum
462
				else:
463
					# In this case Samba 4 must create the SID, the s4 connector will sync the
464
					# new sambaSID back from Samba 4.
465
					self.machineSid='S-1-4-%s' % self.uidNum
463
			else:
466
			else:
464
				self.machineSid = self.getMachineSid(self.lo, self.position, self.uidNum, self.get('sambaRID'))
467
				self.machineSid = self.getMachineSid(self.lo, self.position, self.uidNum, self.get('sambaRID'))
465
				self.alloc.append(('sid',self.machineSid))
468
				self.alloc.append(('sid',self.machineSid))

Return to bug 36570