For container incrementals, resolve acl_id to a name.

diff --git a/server/increment.pc b/server/increment.pc
index b7a27c099a99dd960624090439c69f652e455ced..b045091c23211d6bdfc4785cb2bdf55003e417c3 100644 (file)
--- a/server/increment.pc
+++ b/server/increment.pc
@@ -116,6 +116,23 @@ void incremental_before(enum tables table, char *qual, char **argv)
              qual);
       dosql(before);
       beforec = 7;
+      name = xmalloc(0);
+      id = atoi(before[5]);
+      if (!strncmp(before[4], "USER", 4))
+       {
+         id_to_name(id, USERS_TABLE, &name);
+         strcpy(before[5], name);
+       }
+      else if (!strncmp(before[4], "LIST", 4))
+       {
+         id_to_name(id, LIST_TABLE, &name);
+         strcpy(before[5], name);
+       }
+      else if (!strncmp(before[4], "KERBEROS", 8))
+       {
+         id_to_name(id, STRINGS_TABLE, &name);
+         strcpy(before[5], name);
+       }
       break;
     case MCMAP_TABLE:
       strcpy(before[0], argv[0]);
@@ -256,6 +273,23 @@ void incremental_after(enum tables table, char *qual, char **argv)
              qual);
       dosql(after);
       afterc = 7;
+      name = xmalloc(0);
+      id = atoi(after[5]);
+      if (!strncmp(after[4], "USER", 4))
+       {
+         id_to_name(id, USERS_TABLE, &name);
+         strcpy(after[5], name);
+       }
+      else if (!strncmp(after[4], "LIST", 4))
+       {
+         id_to_name(id, LIST_TABLE, &name);
+         strcpy(after[5], name);
+       }
+      else if (!strncmp(after[4], "KERBEROS", 8))
+       {
+         id_to_name(id, STRINGS_TABLE, &name);
+         strcpy(after[5], name);
+       }
       break;
     case MCMAP_TABLE:
       strcpy(after[0], argv[0]);