From: danw <danw>
Date: Fri, 5 Nov 1999 16:38:47 +0000 (+0000)
Subject: from dkk from last year's purge: when not remapping duplicate strings,
X-Git-Url: http://andersk.mit.edu/gitweb/moira.git/commitdiff_plain/fd3a1fc59319f7457db70b8a9e1f452d256c0115

from dkk from last year's purge: when not remapping duplicate strings,
make sure that the duplicates get marked as in-use so they don't get
deleted.
---

diff --git a/dbck/phase2.pc b/dbck/phase2.pc
index 8a8ace03..34b5c190 100644
--- a/dbck/phase2.pc
+++ b/dbck/phase2.pc
@@ -385,9 +385,9 @@ int maybe_fixup_unref_string(int sid, int oid, char *oname, char *table,
       if (single_fix("Replace duplicate", 0))
 	{
 	  ret = newid;
-	  string_check(newid);
 	  doit = 1;
 	}
+      string_check(ret);
     }
   else if (!string_check(ret))
     {
@@ -465,9 +465,9 @@ int maybe_fixup_unref_string2(char *table, char *field, char *cursor, int sid)
       if (single_fix("Replace duplicate", 0))
 	{
 	  ret = newid;
-	  string_check(newid);
 	  doit = 1;
 	}
+      string_check(ret);
     }
   else if (!string_check(ret))
     {