Skip to content

Revert "mbsync: make passwordCommand escaping consistent" #3657

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.

Sign up for GitHub

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

Merged
ncfavier merged 1 commit into from
Feb 8, 2023
Merged

Revert "mbsync: make passwordCommand escaping consistent" #3657

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion modules/programs/mbsync.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ let
genSection "IMAPAccount ${name}" ({
Host = imap.host;
User = userName;
PassCmd = lib.escapeShellArgs passwordCommand;
PassCmd = toString passwordCommand;
} // genTlsConfig imap.tls
// optionalAttrs (imap.port != null) { Port = toString imap.port; }
// mbsync.extraConfig.account) + "\n"
Expand Down
4 changes: 2 additions & 2 deletions tests/modules/programs/mbsync/mbsync-expected.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
IMAPAccount hm-account
CertificateFile /etc/ssl/certs/ca-certificates.crt
Host imap.example.org
PassCmd "'password-command' '2'"
PassCmd "password-command 2"
SSLType IMAPS
User home.manager.jr

Expand Down Expand Up @@ -55,7 +55,7 @@ Channel hm-account-strangeHostBoxName
IMAPAccount hm@example.com
CertificateFile /etc/ssl/certs/ca-certificates.crt
Host imap.example.com
PassCmd 'password-command'
PassCmd password-command
SSLType IMAPS
SSLVersions TLSv1.3 TLSv1.2
User home.manager
Expand Down