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

3.8 14.03 broke samba config. May fix #1385 #1386

Merged

Conversation

phillxnet
Copy link
Member

@schakrava I've run out of time on this one for today but to ease hand over I've created this pr.

However I think with this pr the new samba config global import / update mechanism is now working as intended. And is best tested by yourself in this case anyway.

N.B. Very little (next to none) testing but parser now appears to import existing [global] config correctly and also appears to re-write this config correctly.

So over to you for review / testing.

Please see issue #1385 for the development history that lead to this issue.

phillxnet added 6 commits July 9, 2016 19:03
…r#1385

When reading from the /etc/samba/smb.conf file to populate
the new custom config [global] section we need a final check on the
field count to avoid tripping up on for example empty options or just
indented remarks.
A recent refactoring has orphaned this variable, previously
this was passed as a parameter.
@schakrava schakrava merged commit 27f6558 into rockstor:master Jul 10, 2016
@schakrava
Copy link
Member

Thanks @phillxnet . I've cleaned up the code a bit myself.

@phillxnet phillxnet deleted the 1385_3.8-14.03_broke_Samba_config branch July 10, 2016 21:27
@phillxnet
Copy link
Member Author

@schakrava Cheers.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants