[SCM] GNU Mailutils branch, master, updated. release-2.2-439-ge0222cd

[Sergey Poznyakoff]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Mailutils".

http://git.savannah.gnu.org/cgit/mailutils.git/commit/?id=e0222cd50d0970eed9e93dccac98477b55078e5f

The branch, master has been updated
       via  e0222cd50d0970eed9e93dccac98477b55078e5f (commit)
       via  ebcdaaf0a4293c81229f6b8e5287d3a6a77b8f83 (commit)
       via  56e4e27fba8e192966c9574ec60863da9bea2a38 (commit)
      from  243dee23f08cb06311bfb3dbc77a45985cc51ca6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e0222cd50d0970eed9e93dccac98477b55078e5f
Author: Sergey Poznyakoff <address@hidden>
Date:   Thu Nov 10 14:12:31 2011 +0200

    Minor fix
    
    * libmu_dbm/dbm.c (mu_dbm_create_from_url): Fix owner= parameter.

commit ebcdaaf0a4293c81229f6b8e5287d3a6a77b8f83
Merge: 56e4e27 243dee2
Author: Sergey Poznyakoff <address@hidden>
Date:   Thu Nov 10 14:06:20 2011 +0200

    Merge branch 'master' of ssh://address@hidden/srv/git/mailutils

commit 56e4e27fba8e192966c9574ec60863da9bea2a38
Author: Sergey Poznyakoff <address@hidden>
Date:   Wed Nov 9 23:02:19 2011 +0200

    Minor change
    
    * libmailutils/base/version.c (mu_conf_option): Reflect BDB support.

-----------------------------------------------------------------------

Summary of changes:
 libmailutils/base/version.c |    6 +++---
 libmu_dbm/dbm.c             |   13 +++++++------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/libmailutils/base/version.c b/libmailutils/base/version.c
index 32c893a..54e9d26 100644
--- a/libmailutils/base/version.c
+++ b/libmailutils/base/version.c
@@ -49,12 +49,12 @@ static struct mu_conf_option mu_conf_option[] = {
 #ifdef WITH_BDB2
   { "WITH_BDB2", N_("Berkeley DB v. 2") },
 #endif
+#ifdef WITH_BDB
+  { "WITH_BDB", N_("Berkeley DB") },
+#endif
 #ifdef WITH_NDBM
   { "WITH_NDBM", },
 #endif
-#ifdef WITH_OLD_DBM
-  { "WITH_OLD_DBM", N_("Old DBM support") },
-#endif
 #ifdef WITH_GDBM
   { "WITH_GDBM", N_("GNU DBM") },
 #endif
diff --git a/libmu_dbm/dbm.c b/libmu_dbm/dbm.c
index 1e862fc..80df67a 100644
--- a/libmu_dbm/dbm.c
+++ b/libmu_dbm/dbm.c
@@ -190,7 +190,12 @@ mu_dbm_create_from_url (mu_url_t url, mu_dbm_file_t *db)
              if (name[5] == '=')
                {
                  auth = mu_get_auth_by_name (name + 6);
-                 if (!auth)
+                 if (auth)
+                   {
+                     owner_uid = auth->uid;
+                     mu_auth_data_free (auth);
+                   }
+                 else
                    {
                      char *end;
                      unsigned long uid;
@@ -199,11 +204,7 @@ mu_dbm_create_from_url (mu_url_t url, mu_dbm_file_t *db)
                      uid = strtoul (name + 6, &end, 0);
                      if (*end || errno)
                        return MU_ERR_NO_SUCH_USER;
-                     auth = mu_get_auth_by_uid (uid);
-                     if (!auth)
-                       return MU_ERR_NO_SUCH_USER;
-                     owner_uid = auth->uid;
-                     mu_auth_data_free (auth);
+                     owner_uid = uid;
                    }
                }
              else if (name[5])


hooks/post-receive
-- 
GNU Mailutils