develop
asamoukin 15 years ago
parent 42b5a2c6d7
commit 4c3618f859

@ -10766,34 +10766,34 @@ with another option."))
data.append((_("Home directory"),"homeDirectory"))
if service == "samba":
for i in searchRes:
winProfPath = os.path.join(\
clVars.Get("sr_samba_winprof_path"),
homePath = os.path.join(\
clVars.Get("sr_samba_home_path"),
i[0][1]['uid'][0])
if os.path.exists(winProfPath):
i[0][1]['winProfPath'] = [winProfPath]
data.append((_("Windows profile"),"winProfPath"))
if os.path.exists(homePath):
i[0][1]['homePath'] = [homePath]
data.append((_("Home directory"),"homePath"))
sharePath = clVars.Get("sr_samba_share_path")
if os.path.exists(sharePath):
i[0][1]['sharePath'] = [sharePath]
data.append((_("Share directory"),"sharePath"))
linProfPath = os.path.join(\
clVars.Get("sr_samba_linprof_path"),
i[0][1]['uid'][0])
if os.path.exists(linProfPath):
i[0][1]['linProfPath'] = [linProfPath]
data.append((_("Linux profile"),"linProfPath"))
homePath = os.path.join(\
clVars.Get("sr_samba_home_path"),
winProfPath = os.path.join(\
clVars.Get("sr_samba_winprof_path"),
i[0][1]['uid'][0])
if os.path.exists(homePath):
i[0][1]['homePath'] = [homePath]
data.append((_("Home directory"),"homePath"))
if os.path.exists(winProfPath):
i[0][1]['winProfPath'] = [winProfPath]
data.append((_("Windows profile"),"winProfPath"))
winLogonPath = os.path.join(\
clVars.Get("sr_samba_winlogon_path"),
i[0][1]['uid'][0])
if os.path.exists(winLogonPath):
i[0][1]['winLogonPath'] = [winLogonPath]
data.append((_("Windows logon"),"winLogonPath"))
sharePath = clVars.Get("sr_samba_share_path")
if os.path.exists(sharePath):
i[0][1]['sharePath'] = [sharePath]
data.append((_("Share directory"),"sharePath"))
attributes = map(lambda x: x[0], data)
retrAttrs = map(lambda x: x[1], data)
@ -10939,7 +10939,7 @@ with another option."))
data = []
delData = []
if service == "samba":
data = [(_("User ID"),"uidNumber"),
data = [(_("ID"),"uidNumber"),
(_("Login"),"uid"),
(_("Name"),"cn"),
(_("Primary group"),"gidNumber"),
@ -10956,7 +10956,7 @@ with another option."))
data = []
delData = []
if service == "unix":
data = [(_("User ID"),"uidNumber"),
data = [(_("ID"),"uidNumber"),
(_("Login"),"uid"),
(_("Name"),"cn"),
(_("Lock"),"shadowExpire"),
@ -10991,21 +10991,21 @@ with another option."))
data = [(_("Login"),"uid"),
(_("Name"),"cn"),
(_("Group"),"departmentNumber"),
(_("Jabber ID"),"mail")
(_("Jabber ID"),"mail"),
(_("Lock"),"initials"),
(_("Password"),"userPassword"),
]
if fields == "short":
delData = [_("Lock"), _("Group"), _("Password")]
elif service == "ftp":
data = [(_("User ID"),"uidNumber"),
data = [(_("ID"),"uidNumber"),
(_("Login"),"uid"),
(_("Name"),"cn"),
(_("Primary group"),"gidNumber"),
(_("Home directory"),"homeDirectory"),
(_("Password"),"userPassword")]
if fields == "short":
delData = [_("User ID"), _("Password"), _("Group")]
delData = [_("ID"), _("Password"), _("Group")]
return (data, delData)
def getAllUsers(self, fields, service):

Loading…
Cancel
Save