Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
truenas-rk3588
truenas
Commits
628acc01
Commit
628acc01
authored
7 years ago
by
John Hixson
Browse files
Options
Download
Email Patches
Plain Diff
NT4 death fallout fixes
Ticket: #24834 (cherry picked from commit
55275930
)
parent
f4131e6b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/freenas/usr/local/libexec/nas/generate_smb4_conf.py
+2
-2
src/freenas/usr/local/libexec/nas/generate_smb4_conf.py
with
2 additions
and
2 deletions
+2
-2
src/freenas/usr/local/libexec/nas/generate_smb4_conf.py
View file @
628acc01
...
...
@@ -990,7 +990,7 @@ def generate_smb4_conf(client, smb4_conf, role):
confset2
(
smb4_conf
,
"domain logons = %s"
,
"yes"
if
cifs
.
domain_logons
else
"no"
)
if
not
client
.
call
(
'notifier.common'
,
'system'
,
'activedirectory_enabled'
)
)
:
if
not
client
.
call
(
'notifier.common'
,
'system'
,
'activedirectory_enabled'
):
confset2
(
smb4_conf
,
"local master = %s"
,
"yes"
if
cifs
.
localmaster
else
"no"
)
...
...
@@ -1014,7 +1014,7 @@ def generate_smb4_conf(client, smb4_conf, role):
elif
role
==
'member'
:
confset1
(
smb4_conf
,
"server role = member server"
)
el
if
smb4_ldap_enabled
(
client
):
if
smb4_ldap_enabled
(
client
):
add_ldap_conf
(
client
,
smb4_conf
)
elif
client
.
call
(
'notifier.common'
,
'system'
,
'activedirectory_enabled'
):
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help