STABLE-BRANCH-1-2 gnupg/g10 (ChangeLog getkey.c)

[cvs user dshaw]

    Date: Thursday, January 22, 2004 @ 00:41:43
  Author: dshaw
    Path: /cvs/gnupg/gnupg/g10
     Tag: STABLE-BRANCH-1-2

Modified: ChangeLog getkey.c

* getkey.c (merge_selfsigs): If a subkey is already revoked by the owner,
don't allow a designated revokation of the whole key to override this.  
We're still revoked either way, of course.


-----------+
 ChangeLog |    6 ++++++
 getkey.c  |    2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)