diff options
| author | Sam Varshavchik | 2016-11-27 11:58:51 -0500 |
|---|---|---|
| committer | Sam Varshavchik | 2016-11-27 11:58:51 -0500 |
| commit | e21842e21535133d86f4c304e445e6d69f029ab5 (patch) | |
| tree | 14d6af1c94c0417817c77e3cf6c08ddf8f58e06a /gpglib/delete.c | |
| parent | 22aa61750562f69db443f93518080cd1b5d923ea (diff) | |
| download | courier-libs-e21842e21535133d86f4c304e445e6d69f029ab5.tar.bz2 | |
gpglib: fixes for gpg2.
Add --with-gpg2 compiler option, to prefer gpg2 instead of gpg.
When compiled against gpg2, --pinentry-mode local must be given, for
certain operations.
Implement libmail_gpg_makepassphrasepipe(), to help apps pass passphrases
via pipes.
Removes obsolete 'trust level' parameter from libmail_gpg_signkey().
Diffstat (limited to 'gpglib/delete.c')
| -rw-r--r-- | gpglib/delete.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/gpglib/delete.c b/gpglib/delete.c index 596f885..7dbdb81 100644 --- a/gpglib/delete.c +++ b/gpglib/delete.c @@ -1,5 +1,5 @@ /* -** Copyright 2001-2003 Double Precision, Inc. See COPYING for +** Copyright 2001-2016 Double Precision, Inc. See COPYING for ** distribution information. */ @@ -34,7 +34,7 @@ int libmail_gpg_deletekey(const char *gpgdir, int secret, int (*dump_func)(const char *, size_t, void *), void *voidarg) { - char *argvec[8]; + char *argvec[9]; int rc; argvec[0]="gpg"; @@ -43,8 +43,9 @@ int libmail_gpg_deletekey(const char *gpgdir, int secret, argvec[3]= secret ? "--delete-secret-key":"--delete-key"; argvec[4]="-q"; argvec[5]="--no-tty"; - argvec[6]=(char *)fingerprint; - argvec[7]=0; + argvec[6]="--yes"; + argvec[7]=(char *)fingerprint; + argvec[8]=0; if (libmail_gpg_fork(&libmail_gpg_stdin, &libmail_gpg_stdout, NULL, gpgdir, argvec) < 0) |