From: kcr <kcr>
Date: Sun, 5 Mar 2000 08:27:37 +0000 (+0000)
Subject: clean up the printserver table correctly
X-Git-Url: http://andersk.mit.edu/gitweb/moira.git/commitdiff_plain/61eec0b832ba02f7b72ae220b3f469189c044003

clean up the printserver table correctly
---

diff --git a/dbck/phase1.pc b/dbck/phase1.pc
index 5a1c15de..eb896e26 100644
--- a/dbck/phase1.pc
+++ b/dbck/phase1.pc
@@ -921,6 +921,7 @@ void phase1(void)
       if (!ps)
 	out_of_mem("storing printserver");
       ps->mach_id = mach_id;
+      ps->printer_types = printer_types;
       ps->owner_type = owner_type[0];
       ps->owner_id = owner_id;
       ps->lpc_acl = lpc_acl;
diff --git a/dbck/phase2.pc b/dbck/phase2.pc
index 6034379c..35658f9e 100644
--- a/dbck/phase2.pc
+++ b/dbck/phase2.pc
@@ -1367,7 +1367,7 @@ void check_ps(int id, void *printserver, void *hint)
       printf("Printserver on non-existant machine %d\n", id);
       if (single_fix("Delete", 0))
 	{
-	  single_delete("printserver", "mach_id", id);
+	  single_delete("printservers", "mach_id", id);
 	  return;
 	}
       else
@@ -1376,7 +1376,7 @@ void check_ps(int id, void *printserver, void *hint)
   else
     name = m->name;      
 
-  ps->modby = maybe_fixup_modby(ps->modby, id, name, "printserver",
+  ps->modby = maybe_fixup_modby(ps->modby, id, name, "printservers",
 				"modby", "mach_id");
   ps->printer_types = maybe_fixup_unref_string(ps->printer_types, id, name,
 					       "printservers", "printer_types",