# 
# 
# patch "ChangeLog"
#  from [fe8a8cb76e9eaf3b17ed4dc96d67ab1a080d4c31]
#    to [f5154f155dcef346914d05a04048b91ea632ae72]
# 
# patch "cert.cc"
#  from [5839913196b727d2645acb4ac891999247fffc2c]
#    to [5936182817276e51a90b8be71753cd5ae3eb6d9e]
# 
============================================================
--- ChangeLog	fe8a8cb76e9eaf3b17ed4dc96d67ab1a080d4c31
+++ ChangeLog	f5154f155dcef346914d05a04048b91ea632ae72
@@ -1,3 +1,9 @@
+2006-11-03  Richard Levitte  <address@hidden>
+
+	* cert.cc (get_user_key): app.opts.key_given is only true when
+	-k is given.  However, the signing key may be given in
+	_MTN/options as well, and that should be respected.
+
 2006-11-02  Timothy Brownawell  <address@hidden>
 
 	Allow commands with subcommands (such as automate) to take
============================================================
--- cert.cc	5839913196b727d2645acb4ac891999247fffc2c
+++ cert.cc	5936182817276e51a90b8be71753cd5ae3eb6d9e
@@ -446,7 +446,7 @@ get_user_key(rsa_keypair_id & key, app_s
 get_user_key(rsa_keypair_id & key, app_state & app)
 {
 
-  if (app.opts.key_given)
+  if (app.opts.signing_key() != "")
     {
       key = app.opts.signing_key;
       return;