Mercurial > hg > webserver / file diff

--- a/src/server/daemon/acl.c	Wed May 22 15:05:06 2013 +0200
+++ b/src/server/daemon/acl.c	Sun May 26 12:12:07 2013 +0200
@@ -105,14 +105,10 @@
         char *usr;
         char *pw;
         if(!basicauth_getuser(sn, rq, &usr, &pw)) {
-            user = list->defaultauthdb->get_user(list->defaultauthdb, usr);
+            int pwok;
+            user = authdb_get_and_verify(list->defaultauthdb, usr, pw, &pwok);
             if(!user) {
-                // wrong user name
-                return NULL;
-            }
-            if(!user->verify_password(user, pw)) {
-                // wrong password
-                user->free(user);
+                // wrong user or wrong password
                 return NULL;
             }
             // ok - user is authenticated