|
|
|
@ -3791,10 +3791,10 @@ class servJabber(shareLdap):
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@adminConnectLdap
|
|
|
|
|
def addUserJabberServer(self, userName, options):
|
|
|
|
|
def addUserJabberServer(self, userName, options, checkSetup=True):
|
|
|
|
|
"""Добавляет jabber пользователя"""
|
|
|
|
|
# Проверим установлен ли сервис jabber
|
|
|
|
|
if not self.isServiceSetup("jabber"):
|
|
|
|
|
if checkSetup and not self.isServiceSetup("jabber"):
|
|
|
|
|
return False
|
|
|
|
|
#jabber id
|
|
|
|
|
jabberId = "%s@%s.%s" %(userName,
|
|
|
|
@ -3932,7 +3932,7 @@ class servJabber(shareLdap):
|
|
|
|
|
self.clVars.Get("os_net_hostname"),
|
|
|
|
|
self.clVars.Get("os_net_domain"))
|
|
|
|
|
print _("Enter the %s password" % adminFullName)
|
|
|
|
|
if not self.addUserJabberServer(adminName,{'p':""}):
|
|
|
|
|
if not self.addUserJabberServer(adminName,{'p':""}, False):
|
|
|
|
|
return False
|
|
|
|
|
# Записываем данные администратора сервиса Jabber
|
|
|
|
|
ldapParser = iniLdapParser()
|
|
|
|
@ -4088,10 +4088,11 @@ class servSamba(shareLdap):
|
|
|
|
|
return True
|
|
|
|
|
|
|
|
|
|
@adminConnectLdap
|
|
|
|
|
def addUserSambaServer(self,userName,options,pwDialog=False):
|
|
|
|
|
def addUserSambaServer(self,userName,options,pwDialog=False,
|
|
|
|
|
checkSetup=True):
|
|
|
|
|
"""Добавляет LDAP пользователя в LDAP-сервер"""
|
|
|
|
|
# Проверим установлен ли сервис samba
|
|
|
|
|
if not self.isServiceSetup("samba"):
|
|
|
|
|
if checkSetup and not self.isServiceSetup("samba"):
|
|
|
|
|
return False
|
|
|
|
|
# Добавление машины samba
|
|
|
|
|
if options.has_key('w'):
|
|
|
|
@ -4443,7 +4444,7 @@ class servSamba(shareLdap):
|
|
|
|
|
print _("Enter existing ROOT password")
|
|
|
|
|
pwDialog = [_("ROOT password"),
|
|
|
|
|
_("Retype ROOT password")]
|
|
|
|
|
if not self.addUserSambaServer('root',{'p':""},pwDialog):
|
|
|
|
|
if not self.addUserSambaServer('root',{'p':""},pwDialog,False):
|
|
|
|
|
return False
|
|
|
|
|
clientName = 'client'
|
|
|
|
|
clientGroup = 'client'
|
|
|
|
@ -4460,7 +4461,7 @@ class servSamba(shareLdap):
|
|
|
|
|
return False
|
|
|
|
|
# Добавляем пользователя client для smb ресурса [remote]
|
|
|
|
|
if not self.addUserSambaServer('client',{'f':'','u':clientUid,
|
|
|
|
|
'g':clientGroup}):
|
|
|
|
|
'g':clientGroup}, False,False):
|
|
|
|
|
self.printERROR(_("not created samba user 'client'"))
|
|
|
|
|
return False
|
|
|
|
|
# Если нет то создадим директорию /var/calculate/remote
|
|
|
|
|