|
|
|
@ -14935,7 +14935,6 @@ with another option."))
|
|
|
|
attributes = [x[0] for x in data]
|
|
|
|
attributes = [x[0] for x in data]
|
|
|
|
retrAttrs = [x[1] for x in data]
|
|
|
|
retrAttrs = [x[1] for x in data]
|
|
|
|
retClVars = False
|
|
|
|
retClVars = False
|
|
|
|
#TODO check encoding
|
|
|
|
|
|
|
|
searchRes = self.getQueryLDAP(service, "computers", searchAttr,
|
|
|
|
searchRes = self.getQueryLDAP(service, "computers", searchAttr,
|
|
|
|
searchStr, retrAttrs)
|
|
|
|
searchStr, retrAttrs)
|
|
|
|
if searchRes == False:
|
|
|
|
if searchRes == False:
|
|
|
|
@ -14960,14 +14959,14 @@ with another option."))
|
|
|
|
data.append((attrName, value))
|
|
|
|
data.append((attrName, value))
|
|
|
|
flagFirst = True
|
|
|
|
flagFirst = True
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
data.append(("", value.decode("UTF-8")))
|
|
|
|
data.append(("", value))
|
|
|
|
if service == "samba" and attr == "gidNumber":
|
|
|
|
if service == "samba" and attr == "gidNumber":
|
|
|
|
memberGroups = self._getUserMemberGroups(machName,
|
|
|
|
memberGroups = self._getUserMemberGroups(machName,
|
|
|
|
service)
|
|
|
|
service)
|
|
|
|
attrApp = _("Supplementary groups")
|
|
|
|
attrApp = _("Supplementary groups")
|
|
|
|
if service == "samba":
|
|
|
|
if service == "samba":
|
|
|
|
if value:
|
|
|
|
if value:
|
|
|
|
memberGroups.insert(0, value.decode("UTF-8"))
|
|
|
|
memberGroups.insert(0, value)
|
|
|
|
flagFirst = False
|
|
|
|
flagFirst = False
|
|
|
|
for member_group in memberGroups:
|
|
|
|
for member_group in memberGroups:
|
|
|
|
if not flagFirst:
|
|
|
|
if not flagFirst:
|
|
|
|
|
