add needed parameters for YaST callbacks

diff --git a/zypp/KeyRing.cc b/zypp/KeyRing.cc
index 168a2df..e93fb7d 100644 (file)
--- a/zypp/KeyRing.cc
+++ b/zypp/KeyRing.cc
@@ -235,7 +235,8 @@ namespace zypp
         PublicKey key = readPublicKey(unKey.path());
         MIL << "Key " << id << " " << key.name << " is not trusted" << std::endl;
         // ok the key is not trusted, ask the user to trust it or not
-        if ( report->askUserToTrustKey(key.id, key.name) )
+#warning We need the key details passed to the callback
+        if ( report->askUserToTrustKey(key.id, key.name, "") )
         {
           MIL << "User wants to trust key " << id << " " << key.name << std::endl;
           //dumpFile(unKey.path());
@@ -273,7 +274,7 @@ namespace zypp
       else
       {
         // unknown key...
-        if ( report->askUserToAcceptUnknownKey( id, "Unkown Key" ) )
+        if ( report->askUserToAcceptUnknownKey( file, id, "Unknown Key" ) )
         {
           MIL << "User wants to accept unknown key " << id << std::endl;
           return true;

diff --git a/zypp/KeyRing.h b/zypp/KeyRing.h
index fb1522f..5830e8b 100644 (file)
--- a/zypp/KeyRing.h
+++ b/zypp/KeyRing.h
@@ -33,9 +33,9 @@ namespace zypp
   {
     virtual bool askUserToAcceptUnsignedFile( const Pathname &file )
     { return true; }
-    virtual bool askUserToAcceptUnknownKey( const std::string &keyid, const std::string &keyname )
+    virtual bool askUserToAcceptUnknownKey( const Pathname &file, const std::string &keyid, const std::string &keyname )
     { return true; }
-    virtual bool askUserToTrustKey( const std::string &keyid, const std::string &keyname )
+    virtual bool askUserToTrustKey( const std::string &keyid, const std::string &keyname, const std::string &keydetails )
     { return true; }
     virtual bool askUserToAcceptVerificationFailed( const Pathname &file, const std::string &keyid, const std::string &keyname )
     { return true; }