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
This adds spawn-filter binary for filtering message passed to qmail-remote/qmail-local #50
base: master
Are you sure you want to change the base?
Conversation
please rebase this on current master so it get's easier to review |
I am a noob when using git. How do I do that. in the webui, the 'Rebase and Merge' shows greyed out |
Do it on the commandline: git fetch
git rebase origin/master
git push --force |
I did this and I get this error
|
OK. I changed it to https in .git/config and did a push. It has gone through
|
qmail-lspawn.8
Outdated
@@ -34,7 +38,6 @@ mechanism; if the address is not listed there, it invokes | |||
then runs | |||
.B qmail-local | |||
under the user's uid and gid. | |||
It does not set up any supplementary groups. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why do you remove this line?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oops. That's by mistake
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
fixed it. I think I am making too many mistakes. Somehow I lost the changes made to the three man pages that I had made around few weeks earlier. I have pushed the corrections just now
We're agreed on QMAILREMOTE in some form for 1.08. Marking this one 1.08 for consideration alongside #46. |
wildmat.c
Outdated
return matched; | ||
return ABORT; | ||
case '[': | ||
reverse = p[1] == NEGATE_CLASS ? TRUE : FALSE; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think that will overflow the input string if passed something that ends in "[" or "[^" as it will go one char too far when entering the for loop below.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Indeed yes. I don't like the function now. Is there a better way? spawn-filter already has code to use regexec() if env variable QREGEX is set. I can remove wildmat.c totally and use regexec() instead. Or is there a better function you are aware of that can be used for pattern matching?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just thinking out aloud. Is the need for pattern matching for domains really required. regex matching or using wildmat can be totally avoided if we use exact domains in the control file filterargs.
If it is ok with you I would rebase the branch on the current master to reduce the complexity in git history. |
That would be awesome. I'm still struggling with knowing how to do things properly with git. |
d6c14fc
to
9ad6534
Compare
Ok, I have rebased it and squashed a few of your fix commits to those commits that introduced the error. Please do: git fetch
git reset --hard origin/spawn-filter |
@schmonz I have created a pull request for the QMAILREMOTE/QMAILLOCAL changes. You can view it now