Changeset 12cc58b for otr.c

Timestamp:

2008-02-17T10:52:28Z (16 years ago)

Author:

Sven Moritz Hallberg <sm@…>

Branches:

master

Children:

4d8fbe8

Parents:

9e64011

Message:

don't unnecessarily duplicate otr userstate in keygen slave

File:

• otr.c (modified) (3 diffs)

otr.c

@@ -112 +112 @@
 
 /* main function for the forked keygen slave */
-void keygen_child_main(const char *nick, int infd, int outfd);
+void keygen_child_main(OtrlUserState us, int infd, int outfd);
 
 /* mainloop handler for when a keygen finishes */
@@ -1520 +1520 @@
                         /* child process */
                         signal(SIGTERM, exit);
-                        keygen_child_main(irc->nick, to[0], from[1]);
+                        keygen_child_main(irc->otr->us, to[0], from[1]);
                         exit(0);
                 }
@@ -1551 +1551 @@
 }
 
-void keygen_child_main(const char *nick, int infd, int outfd)
-{
-        OtrlUserState us;
-        char *kf;
+void keygen_child_main(OtrlUserState us, int infd, int outfd)
+{
         FILE *input, *output;
         char filename[128], accountname[512], protocol[512];
         gcry_error_t e;
         int tempfd;
-        
-        us = otrl_userstate_create();
-        kf = g_strdup_printf("%s%s.otr_keys", global.conf->configdir, nick);
-        otrl_privkey_read(us, kf);
-        g_free(kf);
         
         input = fdopen(infd, "r");