Changeset 903a2fc

Timestamp:

2008-02-16T16:24:38Z (17 years ago)

Author:

Sven Moritz Hallberg <sm@…>

Branches:

master

Children:

8961950

Parents:

1221ef0

Message:

remove (broken) 'otr forget key' command again

Files:

• doc/user-guide/commands.xml (modified) (2 diffs)
• otr.c (modified) (3 diffs)

doc/user-guide/commands.xml

@@ -346 +346 @@
                         
                                 <para>
-                                        Forgets some part of our OTR userstate. Available things: fingerprint, context, and key. See <emphasis>help otr forget &lt;thing&gt;</emphasis> for more information.
+                                        Forgets some part of our OTR userstate. Available things: fingerprint and context. See <emphasis>help otr forget &lt;thing&gt;</emphasis> for more information.
                                 </para>
                         
@@ -377 +377 @@
                         </bitlbee-command>
 
-                        <bitlbee-command name="key">
-                                <syntax>otr forget key &lt;fingerprint&gt;</syntax>
-                                
-                                <description>
-                                
-                                        <para>
-                                                Forgets an OTR private key matching the specified fingerprint. It is allowed to specify only a (unique) prefix of the fingerprint.
-                                        </para>
-                                        
-                                </description>
-                                
-                        </bitlbee-command>
-                
                 </bitlbee-command>
                 

otr.c

@@ -127 +127 @@
 void yes_forget_fingerprint(gpointer w, void *data);
 void yes_forget_context(gpointer w, void *data);
-void yes_forget_key(gpointer w, void *data);
 
 /* helper to make sure accountname and protocol match the incoming "opdata" */
@@ -899 +898 @@
 }
 
-void yes_forget_key(gpointer w, void *data)
-{
-        OtrlPrivKey *key = (OtrlPrivKey *)data;
-        
-        /* FIXME: For some reason which /completely eludes me/, this call keeps
-           barfing on the gcry_sexp_release inside (invalid pointer free). */
-        otrl_privkey_forget(key);
-}
-
 void cmd_otr_forget(irc_t *irc, char **args)
 {
@@ -980 +970 @@
                 s = g_strdup_printf("about to forget otr data about %s, are you sure?", args[2]);
                 query_add(irc, NULL, s, yes_forget_context, NULL, ctx);
-        }
-        
-        else if(!strcmp(args[1], "key"))
-        {
-                OtrlPrivKey *key;
-                char *s;
-                
-                key = match_privkey(irc, ((const char **)args)+2);
-                if(!key) {
-                        /* match_privkey does error messages */
-                        return;
-                }
-                
-                /* TODO: Find out why 'otr forget key' barfs (cf. yes_forget_key) */
-                irc_usermsg(irc, "otr %s %s: not implemented, please edit \x02%s%s.otr_keys\x02 manually :-/",
-                        args[0], args[1], global.conf->configdir, irc->nick);
-                return;
-
-                s = g_strdup_printf("about to forget the private key for %s/%s, are you sure?",
-                        key->accountname, key->protocol);
-                query_add(irc, NULL, s, yes_forget_key, NULL, key);
         }