From 18404054b0e7bad84c552530fa5771f38469f2d3 Mon Sep 17 00:00:00 2001
From: Berke Viktor <berkeviktor@aol.com>
Date: Tue, 3 Jan 2012 16:38:40 +0100
Subject: sync with fishlim head
---
plugins/fishlim/Makefile | 2 +-
plugins/fishlim/keystore.c | 4 ++--
plugins/fishlim/plugin_xchat.c | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
(limited to 'plugins')
diff --git a/plugins/fishlim/Makefile b/plugins/fishlim/Makefile
index a1832c84..3f0e93d2 100644
--- a/plugins/fishlim/Makefile
+++ b/plugins/fishlim/Makefile
@@ -23,7 +23,7 @@ fishlim.so: $(PLUGIN_OBJECTS)
$(CC) -shared $(OURLINKFLAGS) $(PLUGIN_OBJECTS) -o $@
test: $(TEST_OBJECTS)
- $(CC) $(OURLINKFLAGS) $(TEST_OBJECTS) -o $@
+ $(CC) $(TEST_OBJECTS) -o $@ $(OURLINKFLAGS)
.PHONY: all clean distclean install uninstall
diff --git a/plugins/fishlim/keystore.c b/plugins/fishlim/keystore.c
index ce029a2e..d97107fd 100644
--- a/plugins/fishlim/keystore.c
+++ b/plugins/fishlim/keystore.c
@@ -164,8 +164,8 @@ bool keystore_store_key(const char *nick, const char *key) {
encrypted = fish_encrypt(password, strlen(password), key);
if (!encrypted) goto end;
- // Prepend "OK+ "
- wrapped = g_strconcat("OK+ ", encrypted, NULL);
+ // Prepend "+OK "
+ wrapped = g_strconcat("+OK ", encrypted, NULL);
g_free(encrypted);
// Store encrypted in file
diff --git a/plugins/fishlim/plugin_xchat.c b/plugins/fishlim/plugin_xchat.c
index ba0e1280..01f5d747 100644
--- a/plugins/fishlim/plugin_xchat.c
+++ b/plugins/fishlim/plugin_xchat.c
@@ -44,7 +44,7 @@
static const char plugin_name[] = "FiSHLiM";
static const char plugin_desc[] = "Encryption plugin for the FiSH protocol. Less is More!";
-static const char plugin_version[] = "0.0.14";
+static const char plugin_version[] = "0.0.15";
static const char usage_setkey[] = "Usage: SETKEY [<nick or #channel>] <password>, sets the key for a channel or nick";
static const char usage_delkey[] = "Usage: DELKEY <nick or #channel>, deletes the key for a channel or nick";
--
cgit 1.4.1