Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

NAS-131733 / 25.04 / Fix SMB create and directory mask defaults #14655

Merged
merged 1 commit into from
Oct 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/middlewared/middlewared/plugins/smb_/util_smbconf.py
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,8 @@ def generate_smb_conf_dict(
'netbios aliases': ' '.join(smb_service_config['netbiosalias']),
'guest account': smb_service_config['guest'] if smb_service_config['guest'] else 'nobody',
'obey pam restrictions': any(home_share),
'create mask': smb_service_config['filemask'] or '0744',
'directory mask': smb_service_config['dirmask'] or '0755',
'create mask': smb_service_config['filemask'] or '0664',
'directory mask': smb_service_config['dirmask'] or '0775',
'ntlm auth': smb_service_config['ntlmv1_auth'],
'server multichannel support': smb_service_config['multichannel'],
'unix charset': smb_service_config['unixcharset'],
Expand Down
2 changes: 2 additions & 0 deletions src/middlewared/middlewared/pytest/unit/plugins/test_smb.py
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,8 @@ def test__base_smb():
assert conf['idmap config * : backend'] == 'tdb'
assert conf['idmap config * : range'] == '90000001 - 100000000'
assert conf['server smb encrypt'] == 'default'
assert conf['directory mask'] == '0775'
assert conf['create mask'] == '0664'


def test__syslog():
Expand Down
Loading