Index: nsswitch/idmap_cache.c
===================================================================
--- nsswitch/idmap_cache.c	(Revision 24825)
+++ nsswitch/idmap_cache.c	(Revision 24826)
@@ -399,7 +399,8 @@
 
 	if (databuf.dptr == NULL) {
 		DEBUG(10, ("Cache entry with key = %s couldn't be found\n", sidkey));
-		return NT_STATUS_NONE_MAPPED;
+		ret = NT_STATUS_NONE_MAPPED;
+		goto done;
 	}
 
 	t = strtol(databuf.dptr, &endptr, 10);
@@ -496,7 +497,8 @@
 
 	if (databuf.dptr == NULL) {
 		DEBUG(10, ("Cache entry with key = %s couldn't be found\n", idkey));
-		return NT_STATUS_NONE_MAPPED;
+		ret = NT_STATUS_NONE_MAPPED;
+		goto done;
 	}
 
 	t = strtol(databuf.dptr, &endptr, 10);