Index: trunk/server/common/oursrc/accountadm/admof.c
===================================================================
--- trunk/server/common/oursrc/accountadm/admof.c	(revision 1596)
+++ trunk/server/common/oursrc/accountadm/admof.c	(revision 1597)
@@ -62,4 +62,7 @@
 		   .idlist_val = NULL};
 
+    if (trights == NULL || tnames.namelist_val == NULL)
+	die("internal error: malloc failed: %m");
+
     for (i = 0; i < n; ++i) {
 	int off;
@@ -72,6 +75,6 @@
     if (pr_NameToId(&tnames, &tids) != 0)
 	die("internal error: pr_NameToId failed");
-    if (tids.idlist_len != n)
-	die("internal error: pr_NameToId did not return as many ids as names");
+    if (tids.idlist_len < n)
+	die("internal error: pr_NameToId did not return enough ids");
 
     for (i = 0; i < n; ++i) {