|
|
|
@ -4517,7 +4517,7 @@ class servSamba(shareLdap):
|
|
|
|
|
if createDirHome:
|
|
|
|
|
if not self.createUserDir(uid, gid, createDirHome):
|
|
|
|
|
flagError = True
|
|
|
|
|
# Cоздаем иконку на домашеней директории
|
|
|
|
|
# Cоздаем иконку в домашней директории
|
|
|
|
|
if not flagError:
|
|
|
|
|
fileTxt = "[Desktop Entry]\nIcon=user-home"
|
|
|
|
|
fileDirectory = os.path.join(createDirHome,
|
|
|
|
@ -7771,13 +7771,23 @@ class servRepl(shareLdap):
|
|
|
|
|
userNetlogonDir =\
|
|
|
|
|
os.path.join(self.clVars.Get("sr_samba_winlogon_path"),
|
|
|
|
|
userName)
|
|
|
|
|
userDirs = [winProfDir, linProfDir, userHomeDir, userNetlogonDir]
|
|
|
|
|
userDirs = [userHomeDir, winProfDir, linProfDir, userNetlogonDir]
|
|
|
|
|
flagError = False
|
|
|
|
|
flagHomeDir = True
|
|
|
|
|
for userDir in userDirs:
|
|
|
|
|
if not os.path.exists(userDir):
|
|
|
|
|
if not self.createUserDir(uid, gid, userDir):
|
|
|
|
|
flagError = True
|
|
|
|
|
break
|
|
|
|
|
if flagHomeDir:
|
|
|
|
|
flagHomeDir = False
|
|
|
|
|
# Cоздаем иконку в домашней директории
|
|
|
|
|
fileTxt = "[Desktop Entry]\nIcon=user-home"
|
|
|
|
|
fileDirectory = os.path.join(userDir,".directory")
|
|
|
|
|
if not self.createUserFile(fileDirectory,
|
|
|
|
|
fileTxt, uid, gid):
|
|
|
|
|
flagError = True
|
|
|
|
|
break
|
|
|
|
|
if flagError:
|
|
|
|
|
return False
|
|
|
|
|
return True
|
|
|
|
|