Temporary fixed pkcs11-destroy usage check. [RT #20760]

diff --git a/CHANGES b/CHANGES
index 1c0469ec8cc579b9b45201f4cb42db41f2a94bc7..8ad5fc7162747ea4b0c203a3494d75b51ff9a69c 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2839.  [bug]           Temporary fixed pkcs11-destroy usage check.
+                       [RT #20760]
+
 2838.  [bug]           A KSK revoked by named could not be deleted.
                        [RT #20881]
 

diff --git a/bin/pkcs11/pkcs11-destroy.c b/bin/pkcs11/pkcs11-destroy.c
index d7e4a92d2fa67de8a63ade74f6bd1461caa2b666..0f46a89a90ed0f494f58a29fa79c156f063e7947 100644 (file)
--- a/bin/pkcs11/pkcs11-destroy.c
+++ b/bin/pkcs11/pkcs11-destroy.c
@@ -38,7 +38,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $Id: pkcs11-destroy.c,v 1.7 2009/10/26 23:36:53 each Exp $ */
+/* $Id: pkcs11-destroy.c,v 1.8 2010/01/13 21:19:52 fdupont Exp $ */
 
 /* pkcs11-destroy [-m module] [-s $slot] [-i $id | -l $label] [-p $pin] */
 
@@ -124,7 +124,7 @@ main(int argc, char *argv[])
                }
        }
 
-       if (errflg || (!id && (label != NULL))) {
+       if (errflg || (id && (label != NULL))) {
                fprintf(stderr, "Usage:\n");
                fprintf(stderr, "\tpkcs11-destroy [-m module] [-s slot] "
                                "[-i id | -l label] [-p pin]\n");