clean up the printserver table correctly

diff --git a/dbck/phase1.pc b/dbck/phase1.pc
index 5a1c15de6d0c6b6819605394ad2247ff5bfc5678..eb896e2664668538c35342cc5373bae868923798 100644 (file)
--- 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 6034379c60753faae6d88836d3081a808697459a..35658f9ead5dfc9312ce95312e852e5a84cae548 100644 (file)
--- 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",