--- qmail-users.c	Fri Jan 14 17:10:25 2005
+++ qmail-users.c	Thu Mar 24 02:10:14 2005
@@ -147,9 +147,18 @@
     return -1;
   }
   str_lower(&lname);
-  return (users_fd == -1)
-    ? lookup_passwd(u, &lname, dash)
-    : lookup_userscdb(u, &lname, dash);
+  if (users_fd != -1) {
+    switch (lookup_userscdb(u, &lname, dash)) {
+    case -1: return -1;
+    case 0: break;
+    default: return 1;
+    }
+    if (!str_copys(&lname, name)){
+      errno = ENOMEM;
+      return -1;
+    }
+  }
+  return lookup_passwd(u, &lname, dash);
 }
 
 int qmail_users_lookup_split(struct qmail_user* u, const char* name,