Added merging SSL fingerprint lists during account merging

diff --git a/ChangeLog b/ChangeLog
index 7c85cfeba4416c8b5e12f67f12c503fd0c1a4883..796a43d7323c5ee33f9fbc5c4ecfd52f778b46a8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
 /***********************************************************************
 X3 ChangeLog
 
+2009-12-02  Matthew Beeching  <jobe@mdbnet.co.uk>
+
+       * src/nickserv.c: Added merging SSL fingerprint lists during
+       account merging.
+
 2009-12-01  Matthew Beeching  <jobe@mdbnet.co.uk>
 
        * src/opserv.c: Added ADDALERT reactions noticeuser and msguser

diff --git a/src/nickserv.c b/src/nickserv.c
index 223ed57861faf6ebb1f58c8d803c96fbb9e9d122..01c6325c203af1ccc1e15aa3bddec0d1ca5be7e7 100644 (file)
--- a/src/nickserv.c
+++ b/src/nickserv.c
@@ -4108,6 +4108,16 @@ static NICKSERV_FUNC(cmd_merge)
             string_list_append(hi_to->masks, strdup(mask));
     }
 
+    /* Merge the SSL fingerprints. */
+    for (ii=0; ii<hi_from->sslfps->used; ii++) {
+        char *sslfp = hi_from->sslfps->list[ii];
+        for (jj=0; jj<hi_to->sslfps->used; jj++)
+            if (!irccasecmp(hi_to->sslfps->list[jj], sslfp))
+                break;
+        if (jj==hi_to->sslfps->used) /* Nothing from the "to" handle covered this sslfp, so add it. */
+            string_list_append(hi_to->sslfps, strdup(sslfp));
+    }
+
     /* Merge the ignores. */
     for (ii=0; ii<hi_from->ignores->used; ii++) {
         char *ignore = hi_from->ignores->list[ii];