-@@ -195,9 +246,6 @@ uid_t match_uid(uid_t uid)
- static uid_t last_in, last_out;
+- node = add_to_list(&gidlist, (int)id, name, (int)id2);
++ node = add_to_list(&gidlist, (int)id, name ? name : NULL, (int)id2);
+
+ if (verbose > 3) {
+ rprintf(FINFO, "gid %d(%s) maps to %d\n",
+- (int)id, name ? name : "", (int)id2);
++ (int)id, name, (int)id2);
+ }
+
+ return id2;
+@@ -192,12 +248,9 @@ static gid_t recv_add_gid(gid_t id, char
+ /* this function is a definate candidate for a faster algorithm */
+ uid_t match_uid(uid_t uid)
+ {
+- static uid_t last_in, last_out;
++ static uid_t last_in = -1, last_out = -1;