Merge lp:~james-page/ubuntu/oneiric/dovecot-metadata-plugin/new-upstream-release into lp:ubuntu/oneiric/dovecot-metadata-plugin

[James Page]

New upstream release - existing version is not compatible with v2 of dovecot.
Had to switch upstream source to dovecot rather than kolab as development appears to be active there.
General tidy and update of copyright at the same time

[Matthias Klose (doko)]

this looks ok. the alternative is either to remove the package or upgrade to the new version.

review: Approve

[Dave Walker (davewalker)]

I think it's probably better to have something that should hopefully work, rather than something we know doesn't work and FTBFS.

I'd rather we have this new upstream snapshot rather than dropping from the archive.

Thanks.

review: Approve

=== modified file '.hg_archival.txt'
--- .hg_archival.txt	2010-08-11 17:11:01 +0000
+++ .hg_archival.txt	2011-09-29 19:49:50 +0000
@@ -1,5 +1,4 @@
 repo: ae7e8348c8755ea0c8209c5b5efcc81228530b5e
-node: 4372f4ab8b0ee66b8c8e88e3661a67d441537b2d
+node: bdf2445e101fefc55ffa7bb2c4c5807af0799bd2
 branch: default
-latesttag: works-with-dovecot-1.1
-latesttagdistance: 10
+tag: v8

=== modified file '.hgignore'
--- .hgignore	2010-08-11 17:11:01 +0000
+++ .hgignore	2011-09-29 19:49:50 +0000
@@ -1,17 +1,26 @@
 Makefile$
 Makefile\.in$
+^stamp-h1$
+^metadata-config\.h$
+^metadata-config\.h\.in$
+^ChangeLog$
+^\.cscope
 ^aclocal\.m4$
 ^autom4te\.cache
 ^configure$
+^configure.lineno$
 ^config\.
 ^depcomp$
 ^libtool$
 ^install-sh
 ^ltmain\.sh$
+^m4
 ^missing$
-^src/.deps
-^src/.libs
+^patches
+^src/\.deps
+^src/\.libs
 ~$
+\.tar\.gz$
 \.pyc$
 \.lo$
 \.la$

=== added file '.hgsigs'
--- .hgsigs	1970-01-01 00:00:00 +0000
+++ .hgsigs	2011-09-29 19:49:50 +0000
@@ -0,0 +1,1 @@
+fc360cf4ef81fe0b54ea56074d6b6ee9dcb1c3d5 0 iEYEABECAAYFAk30p6cACgkQjqfyF1DtJW689QCfU6UysrMwwqCycZ9EFbyN9Iof5D0AoL/np56Phl9xCZN9hzeaq0qIcszU

=== modified file '.hgtags'
--- .hgtags	2010-08-11 17:11:01 +0000
+++ .hgtags	2011-09-29 19:49:50 +0000
@@ -1,1 +1,2 @@
 604f64c0f4852e3c0b5fd20b46cb7372791ec91b works-with-dovecot-1.1
+fc360cf4ef81fe0b54ea56074d6b6ee9dcb1c3d5 v7

=== modified file 'AUTHORS'
--- AUTHORS	2010-08-11 17:11:01 +0000
+++ AUTHORS	2011-09-29 19:49:50 +0000
@@ -1,1 +1,2 @@
 Bernhard Herzog <[e-mail]>
+Dennis Schridde <[e-mail]>

=== modified file 'INSTALL'
--- INSTALL	2010-08-11 17:11:01 +0000
+++ INSTALL	2011-09-29 19:49:50 +0000
@@ -1,16 +1,25 @@
 Installation Instructions
 *************************
 
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
-Software Foundation, Inc.
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 
-This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
+   Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.  This file is offered as-is,
+without warranty of any kind.
 
 Basic Installation
 ==================
 
-These are generic installation instructions.
+   Briefly, the shell commands `./configure; make; make install' should
+configure, build, and install this package.  The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package.  Some packages provide this
+`INSTALL' file but do not implement all of the features documented
+below.  The lack of an optional feature in a given package is not
+necessarily a bug.  More recommendations for GNU packages can be found
+in *note Makefile Conventions: (standards)Makefile Conventions.
 
    The `configure' shell script attempts to guess correct values for
 various system-dependent variables used during compilation.  It uses
@@ -23,9 +32,9 @@
 
    It can also use an optional file (typically called `config.cache'
 and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring.  (Caching is
+the results of its tests to speed up reconfiguring.  Caching is
 disabled by default to prevent problems with accidental use of stale
-cache files.)
+cache files.
 
    If you need to do unusual things to compile the package, please try
 to figure out how `configure' could check whether to do them, and mail
@@ -35,30 +44,37 @@
 may remove or edit it.
 
    The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'.  You only need
-`configure.ac' if you want to change it or regenerate `configure' using
-a newer version of `autoconf'.
+`configure' by a program called `autoconf'.  You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
 
-The simplest way to compile this package is:
+   The simplest way to compile this package is:
 
   1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.  If you're
-     using `csh' on an old version of System V, you might need to type
-     `sh ./configure' instead to prevent `csh' from trying to execute
-     `configure' itself.
+     `./configure' to configure the package for your system.
 
-     Running `configure' takes awhile.  While running, it prints some
-     messages telling which features it is checking for.
+     Running `configure' might take a while.  While running, it prints
+     some messages telling which features it is checking for.
 
   2. Type `make' to compile the package.
 
   3. Optionally, type `make check' to run any self-tests that come with
-     the package.
+     the package, generally using the just-built uninstalled binaries.
 
   4. Type `make install' to install the programs and any data files and
-     documentation.
-
-  5. You can remove the program binaries and object files from the
+     documentation.  When installing into a prefix owned by root, it is
+     recommended that the package be configured and built as a regular
+     user, and only the `make install' phase executed with root
+     privileges.
+
+  5. Optionally, type `make installcheck' to repeat any self-tests, but
+     this time using the binaries in their final installed location.
+     This target does not install anything.  Running this target as a
+     regular user, particularly if the prior `make install' required
+     root privileges, verifies that the installation completed
+     correctly.
+
+  6. You can remove the program binaries and object files from the
      source code directory by typing `make clean'.  To also remove the
      files that `configure' created (so you can compile the package for
      a different kind of computer), type `make distclean'.  There is
@@ -67,45 +83,69 @@
      all sorts of other programs in order to regenerate files that came
      with the distribution.
 
+  7. Often, you can also type `make uninstall' to remove the installed
+     files again.  In practice, not all packages have tested that
+     uninstallation works correctly, even though it is required by the
+     GNU Coding Standards.
+
+  8. Some packages, particularly those that use Automake, provide `make
+     distcheck', which can by used by developers to test that all other
+     targets like `make install' and `make uninstall' work correctly.
+     This target is generally not run by end users.
+
 Compilers and Options
 =====================
 
-Some systems require unusual options for compilation or linking that the
-`configure' script does not know about.  Run `./configure --help' for
-details on some of the pertinent environment variables.
+   Some systems require unusual options for compilation or linking that
+the `configure' script does not know about.  Run `./configure --help'
+for details on some of the pertinent environment variables.
 
    You can give `configure' initial values for configuration parameters
 by setting variables in the command line or in the environment.  Here
 is an example:
 
-     ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
+     ./configure CC=c99 CFLAGS=-g LIBS=-lposix
 
    *Note Defining Variables::, for more details.
 
 Compiling For Multiple Architectures
 ====================================
 
-You can compile the package for more than one kind of computer at the
+   You can compile the package for more than one kind of computer at the
 same time, by placing the object files for each architecture in their
-own directory.  To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'.  `cd' to the
+own directory.  To do this, you can use GNU `make'.  `cd' to the
 directory where you want the object files and executables to go and run
 the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
-
-   If you have to use a `make' that does not support the `VPATH'
-variable, you have to compile the package for one architecture at a
-time in the source code directory.  After you have installed the
-package for one architecture, use `make distclean' before reconfiguring
-for another architecture.
+source code in the directory that `configure' is in and in `..'.  This
+is known as a "VPATH" build.
+
+   With a non-GNU `make', it is safer to compile the package for one
+architecture at a time in the source code directory.  After you have
+installed the package for one architecture, use `make distclean' before
+reconfiguring for another architecture.
+
+   On MacOS X 10.5 and later systems, you can create libraries and
+executables that work on multiple system types--known as "fat" or
+"universal" binaries--by specifying multiple `-arch' options to the
+compiler but only a single `-arch' option to the preprocessor.  Like
+this:
+
+     ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+                 CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+                 CPP="gcc -E" CXXCPP="g++ -E"
+
+   This is not guaranteed to produce working output in all cases, you
+may have to build one architecture at a time and combine the results
+using the `lipo' tool if you have problems.
 
 Installation Names
 ==================
 
-By default, `make install' installs the package's commands under
+   By default, `make install' installs the package's commands under
 `/usr/local/bin', include files under `/usr/local/include', etc.  You
 can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX'.
+`configure' the option `--prefix=PREFIX', where PREFIX must be an
+absolute file name.
 
    You can specify separate installation prefixes for
 architecture-specific files and architecture-independent files.  If you
@@ -116,16 +156,47 @@
    In addition, if you use an unusual directory layout you can give
 options like `--bindir=DIR' to specify different values for particular
 kinds of files.  Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
+you can set and what kinds of files go in them.  In general, the
+default for these options is expressed in terms of `${prefix}', so that
+specifying just `--prefix' will affect all of the other directory
+specifications that were not explicitly provided.
+
+   The most portable way to affect installation locations is to pass the
+correct locations to `configure'; however, many packages provide one or
+both of the following shortcuts of passing variable assignments to the
+`make install' command line to change installation locations without
+having to reconfigure or recompile.
+
+   The first method involves providing an override variable for each
+affected directory.  For example, `make install
+prefix=/alternate/directory' will choose an alternate location for all
+directory configuration variables that were expressed in terms of
+`${prefix}'.  Any directories that were specified during `configure',
+but not in terms of `${prefix}', must each be overridden at install
+time for the entire installation to be relocated.  The approach of
+makefile variable overrides for each directory variable is required by
+the GNU Coding Standards, and ideally causes no recompilation.
+However, some platforms have known limitations with the semantics of
+shared libraries that end up requiring recompilation when using this
+method, particularly noticeable in packages that use GNU Libtool.
+
+   The second method involves providing the `DESTDIR' variable.  For
+example, `make install DESTDIR=/alternate/directory' will prepend
+`/alternate/directory' before all installation names.  The approach of
+`DESTDIR' overrides is not required by the GNU Coding Standards, and
+does not work on platforms that have drive letters.  On the other hand,
+it does better at avoiding recompilation issues, and works well even
+when some directory options were not specified in terms of `${prefix}'
+at `configure' time.
+
+Optional Features
+=================
 
    If the package supports it, you can cause programs to be installed
 with an extra prefix or suffix on their names by giving `configure' the
 option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
 
-Optional Features
-=================
-
-Some packages pay attention to `--enable-FEATURE' options to
+   Some packages pay attention to `--enable-FEATURE' options to
 `configure', where FEATURE indicates an optional part of the package.
 They may also pay attention to `--with-PACKAGE' options, where PACKAGE
 is something like `gnu-as' or `x' (for the X Window System).  The
@@ -137,14 +208,53 @@
 you can use the `configure' options `--x-includes=DIR' and
 `--x-libraries=DIR' to specify their locations.
 
+   Some packages offer the ability to configure how verbose the
+execution of `make' will be.  For these packages, running `./configure
+--enable-silent-rules' sets the default to minimal output, which can be
+overridden with `make V=1'; while running `./configure
+--disable-silent-rules' sets the default to verbose, which can be
+overridden with `make V=0'.
+
+Particular systems
+==================
+
+   On HP-UX, the default C compiler is not ANSI C compatible.  If GNU
+CC is not installed, it is recommended to use the following options in
+order to use an ANSI C compiler:
+
+     ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
+
+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
+
+   On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
+parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
+a workaround.  If GNU CC is not installed, it is therefore recommended
+to try
+
+     ./configure CC="cc"
+
+and if that doesn't work, try
+
+     ./configure CC="cc -nodtk"
+
+   On Solaris, don't put `/usr/ucb' early in your `PATH'.  This
+directory contains several dysfunctional programs; working variants of
+these programs are available in `/usr/bin'.  So, if you need `/usr/ucb'
+in your `PATH', put it _after_ `/usr/bin'.
+
+   On Haiku, software installed for all users goes in `/boot/common',
+not `/usr/local'.  It is recommended to use the following options:
+
+     ./configure --prefix=/boot/common
+
 Specifying the System Type
 ==========================
 
-There may be some features `configure' cannot figure out automatically,
-but needs to determine by the type of machine the package will run on.
-Usually, assuming the package is built to be run on the _same_
-architectures, `configure' can figure that out, but if it prints a
-message saying it cannot guess the machine type, give it the
+   There may be some features `configure' cannot figure out
+automatically, but needs to determine by the type of machine the package
+will run on.  Usually, assuming the package is built to be run on the
+_same_ architectures, `configure' can figure that out, but if it prints
+a message saying it cannot guess the machine type, give it the
 `--build=TYPE' option.  TYPE can either be a short name for the system
 type, such as `sun4', or a canonical name which has the form:
 
@@ -152,7 +262,8 @@
 
 where SYSTEM can have one of these forms:
 
-     OS KERNEL-OS
+     OS
+     KERNEL-OS
 
    See the file `config.sub' for the possible values of each field.  If
 `config.sub' isn't included in this package, then this package doesn't
@@ -170,9 +281,9 @@
 Sharing Defaults
 ================
 
-If you want to set default values for `configure' scripts to share, you
-can create a site shell script called `config.site' that gives default
-values for variables like `CC', `cache_file', and `prefix'.
+   If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
 `configure' looks for `PREFIX/share/config.site' if it exists, then
 `PREFIX/etc/config.site' if it exists.  Or, you can set the
 `CONFIG_SITE' environment variable to the location of the site script.
@@ -181,7 +292,7 @@
 Defining Variables
 ==================
 
-Variables not defined in a site shell script can be set in the
+   Variables not defined in a site shell script can be set in the
 environment passed to `configure'.  However, some packages may run
 configure again during the build, and the customized values of these
 variables may be lost.  In order to avoid this problem, you should set
@@ -190,21 +301,29 @@
      ./configure CC=/usr/local2/bin/gcc
 
 causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script).  Here is a another example:
-
-     /bin/bash ./configure CONFIG_SHELL=/bin/bash
-
-Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
-configuration-related scripts to be executed by `/bin/bash'.
+overridden in the site shell script).
+
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf bug.  Until the bug is fixed you can use this workaround:
+
+     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
 
 `configure' Invocation
 ======================
 
-`configure' recognizes the following options to control how it operates.
+   `configure' recognizes the following options to control how it
+operates.
 
 `--help'
 `-h'
-     Print a summary of the options to `configure', and exit.
+     Print a summary of all of the options to `configure', and exit.
+
+`--help=short'
+`--help=recursive'
+     Print a summary of the options unique to this package's
+     `configure', and exit.  The `short' variant lists options used
+     only in the top level, while the `recursive' variant lists options
+     also present in any nested packages.
 
 `--version'
 `-V'
@@ -231,6 +350,16 @@
      Look for the package's source code in directory DIR.  Usually
      `configure' can determine that directory automatically.
 
+`--prefix=DIR'
+     Use DIR as the installation prefix.  *note Installation Names::
+     for more details, including other options available for fine-tuning
+     the installation locations.
+
+`--no-create'
+`-n'
+     Run the configure checks, but stop before creating any output
+     files.
+
 `configure' also accepts some other, not widely useful, options.  Run
 `configure --help' for more details.
 

=== modified file 'Makefile.am'
--- Makefile.am	2010-08-11 17:11:01 +0000
+++ Makefile.am	2011-09-29 19:49:50 +0000
@@ -1,3 +1,5 @@
+ACLOCAL_AMFLAGS = -I m4
+
 SUBDIRS = src
 
 EXTRA_DIST = \

=== modified file 'NEWS'
--- NEWS	2010-08-11 17:11:01 +0000
+++ NEWS	2011-09-29 19:49:50 +0000
@@ -1,2 +1,9 @@
-There hasn't been a release yet.  See the mercurial logs details on the
-changes that happened so far.
[phone]: Version 8
+ * Fix compliance with RFC 5464 Section 4.2.2
+ * Minor cleanups
+
[phone]: Version 7 - "Works with Akonadi"
+ * RFC 5464 compatible
+ * imap-annotatemore is a partial implementation of draft-daboo-imap-annotatemore-08
+   Based on work by Bernhard Herzog (Intevation GmbH)
+ * imap-metadata is a complete implementation of RFC 5464

=== added file 'TODO'
--- TODO	1970-01-01 00:00:00 +0000
+++ TODO	2011-09-29 19:49:50 +0000
@@ -0,0 +1,1 @@
+* Handle mailbox moves/renames

=== modified file 'autogen.sh'
--- autogen.sh	2010-08-11 17:11:01 +0000
+++ autogen.sh	2011-09-29 19:49:50 +0000
@@ -1,12 +1,7 @@
 #!/bin/sh
 
-# If you've non-standard directories, set these
-#ACLOCAL_DIR=
-#GETTEXT_DIR=
-
-if test "$ACLOCAL_DIR" != ""; then
-  ACLOCAL="aclocal -I $ACLOCAL_DIR"
-  export ACLOCAL
-fi
-
-autoreconf -i
+echo '+ creating m4/ ...'
+test -d m4 || mkdir m4
+
+echo '+ running autoreconf ...'
+autoreconf --force --install

=== added file 'configure.ac'
--- configure.ac	1970-01-01 00:00:00 +0000
+++ configure.ac	2011-09-29 19:49:50 +0000
@@ -0,0 +1,20 @@
+AC_PREREQ(2.65)
+AC_INIT([dovecot-metadata],[8],[[e-mail]])
+
+AM_INIT_AUTOMAKE([1.10 silent-rules])
+AM_MAINTAINER_MODE
+
+AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_SRCDIR([src])
+
+AC_PROG_CC_STDC
+LT_INIT
+
+DC_DOVECOT([2.0])
+
+AC_CONFIG_HEADERS([metadata-config.h])
+AC_CONFIG_FILES([
+	Makefile
+	src/Makefile
+])
+AC_OUTPUT

=== removed file 'configure.in'
--- configure.in	2010-08-11 17:11:01 +0000
+++ configure.in	1970-01-01 00:00:00 +0000
@@ -1,56 +0,0 @@
-AC_INIT(dovecot-metadata, 0.0.1, [[e-mail]])
-AC_CONFIG_SRCDIR([src])
-
-AC_CONFIG_HEADERS([metadata-config.h])
-AM_INIT_AUTOMAKE
-
-AM_MAINTAINER_MODE
-
-AC_PROG_CC
-AM_PROG_LIBTOOL
-
-AC_ARG_WITH(dovecot,
-[  --with-dovecot[=DIR]    Dovecot base directory (../dovecot)],
-	dovecotdir="$withval",
-	dovecotdir=../dovecot
-)
-old=`pwd`
-cd $dovecotdir
-dovecotdir=`pwd`
-cd $old
-AC_SUBST(dovecotdir)
-
-if ! test -f "$dovecotdir/dovecot-config"; then
-  echo
-  echo "dovecot-config not found from $dovecotdir, use --with-dovecot=PATH"
-  echo "to give path to compiled Dovecot sources or to a directory with the"
-  echo "installed dovecot-config file."
-  AC_MSG_ERROR([dovecot-config not found])
-fi
-
-if test -d "$dovecotdir/src"; then
-  # compiling against sources
-  have_dovecot_libs=yes
-else
-  # compiling against installed headers
-  have_dovecot_libs=no
-fi
-AM_CONDITIONAL(HAVE_DOVECOT_LIBS, test "$have_dovecot_libs" = "yes")
-
-dnl replace relative ../ paths in the file with full paths
-eval `cat $dovecotdir/dovecot-config|sed 's,\$(top_builddir)/,$dovecotdir/,g'`
-
-if test $have_dovecot_libs = yes; then
-  dovecot_incdir="$dovecotdir"
-fi
-
-
-AC_SUBST(dovecot_incdir)
-AC_SUBST(moduledir)
-
-AC_CONFIG_FILES([
-Makefile
-src/Makefile
-])
-
-AC_OUTPUT

=== modified file 'debian/changelog'
--- debian/changelog	2010-08-11 17:11:01 +0000
+++ debian/changelog	2011-09-29 19:49:50 +0000
@@ -1,3 +1,14 @@
+dovecot-metadata-plugin (8-0ubuntu1) oneiric; urgency=low
+
+  * New upstream release, fixes FTBFS with dovecot >= 2.0.0 (LP: #831179).
+    - d/control: Switched upstream source to http://hg.dovecot.org as original 
+      source appears to be inactive.
+    - d/control: Bumped Standards-Version, no changes.
+    - d/copyright: Updated and converted to DEP-5.
+    - d/rules: Cleared dependency_libs in .la files.
+
+ -- James Page <[e-mail]>  Thu, 29 Sep 2011 20:35:51 +0100
+
 dovecot-metadata-plugin (0.0.1~hg144-0ubuntu1) maverick; urgency=low
 
   * Initial release to support Kolab server

=== modified file 'debian/control'
--- debian/control	2010-08-11 17:11:01 +0000
+++ debian/control	2011-09-29 19:49:50 +0000
@@ -4,14 +4,14 @@
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Scott Kitterman <[e-mail]>
 Build-Depends: debhelper (>= 7.0.50), automake, libtool, dovecot-dev, libldap2-dev
-Standards-Version: 3.9.1
-Homepage: http://hg.intevation.org/kolab/dovecot-metadata-plugin
+Standards-Version: 3.9.2
+Homepage: http://hg.dovecot.org/dovecot-metadata-plugin
 
 Package: dovecot-metadata-plugin
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Experimental IMAP METADATA Extension for Dovecot
- This is a set of plugins for the Dovecot IMAP server version 1.2 that
+ This is a set of plugins for the Dovecot IMAP server version 2.0 that
  implement the IMAP METADATA Extension.  The goal of the development is
  to extend dovecot so that it can be used as the IMAP component instead
  of Cyrus IMAPd in the Kolab server.

=== modified file 'debian/copyright'
--- debian/copyright	2010-08-11 17:11:01 +0000
+++ debian/copyright	2011-09-29 19:49:50 +0000
@@ -1,46 +1,25 @@
-This work was packaged for Ubuntu by:
-
-    Scott Kitterman <[e-mail]> on Wed, 11 Aug 2010 17:11:01 -0400
-
-It was downloaded from:
-
-http://hg.intevation.org/kolab/dovecot-metadata-plugin/archive/tip.tar.gz
-
-Upstream Author:
-
-    Bernhard Herzog <[e-mail]>
-
-Copyright:
-
-    src/imap-annotatemore-plugin.c:/* Copyright (C) 2008 by Intevation GmbH
-    src/metadata-plugin.c:/* Copyright (C) 2008, 2009 by Intevation GmbH
-    test/imapsupport.py:# Copyright (C) 2008 by Intevation GmbH
-    test/test_annotatemore.py:# Copyright (C) 2008 by Intevation GmbH
-    test/runtests.py:# Copyright (C) 2004, 2005, 2006, 2007, 2008 by Intevation GmbH
-    test/test_annotatemore_private.py:# Copyright (C) 2008 by Intevation GmbH
-
-License:
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-On Debian systems, the complete text of the GNU Lesser General Public License
-2.1 can be found in '/usr/share/common-licenses/GPL/LGPL-2.1
-
-The Debian packaging is:
-
-    Copyright (C) 2010 Scott Kitterman <[e-mail]>
-
-and is licensed under the smae terms as the upstream source. See above.
-
+Format: http://dep.debian.net/deps/dep5/
+Upstream-Name: Dovecot Metadata Plugin
+Source: http://hg.dovecot.org/dovecot-metadata-plugin
+
+Files: *
+Copyright: 2008, by Intevation GmbH
+           2010, Dennis Schridde
+           2008, Bernhard Herzog <[e-mail]>
+License: LGPL-3
+
+Files: test/*
+Copyright: 2004-2008, by Intevation GmbH
+License: LGPL-2.1
+
+Files: debian/*
+Copyright: 2010 Scott Kitterman <[e-mail]>
+License: LGPL-2.1
+
+License: LGPL-3
+ On Debian systems, the complete text of the GNU Lesser General Public License
+ 3 can be found in '/usr/share/common-licenses/GPL/LGPL-3
+
+License: LGPL-2.1
+ On Debian systems, the complete text of the GNU Lesser General Public License
+ 2.1 can be found in '/usr/share/common-licenses/GPL/LGPL-2.1

=== modified file 'debian/rules'
--- debian/rules	2010-08-11 17:11:01 +0000
+++ debian/rules	2011-09-29 19:49:50 +0000
@@ -13,6 +13,10 @@
 	dh  $@
 
 override_dh_auto_configure:
+	test -d m4 || mkdir m4
 	autoreconf -f -i -Wall,no-obsolete
 	dh_auto_configure -- --with-dovecot=/usr/lib/dovecot/
 
+override_dh_install:
+	sed -i "/dependency_libs/ s/'.*'/''/" `find . -name '*.la'`
+	dh_install

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2010-08-11 17:11:01 +0000
+++ src/Makefile.am	2011-09-29 19:49:50 +0000
@@ -1,26 +1,50 @@
-AM_CPPFLAGS = \
-	-I$(dovecot_incdir) \
-	-I$(dovecot_incdir)/src/lib \
-	-I$(dovecot_incdir)/src/lib-mail \
-	-I$(dovecot_incdir)/src/lib-imap \
-	-I$(dovecot_incdir)/src/lib-storage \
-	-I$(dovecot_incdir)/src/lib-dict \
-	-I$(dovecot_incdir)/src/imap \
-	-DPKG_RUNDIR=\""$(rundir)"\"
-
-
-imap_moduledir = $(moduledir)/imap
-
+AM_CPPFLAGS = $(LIBDOVECOT_INCLUDE) $(LIBDOVECOT_STORAGE_INCLUDE) $(LIBDOVECOT_IMAP_INCLUDE)
+
+imap_moduledir = $(dovecot_moduledir)
 imap_module_LTLIBRARIES = \
 	lib80_metadata_plugin.la \
+	lib90_imap_metadata_plugin.la \
 	lib90_imap_annotatemore_plugin.la
 
 lib80_metadata_plugin_la_LDFLAGS = -module -avoid-version
-
 lib80_metadata_plugin_la_SOURCES = \
-	metadata-plugin.c
+	metadata-plugin.c \
+	metadata-backend.c \
+	metadata-entry.c \
+	metadata-mail-user-module.c \
+	metadata-mail-storage-module.c \
+	metadata-settings.c \
+	dict-ext.c \
+	imap-arg-ext.c \
+	mailbox-ext.c \
+	str-ext.c
+
+lib90_imap_metadata_plugin_la_LDFLAGS = -module -avoid-version
+lib90_imap_metadata_plugin_la_SOURCES = \
+	imap-metadata-plugin.c
+if DOVECOT_PLUGIN_DEPS
+lib90_imap_metadata_plugin_la_LIBADD = \
+	lib80_metadata_plugin.la
+endif
 
 lib90_imap_annotatemore_plugin_la_LDFLAGS = -module -avoid-version
-
 lib90_imap_annotatemore_plugin_la_SOURCES = \
 	imap-annotatemore-plugin.c
+if DOVECOT_PLUGIN_DEPS
+lib90_imap_annotatemore_plugin_la_LIBADD = \
+	lib80_metadata_plugin.la
+endif
+
+noinst_HEADERS = \
+	metadata-backend.h \
+	metadata-entry.h \
+	metadata-entry-private.h \
+	metadata-global.h \
+	metadata-mail-user-module.h \
+	metadata-mail-user-module-private.h \
+	metadata-mail-storage-module.h \
+	metadata-settings.h \
+	dict-ext.h \
+	imap-arg-ext.h \
+	mailbox-ext.h \
+	str-ext.h

=== added file 'src/dict-ext.c'
--- src/dict-ext.c	1970-01-01 00:00:00 +0000
+++ src/dict-ext.c	2011-09-29 19:49:50 +0000
@@ -0,0 +1,139 @@
+/*
+	Copyright (c) 2010 by Dennis Schridde
+
+	This file is part of dovecot-metadata.
+
+	dovecot-metadata is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	dovecot-metadata is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with dovecot-metadata.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include "dict-ext.h"
+
+#include "str.h"
+#include "dict.h"
+
+enum dict_scope
+dict_get_scope(const char *path) {
+	if (strncasecmp(DICT_PATH_SHARED, path, sizeof(DICT_PATH_SHARED)) == 0)
+		return DICT_SCOPE_SHARED;
+	else if (strncasecmp(DICT_PATH_PRIVATE, path, sizeof(DICT_PATH_PRIVATE)) == 0)
+		return DICT_SCOPE_PRIVATE;
+
+	return DICT_SCOPE_INVALID;
+}
+
+const char *
+dict_path_from_scope(enum dict_scope scope) {
+	switch (scope) {
+		case DICT_SCOPE_SHARED:
+			return DICT_PATH_SHARED;
+		case DICT_SCOPE_PRIVATE:
+			return DICT_PATH_PRIVATE;
+		case DICT_SCOPE_INVALID:
+			return "";
+	}
+
+	return "";
+}
+
+struct dict_iterate_multiscope_context {
+	struct dict_iterate_context *dict_ctx;
+	struct dict *dict;
+	enum dict_iterate_flags flags;
+	string_t *path;
+	bool do_shared;
+	bool failed;
+};
+
+struct dict_iterate_multiscope_context *
+dict_iterate_multiscope_init(struct dict *dict, const char *path, enum dict_iterate_multiscope_flags flags) {
+	struct dict_iterate_multiscope_context *ctx = i_new(struct dict_iterate_multiscope_context, 1);
+	memset(ctx, 0, sizeof(*ctx));
+
+	ctx->dict = dict;
+	ctx->flags = flags & ~DICT_ITERATE_MULTISCOPE_FLAG_MULTISCOPE;
+
+	ctx->path = str_new(default_pool, 128);
+	if (flags & DICT_ITERATE_MULTISCOPE_FLAG_MULTISCOPE)
+		str_append(ctx->path, DICT_PATH_PRIVATE);
+	str_append(ctx->path, path);
+
+	ctx->do_shared = (flags & DICT_ITERATE_MULTISCOPE_FLAG_MULTISCOPE);
+	ctx->failed = false;
+
+	ctx->dict_ctx = dict_iterate_init(ctx->dict, str_c(ctx->path), ctx->flags);
+
+	return ctx;
+}
+
+bool
+dict_iterate_multiscope(struct dict_iterate_multiscope_context *ctx, const char **name, const char **value) {
+	i_assert(ctx != NULL);
+	if (ctx == NULL)
+		return false;
+
+	if (ctx->failed)
+		return false;
+
+	*name = NULL;
+	while (*name == NULL) {
+		bool ret = dict_iterate(ctx->dict_ctx, name, value);
+
+		/* we have no more shared/ keys and priv/ was also already iterated over */
+		if (!ret && !ctx->do_shared) {
+			return false;
+		}
+		/* no more priv/ keys, continue with shared/ */
+		else if (!ret && ctx->do_shared) {
+			if (dict_iterate_deinit(&ctx->dict_ctx) < 0) {
+				ctx->failed = true;
+				return false;
+			}
+
+			/* replace priv/ with shared/ */
+			str_delete(ctx->path, 0, sizeof(DICT_PATH_SHARED));
+			str_insert(ctx->path, 0, DICT_PATH_PRIVATE);
+
+			ctx->do_shared = false;
+
+			ctx->dict_ctx = dict_iterate_init(ctx->dict, str_c(ctx->path), ctx->flags);
+			if (ctx->dict_ctx == NULL) {
+				ctx->failed = true;
+			}
+
+			continue;
+		}
+	}
+
+	return true;
+}
+
+int
+dict_iterate_multiscope_deinit(struct dict_iterate_multiscope_context **ctx) {
+	i_assert(ctx != NULL);
+	if (ctx == NULL)
+		return -1;
+
+	i_assert(*ctx != NULL);
+	if (*ctx == NULL)
+		return -1;
+
+	int ret = (*ctx)->failed ? -1 : 0;
+
+	if (dict_iterate_deinit(&(*ctx)->dict_ctx) < 0)
+		ret = -1;
+
+	str_free(&(*ctx)->path);
+	i_free(*ctx);
+
+	return ret;
+}

=== added file 'src/dict-ext.h'
--- src/dict-ext.h	1970-01-01 00:00:00 +0000
+++ src/dict-ext.h	2011-09-29 19:49:50 +0000
@@ -0,0 +1,58 @@
+/*
+	Copyright (c) 2010 by Dennis Schridde
+
+	This file is part of dovecot-metadata.
+
+	dovecot-metadata is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	dovecot-metadata is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with dovecot-metadata.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#ifndef DOVECOT_DICT_EXT_H
+#define DOVECOT_DICT_EXT_H
+
+#include "metadata-global.h"
+
+#include <stdbool.h>
+
+#include "dict.h"
+
+enum dict_scope {
+	DICT_SCOPE_SHARED,
+	DICT_SCOPE_PRIVATE,
+	DICT_SCOPE_INVALID
+};
+
+enum dict_scope
+dict_get_scope(const char *key)
+	ATTR_NONNULL(1);
+
+const char *
+dict_path_from_scope(enum dict_scope scope);
+
+struct dict_iterate_multiscope_context;
+
+enum dict_iterate_multiscope_flags {
+	DICT_ITERATE_MULTISCOPE_FLAG_MULTISCOPE = 0x1000
+};
+
+struct dict_iterate_multiscope_context *
+dict_iterate_multiscope_init(struct dict *dict, const char *path, enum dict_iterate_multiscope_flags flags)
+	ATTR_NONNULL(1,2);
+bool
+dict_iterate_multiscope(struct dict_iterate_multiscope_context *ctx, const char **name, const char **value)
+	ATTR_NONNULL(1,2,3);
+int
+dict_iterate_multiscope_deinit(struct dict_iterate_multiscope_context **ctx)
+	ATTR_NONNULL(1);
+
+
+#endif

=== modified file 'src/imap-annotatemore-plugin.c'
--- src/imap-annotatemore-plugin.c	2010-08-11 17:11:01 +0000
+++ src/imap-annotatemore-plugin.c	2011-09-29 19:49:50 +0000
@@ -1,20 +1,43 @@
-/* Copyright (C) 2008 by Intevation GmbH
- * Authors:
- * Bernhard Herzog <[e-mail]>
- *
- * This program is free software under the LGPL (>=v2.1)
- * Read the file COPYING coming with the software for details.
- */
-
-#include "lib.h"
+/*
+	Copyright (c) 2008 by Intevation GmbH / Bernhard Herzog <[e-mail]>
+	Copyright (c) 2010 by Dennis Schridde
+
+	This file is part of dovecot-metadata.
+
+	dovecot-metadata is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	dovecot-metadata is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with dovecot-metadata.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include "metadata-global.h"
+
 #include "str.h"
-#include "common.h"
+#include "imap-common.h"
+#include "imap-client.h"
 #include "imap-quote.h"
+#include "mailbox-list.h"
 
 #include <string.h>
 
-#include "metadata-plugin.h"
-#include "imap-annotatemore-plugin.h"
+#include "str-ext.h"
+#include "metadata-entry-private.h"
+#include "metadata-backend.h"
+
+/* The IMAP Annotatemore plugin is a partial implementation of draft-daboo-imap-annotatemore-08 */
+
+const char *imap_annotatemore_plugin_version = DOVECOT_VERSION;
+const char *imap_annotatemore_plugin_dependencies[] = { "metadata", NULL };
+
+static struct module *imap_annotatemore_module;
+static void (*next_hook_client_created)(struct client **client);
 
 enum attribute_properties {
 	ATTR_INVALID = 0x0001,
@@ -23,30 +46,32 @@
 	ATTR_BOTH    = ATTR_PUBLIC | ATTR_PRIVATE,
 };
 
+
 static bool validate_entry_name(struct client_command_context *cmd,
 				const char *entry)
 {
 	if (entry == NULL) {
-		client_send_tagline(cmd, "BAD Missing entry name.");
+		client_send_command_error(cmd, "Missing entry name.");
 		return FALSE;
 	}
 
-	if (entry[0] != '/') {
-		client_send_tagline(cmd,
-				    "BAD entry name must start with slash.");
+	if (entry[0] != '/' && entry[0] != '*' && entry[0] != '%') {
+		client_send_command_error(cmd,
+				    "Entry name must start with slash or be a glob.");
 		return FALSE;
 	}
 
 	return TRUE;
 }
 
+
 static enum attribute_properties
 validate_attribute_name(struct client_command_context *cmd,
 			const char *attribute)
 {
 	if (attribute == NULL) {
-		client_send_tagline(cmd,
-				    "BAD Missing or NIL attribute name.");
+		client_send_command_error(cmd,
+				    "Missing or NIL attribute name.");
 		return ATTR_INVALID;
 	}
 
@@ -56,64 +81,273 @@
 		return ATTR_PRIVATE;
 	} else if (strcmp(attribute, "value") == 0) {
 		return ATTR_BOTH;
+	} else if (strchr(attribute, '*')) {
+		return ATTR_BOTH;
+	} else if (strchr(attribute, '%')) {
+		client_send_command_error(cmd, "'%' globs not supported.");
+		return ATTR_INVALID;
 	} else {
-		client_send_tagline(cmd,
-				    "BAD only 'value.shared' and"
-				    " 'value.priv' attributes are"
-				    " supported '.'");
+		client_send_command_error(cmd,
+				    "Only 'value.shared' and 'value.priv' attributes"
+				    " are supported '.'");
 		return ATTR_INVALID;
 	}
 }
 
 
+static const char *
+entry_scopes[ENTRY_SCOPE_MAX] = {
+	"private/", /* ENTRY_SCOPE_PRIVATE */
+	"shared/" /* ENTRY_SCOPE_SHARED */
+};
+
+static const char *
+entry_types[ENTRY_TYPE_MAX] = {
+	"vendor/", /* ENTRY_TYPE_VENDOR */
+	"", /* ENTRY_TYPE_RFC */
+};
+
+static const char **
+entry_subtypes_rfc[ENTRY_SUBJECT_MAX] = {
+	(const char*[]){ // server
+		"comment",
+		"admin",
+		NULL
+	},
+	(const char*[]){ // mailbox
+		"comment",
+		NULL
+	}
+};
+
+
+/* validates that the part after /vendor conforms to the RFC */
+static ATTR_NONNULL(1)
+bool is_valid_annotatemore_vendor_name(const char *name) {
+	const char *lastslash = NULL, *lastcr = NULL;
+	int num_components = 2;
+
+	for (const char *c = name; *c != '\0'; c++) {
+		switch (*c) {
+			case '/':
+				// Two consecutive slashes, or a slash at the end are an error
+				if (lastslash == c-1 || *(c+1) == '\0') {
+					return false;
+				}
+				lastslash = c;
+				num_components++;
+				break;
+			case '*':
+			case '%':
+				return false;
+			case '\r':
+				lastcr = c;
+				break;
+			case '\n':
+				// line ending has to be CRLF
+				if (lastcr != c-1) {
+					return false;
+				}
+				break;
+			default:
+				break;
+		}
+	}
+
+	return num_components >= 4;
+}
+
+
+static ATTR_NONNULL(1)
+bool is_valid_annotatemore_subtype_name(const char *name, enum metadata_entry_subject subject) {
+	bool found_subtype = false;
+
+	i_assert(subject > 0 && subject < ENTRY_SUBJECT_MAX);
+
+	for (const char **subtype = entry_subtypes_rfc[subject]; *subtype != NULL; subtype++) {
+		size_t subtype_len = strlen(*subtype);
+
+		if (strncasecmp(name, *subtype, subtype_len) == 0) {
+			found_subtype = true;
+		}
+	}
+
+	return found_subtype;
+}
+
+
+/* sets entry->type and returns remaining string */
+static ATTR_NONNULL(1)
+enum metadata_entry_type
+parse_entry_type(const char **name, enum metadata_entry_subject subject) {
+	if (**name == '\0')
+		return ENTRY_TYPE_NONE;
+
+	for (int type = 0; type < ENTRY_TYPE_MAX; type++) {
+		size_t type_len = strlen(entry_types[type]);
+
+		if (strncasecmp(*name, entry_types[type], type_len) == 0) {
+			*name += type_len;
+
+			switch (type) {
+				case ENTRY_TYPE_RFC:
+					if (!is_valid_annotatemore_subtype_name(*name, subject))
+						return ENTRY_TYPE_MAX;
+					break;
+				case ENTRY_TYPE_VENDOR:
+					if (!is_valid_annotatemore_vendor_name(*name))
+						return ENTRY_TYPE_MAX;
+					break;
+			}
+
+			return type;
+		}
+	}
+
+	return ENTRY_TYPE_MAX;
+}
+
+
+static ATTR_NONNULL(2)
+const char *
+backend_name(enum metadata_entry_scope scope, const char *name) {
+	if (name == NULL)
+		return NULL;
+
+	string_t *backend_name = t_str_new(128);
+	str_append(backend_name, "/");
+	str_append(backend_name, entry_scopes[scope]);
+	str_append(backend_name, name);
+
+	return str_c(backend_name);
+}
+
+
+/* fill entry with data parsed from entry->full_name */
+static ATTR_NONNULL(3)
+struct metadata_entry *
+parse_entry(struct mailbox *box, enum metadata_entry_scope scope, const char *name, const char *value) {
+	if (name == NULL || *name == '\0' || *name++ != '/')
+		return NULL;
+
+	string_t *backend_name = t_str_new(128);
+	str_append(backend_name, "/");
+	str_append(backend_name, entry_scopes[scope]);
+	str_append(backend_name, name);
+
+	enum metadata_entry_type type = parse_entry_type(&name, box ? ENTRY_SUBJECT_MAILBOX : ENTRY_SUBJECT_SERVER);
+	if (type >= ENTRY_TYPE_MAX)
+		return NULL;
+
+	return metadata_entry_alloc(box, str_c(backend_name), value);
+}
+
+
 static void send_annotation_line(struct client_command_context *cmd,
-				 const char *mailbox,
-				 const char *entry,
+				 struct mailbox *box,
+				 const char *entry_name,
 				 const char *value,
 				 bool private)
 {
 	if (value != NULL) {
-		string_t *str = t_str_new(128);
-		str_append(str, "* ANNOTATION ");
-		imap_quote_append_string(str, mailbox, FALSE);
-		str_append(str, " ");
-		imap_quote_append_string(str, entry, FALSE);
-		str_printfa(str, " (\"value.%s\" ",
-			    private ? "priv" : "shared");
-		imap_quote_append_string(str, value, FALSE);
-		str_append(str, ")");
-		client_send_line(cmd->client, str_c(str));
+		const char *mailbox_name = mailbox_get_vname(box);
+		const char *str = t_strdup_printf(
+			"* ANNOTATION %s %s (value.%s %s)",
+			mailbox_name, entry_name, private ? "priv" : "shared", value
+		);
+
+		client_send_line(cmd->client, str);
 	}
 }
 
 
-static bool get_and_send_annotation(struct client_command_context *cmd,
-				    const char *mailbox,
-				    const char *entry,
+static void get_and_send_annotation(struct client_command_context *cmd,
+				    struct mailbox *box,
+				    const char *entry_name,
 				    enum attribute_properties scope)
 {
-	const char *value;
-	bool success = TRUE;
-
-	if ((scope & ATTR_PUBLIC) != 0) {
-		value = NULL;
-		success = metadata_get_metadata_entry(cmd, mailbox, entry,
-						       &value, FALSE);
-		send_annotation_line(cmd, mailbox, entry, value, FALSE);
-	}
-
-	if (!success) {
-		return FALSE;
-	}
-
-	if ((scope & ATTR_PRIVATE) != 0) {
-		value = NULL;
-		success = metadata_get_metadata_entry(cmd, mailbox, entry,
-						      &value, TRUE);
-		send_annotation_line(cmd, mailbox, entry, value, TRUE);
-	}
-
-	return success;
+	if (strchr(entry_name, '*')) {
+		int entrylastchar = strlen(entry_name);
+		if (entrylastchar > 0)
+			entrylastchar--;
+
+		/* We do not support more than one glob, and at no other location than the end */
+		if (strchr_num(entry_name, '*') == 1 && entry_name[entrylastchar] == '*') {
+			const char *entrypattern = t_strdup_until(entry_name, &entry_name[entrylastchar]);
+
+			if ((scope & ATTR_PUBLIC) != 0) {
+				struct metadata_entry *entry = metadata_entry_alloc(box, backend_name(ENTRY_SCOPE_SHARED, entrypattern), NULL);
+
+				struct metadata_iterate_context *iter = metadata_iterate_init(box, entry, METADATA_ITERATE_DEPTH_INF);
+				while (metadata_iterate(iter, entry)) {
+					const char *name = metadata_entry_get_name(entry) + strlen(entry_scopes[ENTRY_SCOPE_SHARED]);
+					const char *value = metadata_entry_get_value(entry);
+
+					send_annotation_line(cmd, box, name, value, FALSE);
+				}
+				if (metadata_iterate_deinit(&iter) < 0) {
+					client_send_tagline(cmd, "NO Iterating metadata failed.");
+					return;
+				}
+			}
+
+			if ((scope & ATTR_PRIVATE) != 0) {
+				struct metadata_entry *entry = metadata_entry_alloc(box, backend_name(ENTRY_SCOPE_PRIVATE, entrypattern), NULL);
+
+				struct metadata_iterate_context *iter = metadata_iterate_init(box, entry, METADATA_ITERATE_DEPTH_INF);
+				while (metadata_iterate(iter, entry)) {
+					const char *name = metadata_entry_get_name(entry) + strlen(entry_scopes[ENTRY_SCOPE_SHARED]);
+					const char *value = metadata_entry_get_value(entry);
+
+					send_annotation_line(cmd, box, name, value, TRUE);
+				}
+				if (metadata_iterate_deinit(&iter) < 0) {
+					client_send_tagline(cmd, "NO Iterating metadata failed.");
+					return;
+				}
+			}
+		} else {
+			client_send_command_error(cmd, "'*' globs only supported at end of pattern.");
+			return;
+		}
+	} else if (strchr(entry_name, '%')) {
+		client_send_command_error(cmd, "'%' globs not supported.");
+		return;
+	} else {
+		if ((scope & ATTR_PUBLIC) != 0) {
+			struct metadata_entry *entry = metadata_entry_alloc(box, backend_name(ENTRY_SCOPE_SHARED, entry_name), NULL);
+			if (entry == NULL) {
+				client_send_tagline(cmd, "NO Allocating entry failed.");
+				return;
+			}
+
+			int success = metadata_get_entry(entry, cmd->client->user);
+			if (success < 0) {
+				client_send_tagline(cmd, "NO Getting entry failed.");
+				return;
+			}
+			else if (success > 0) {
+				send_annotation_line(cmd, box, entry->name, entry->value, FALSE);
+			}
+		}
+
+		if ((scope & ATTR_PRIVATE) != 0) {
+			struct metadata_entry *entry = metadata_entry_alloc(box, backend_name(ENTRY_SCOPE_PRIVATE, entry_name), NULL);
+			if (entry == NULL) {
+				client_send_tagline(cmd, "NO Allocating entry failed.");
+				return;
+			}
+
+			int success = metadata_get_entry(entry, cmd->client->user);
+			if (success < 0) {
+				client_send_tagline(cmd, "NO Getting entry failed.");
+				return;
+			}
+			else if (success > 0) {
+				send_annotation_line(cmd, box, entry->name, entry->value, TRUE);
+			}
+		}
+	}
 }
 
 
@@ -121,11 +355,22 @@
 				 const struct imap_arg *attribute,
 				 const char **value_r)
 {
-	const struct imap_arg *attrlist;
-
-	if (IMAP_ARG_LIST_COUNT(attribute) == 1) {
-		attrlist = IMAP_ARG_LIST_ARGS(attribute);
-		*value_r = IMAP_ARG_STR(&attrlist[0]);
+	const struct imap_arg *attrlist = NULL;
+	unsigned int attrcount = 0;
+
+	if (!imap_arg_get_list_full(attribute, &attrlist, &attrcount)) {
+		// Actually this should never happen, since we first test args[1].type == IMAP_ARG_LIST ! */
+		i_error("metadata: got attributes of non-list type after confirming they were of correct type!");
+		client_send_command_error(cmd, "Attributes must be of list type.");
+		return FALSE;
+	}
+
+	if (attrcount == 1) {
+		if (!imap_arg_get_astring(&attrlist[0], value_r)) {
+			client_send_command_error(cmd,
+					"Value must be of string type.");
+			return FALSE;
+		}
 		return TRUE;
 	} else {
 		client_send_tagline(cmd,
@@ -138,22 +383,26 @@
 static bool cmd_getannotation(struct client_command_context *cmd)
 {
 	const struct imap_arg *args;
-	const char *mailbox;
-	const char *entry;
+	const char *mailbox_name;
+	const char *entry_name;
 	const char *attribute;
 	enum attribute_properties attribute_properties;
 
 	if (!client_read_args(cmd, 3, 0, &args))
 		return FALSE;
 
-	mailbox = IMAP_ARG_STR(&args[0]);
-	if (mailbox == NULL) {
-		client_send_tagline(cmd,
-				    "BAD Missing mailbox name.");
+	if (!imap_arg_get_astring(&args[0], &mailbox_name)) {
+		client_send_command_error(cmd,
+				"Mailbox name must be of string type.");
+		return TRUE;
+	}
+	if (mailbox_name == NULL) {
+		client_send_command_error(cmd,
+				    "Missing mailbox name.");
 		return TRUE;
 	}
 
-	if (*mailbox == '\0') {
+	if (*mailbox_name == '\0') {
 		client_send_tagline(cmd,
 				    "NO Server annotations not yet"
 				    " implemented.");
@@ -161,26 +410,77 @@
 	}
 
 	if (args[1].type == IMAP_ARG_LIST) {
-		if (!extract_single_value(cmd, &args[1], &entry))
-			return TRUE;
-	} else
-		entry = IMAP_ARG_STR(&args[1]);
+		if (!extract_single_value(cmd, &args[1], &entry_name))
+			return TRUE;
+	} else {
+		if (!imap_arg_get_astring(&args[1], &entry_name)) {
+			client_send_command_error(cmd,
+					"Entry name must be of string type.");
+			return TRUE;
+		}
+	}
 
-	if (!validate_entry_name(cmd, entry))
+	if (!validate_entry_name(cmd, entry_name))
 		return TRUE;
 
 	if (args[2].type == IMAP_ARG_LIST) {
 		if (!extract_single_value(cmd, &args[2], &attribute))
 			return TRUE;
-	} else
-		attribute = IMAP_ARG_STR(&args[2]);
+	} else {
+		if (!imap_arg_get_astring(&args[2], &attribute)) {
+			client_send_command_error(cmd,
+					"Attribute must be of string type.");
+			return TRUE;
+		}
+	}
 
 	attribute_properties = validate_attribute_name(cmd, attribute);
 	if (attribute_properties & ATTR_INVALID)
 		return TRUE;
 
-	if (get_and_send_annotation(cmd, mailbox, entry, attribute_properties))
-		client_send_tagline(cmd, "OK Completed.");
+	if (str_has_wildcards(mailbox_name)) {
+		for (const struct mail_namespace *ns = cmd->client->user->namespaces; ns != NULL; ns = ns->next) {
+			const struct mailbox_info *info = NULL;
+
+			struct mailbox_list_iterate_context *ctx = mailbox_list_iter_init(ns->list, mailbox_name, 0);
+			while ((info = mailbox_list_iter_next(ctx)) != NULL) {
+				i_debug("Getting info for mailbox '%s'", info->name);
+
+				struct mailbox *box = mailbox_alloc(ns->list, info->name, MAILBOX_FLAG_READONLY);
+				if (box == NULL) {
+					client_send_tagline(cmd, "NO Allocating mailbox failed.");
+					return TRUE;
+				}
+
+				get_and_send_annotation(cmd, box, entry_name, attribute_properties);
+
+				mailbox_free(&box);
+			}
+			if (mailbox_list_iter_deinit(&ctx) < 0) {
+				client_send_tagline(cmd, "NO Iterating mailboxes failed.");
+			}
+		}
+	} else {
+		struct mail_namespace *ns = mail_namespace_find(cmd->client->user->namespaces, &mailbox_name);
+		if (ns == NULL) {
+			client_send_tagline(cmd,
+					"NO Mailbox not found.");
+			return TRUE;
+		}
+
+		struct mailbox *box = mailbox_alloc(ns->list, mailbox_name, MAILBOX_FLAG_READONLY);
+		if (box == NULL) {
+			client_send_tagline(cmd,
+					"NO Allocating mailbox failed.");
+			return TRUE;
+		}
+
+		get_and_send_annotation(cmd, box, entry_name, attribute_properties);
+
+		mailbox_free(&box);
+	}
+
+	client_send_tagline(cmd, "OK Completed.");
 
 	return TRUE;
 }
@@ -194,44 +494,50 @@
 	const struct imap_arg *pairs;
 	unsigned int count;
 
-	if (attributes->type != IMAP_ARG_LIST) {
-		client_send_tagline(cmd,
-				    "BAD attributes parameter must be a list"
+	if (!imap_arg_get_list_full(attributes, &pairs, &count)) {
+		client_send_command_error(cmd,
+				    "Attributes parameter must be a list"
 				    " of attribute value pairs.");
 		return FALSE;
 	}
 
-	count = IMAP_ARG_LIST_COUNT(attributes);
-	pairs = IMAP_ARG_LIST_ARGS(attributes);
-
 	if (count % 2 != 0) {
-		client_send_tagline(cmd,
-				    "BAD list of attribute value pairs"
+		client_send_command_error(cmd,
+				    "List of attribute value pairs"
 				    " must have an even number of elements");
 		return FALSE;
 	}
 
 	if (count == 0) {
-		client_send_tagline(cmd,
-				    "BAD list of attribute value pairs"
+		client_send_command_error(cmd,
+				    "List of attribute value pairs"
 				    " is empty");
 		return FALSE;
 	}
 
 	if (count == 2) {
 		enum attribute_properties properties;
-		properties = validate_attribute_name(cmd,
-						     IMAP_ARG_STR(&pairs[0]));
+		const char *tmp;
+		if (!imap_arg_get_astring(&pairs[0], &tmp)) {
+			client_send_command_error(cmd,
+					"Attribute must be of string type.");
+			return FALSE;
+		}
+		properties = validate_attribute_name(cmd, tmp);
 		if ((properties & ATTR_INVALID) != 0)
 			return FALSE;
 		if ((properties & ATTR_BOTH) == ATTR_BOTH) {
-			client_send_tagline(cmd,
-					    "BAD attribute must end in .priv"
+			client_send_command_error(cmd,
+					    "Attribute must end in .priv"
 					    " or .shared for SETANNOTATION");
 			return FALSE;
 		}
 
-		*value_r = IMAP_ARG_STR(&pairs[1]);
+		if (!imap_arg_get_astring(&pairs[1], value_r)) {
+			client_send_command_error(cmd,
+					"Value must be of string type.");
+			return FALSE;
+		}
 		*private_r = ((properties & ATTR_PRIVATE) != 0);
 		return TRUE;
 	}
@@ -244,22 +550,25 @@
 static bool cmd_setannotation(struct client_command_context *cmd)
 {
 	const struct imap_arg *args;
-	const char *mailbox;
-	const char *entry;
+	const char *mailbox_name;
+	const char *entry_name;
 	const char *value;
 	bool private;
-	bool success;
 
 	if (!client_read_args(cmd, 3, 0, &args))
 		return FALSE;
 
-	mailbox = IMAP_ARG_STR(&args[0]);
-	if (mailbox == NULL) {
-		client_send_tagline(cmd,
-				    "BAD Missing mailbox name.");
-		return TRUE;
-	}
-	if (*mailbox == '\0') {
+	if (!imap_arg_get_astring(&args[0], &mailbox_name)) {
+		client_send_command_error(cmd,
+				"Mailbox name must be of string type.");
+		return TRUE;
+	}
+	if (mailbox_name == NULL) {
+		client_send_command_error(cmd,
+				    "Missing mailbox name.");
+		return TRUE;
+	}
+	if (*mailbox_name == '\0') {
 		client_send_tagline(cmd,
 				    "NO Server annotations not yet"
 				    " implemented.");
@@ -271,38 +580,84 @@
 				    "NO Lists of entries not yet implemented.");
 		return TRUE;
 	}
-	entry = IMAP_ARG_STR(&args[1]);
-	if (!validate_entry_name(cmd, entry))
+	if (!imap_arg_get_astring(&args[1], &entry_name)) {
+		client_send_command_error(cmd,
+				"Entry name must be of string type.");
+		return TRUE;
+	}
+	if (entry_name == NULL) {
+		client_send_tagline(cmd, "NO Entry name is NULL.");
+		return true;
+	}
+
+	if (!validate_entry_name(cmd, entry_name))
 		return TRUE;
 
 	if (!pair_extract_value(cmd, &args[2], &value, &private))
 		return TRUE;
 
-	if (private && !metadata_private_allowed()) {
-		client_send_tagline(cmd,
-				    "NO private annotations not supported.");
-		return TRUE;
-	}
-
-	success = metadata_set_metadata_entry(cmd, mailbox, entry, value,
-					      private);
-	if (success) {
-		client_send_tagline(cmd, "OK Completed.");
-	}
+	struct mail_namespace *ns = mail_namespace_find(cmd->client->user->namespaces, &mailbox_name);
+	if (ns == NULL) {
+		client_send_tagline(cmd,
+				    "NO Mailbox not found.");
+		return TRUE;
+	}
+
+	struct mailbox *box = mailbox_alloc(ns->list, mailbox_name, MAILBOX_FLAG_READONLY);
+	if (box == NULL) {
+		client_send_tagline(cmd,
+				    "NO Allocating mailbox failed.");
+		return TRUE;
+	}
+
+	struct metadata_entry *entry = parse_entry(box, private ? ENTRY_SCOPE_PRIVATE : ENTRY_SCOPE_SHARED, entry_name, value);
+	if (entry == NULL) {
+		client_send_tagline(cmd,
+				    "NO Parsing entry failed.");
+		mailbox_free(&box);
+		return TRUE;
+	}
+
+	if (metadata_set_entry(entry, cmd->client->user) < 0) {
+		client_send_tagline(cmd,
+				    "NO Setting entry failed.");
+		mailbox_free(&box);
+		return TRUE;
+	}
+
+	client_send_tagline(cmd, "OK Completed.");
+
+	mailbox_free(&box);
 
 	return TRUE;
 }
 
 
-void imap_annotatemore_plugin_init(void)
+static void imap_annotatemore_client_created(struct client **client)
+{
+	if (mail_user_is_plugin_loaded((*client)->user, imap_annotatemore_module))
+		str_append((*client)->capability_string, " ANNOTATEMORE");
+
+	if (next_hook_client_created != NULL)
+		next_hook_client_created(client);
+}
+
+
+void imap_annotatemore_plugin_init(struct module *module)
 {
 	command_register("GETANNOTATION", cmd_getannotation, 0);
 	command_register("SETANNOTATION", cmd_setannotation, 0);
-	str_append(capability_string, " ANNOTATEMORE");
+
+	imap_annotatemore_module = module;
+	next_hook_client_created = hook_client_created;
+	hook_client_created = imap_annotatemore_client_created;
 }
 
+
 void imap_annotatemore_plugin_deinit(void)
 {
 	command_unregister("SETANNOTATION");
 	command_unregister("GETANNOTATION");
+
+	hook_client_created = next_hook_client_created;
 }

=== removed file 'src/imap-annotatemore-plugin.h'
--- src/imap-annotatemore-plugin.h	2010-08-11 17:11:01 +0000
+++ src/imap-annotatemore-plugin.h	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-#ifndef __ANNOTATEMORE_PLUGIN
-#define __ANNOTATEMORE_PLUGIN
-
-void imap_annotatemore_plugin_init(void);
-void imap_annotatemore_plugin_deinit(void);
-
-#endif

=== added file 'src/imap-arg-ext.c'
--- src/imap-arg-ext.c	1970-01-01 00:00:00 +0000
+++ src/imap-arg-ext.c	2011-09-29 19:49:50 +0000
@@ -0,0 +1,83 @@
+/*
+	Copyright (c) 2010 by Dennis Schridde
+
+	This file is part of dovecot-metadata.
+
+	dovecot-metadata is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	dovecot-metadata is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with dovecot-metadata.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include "imap-arg-ext.h"
+
+#include <stdlib.h>
+
+bool
+imap_arg_get_astringlist(const struct imap_arg *arg, const char ***list_r) {
+	i_assert(list_r != NULL);
+	if (list_r == NULL) {
+		return false;
+	}
+
+	if (*list_r != NULL) {
+		free(*list_r);
+		*list_r = NULL;
+	}
+
+	size_t list_size = 0;
+
+	if (arg->type == IMAP_ARG_LIST) { // entries
+		const struct imap_arg *arglist = NULL;
+		if (!imap_arg_get_list(arg, &arglist)) {
+			return false;
+		}
+
+		while (arglist[list_size].type != IMAP_ARG_EOL) {
+			const char *astring = NULL;
+			if (!imap_arg_get_astring(&arglist[list_size], &astring)) {
+				free(*list_r);
+				*list_r = NULL;
+				return false;
+			}
+
+			*list_r = realloc(*list_r, (list_size+2)*sizeof(*list_r));
+			if (*list_r == NULL) {
+				return false;
+			}
+
+			(*list_r)[list_size] = astring;
+
+			list_size++;
+		}
+	}
+	else if (IMAP_ARG_TYPE_IS_ASTRING(arg->type)) {
+		const char *astring = NULL;
+		if (!imap_arg_get_astring(arg, &astring)) {
+			return false;
+		}
+
+		*list_r = realloc(*list_r, (list_size+2)*sizeof(*list_r));
+		if (*list_r == NULL) {
+			return false;
+		}
+
+		(*list_r)[list_size] = astring;
+
+		list_size++;
+	}
+	else {
+		return false;
+	}
+
+	(*list_r)[list_size] = NULL;
+
+	return true;
+}

=== added file 'src/imap-arg-ext.h'
--- src/imap-arg-ext.h	1970-01-01 00:00:00 +0000
+++ src/imap-arg-ext.h	2011-09-29 19:49:50 +0000
@@ -0,0 +1,32 @@
+/*
+	Copyright (c) 2010 by Dennis Schridde
+
+	This file is part of dovecot-metadata.
+
+	dovecot-metadata is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	dovecot-metadata is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with dovecot-metadata.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#ifndef DOVECOT_IMAP_ARG_EXT_H
+#define DOVECOT_IMAP_ARG_EXT_H
+
+#include "metadata-global.h"
+
+#include <stdbool.h>
+
+#include "imap-arg.h"
+
+bool
+imap_arg_get_astringlist(const struct imap_arg *arg, const char ***list_r)
+	ATTR_WARN_UNUSED_RESULT;
+
+#endif

=== added file 'src/imap-metadata-plugin.c'
--- src/imap-metadata-plugin.c	1970-01-01 00:00:00 +0000
+++ src/imap-metadata-plugin.c	2011-09-29 19:49:50 +0000
@@ -0,0 +1,699 @@
+/*
+	Copyright (c) 2010 by Dennis Schridde
+
+	This file is part of dovecot-metadata.
+
+	dovecot-metadata is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	dovecot-metadata is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with dovecot-metadata.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include "metadata-global.h"
+
+#include "imap-common.h"
+#include "imap-client.h"
+#include "imap-quote.h"
+
+#include <stdbool.h>
+#include <stdlib.h>
+
+#include "str-ext.h"
+#include "imap-arg-ext.h"
+#include "dict-ext.h"
+#include "metadata-entry.h"
+#include "metadata-backend.h"
+#include "metadata-mail-user-module-private.h"
+
+/* The IMAP Metadata plugin is an implementation of RFC 5464 */
+
+const char *imap_metadata_plugin_version = DOVECOT_VERSION;
+const char *imap_metadata_plugin_dependencies[] = { "metadata", NULL };
+
+static struct module *imap_metadata_module;
+static void (*next_hook_client_created)(struct client **client);
+
+
+static const char *
+entry_scopes[ENTRY_SCOPE_MAX] = {
+	"private/", /* ENTRY_SCOPE_PRIVATE */
+	"shared/" /* ENTRY_SCOPE_SHARED */
+};
+
+static const char *
+entry_types[ENTRY_TYPE_MAX] = {
+	"vendor/", /* ENTRY_TYPE_VENDOR */
+	"", /* ENTRY_TYPE_RFC */
+};
+
+static const char **
+entry_subtypes_rfc[ENTRY_SUBJECT_MAX] = {
+	(const char*[]){ // server
+		"comment",
+		"admin",
+		NULL
+	},
+	(const char*[]){ // mailbox
+		"comment",
+		NULL
+	}
+};
+
+
+enum getmetadata_option {
+	GETMETADATA_OPTION_MAXSIZE,
+	GETMEDADATA_OPTION_DEPTH
+};
+
+struct option_definition {
+	const char *name;
+	int num_values;
+	enum getmetadata_option option;
+};
+
+static
+struct option_definition
+getmetadata_options[] = {
+	{"maxsize", 1, GETMETADATA_OPTION_MAXSIZE},
+	{"depth", 1, GETMEDADATA_OPTION_DEPTH},
+	{NULL, 0, 0}
+};
+
+
+static
+struct option_definition *
+parse_getmetadata_option(const char *option) {
+	struct option_definition *optdef = getmetadata_options;
+	while (optdef->name != NULL) {
+		if (strcasecmp(optdef->name, option) == 0) {
+			return optdef;
+		}
+		optdef++;
+	}
+	return NULL;
+}
+
+
+static int
+parse_getmetadata_depth(const char *value) {
+	if (!str_is_numeric(value, '\0')) {
+		if (strcasecmp(value, "infinity"))
+			return METADATA_ITERATE_DEPTH_INF;
+
+		return -1;
+	}
+
+	char *end = NULL;
+	long int val = strtol(value, &end, 10);
+
+	if (end == value)
+		return -2;
+	if (val == LONG_MAX)
+		return -3;
+	if (val < 0)
+		return -4;
+
+	return val;
+}
+
+
+static int
+parse_getmetadata_maxsize(const char *value) {
+	if (!str_is_numeric(value, '\0'))
+		return -1;
+
+	char *end = NULL;
+	long int val = strtol(value, &end, 10);
+
+	if (end == value)
+		return -2;
+	if (val == LONG_MAX)
+		return -3;
+	if (val < 0)
+		return -4;
+
+	return val;
+}
+
+
+/* validates that the part after /vendor conforms to the RFC */
+static ATTR_NONNULL(1)
+bool
+is_valid_rfc5464_vendor_name(const char *name) {
+	const char *lastslash = NULL, *lastcr = NULL;
+	int num_components = 3; // "vendor/" already includes the slash of component No3
+
+	for (const char *c = name; *c != '\0'; c++) {
+		switch (*c) {
+			case '/':
+				// Two consecutive slashes, or a slash at the end are an error
+				if (lastslash == c-1 || *(c+1) == '\0') {
+					return false;
+				}
+				lastslash = c;
+				num_components++;
+				break;
+			case '*':
+			case '%':
+				return false;
+			case '\r':
+				lastcr = c;
+				break;
+			case '\n':
+				// line ending has to be CRLF
+				if (lastcr != c-1) {
+					return false;
+				}
+				break;
+			default:
+				break;
+		}
+	}
+
+	return num_components >= 4;
+}
+
+
+static ATTR_NONNULL(1)
+bool
+is_valid_rfc5464_subtype_name(const char *name, enum metadata_entry_subject subject) {
+	bool found_subtype = false;
+
+	i_assert(subject > 0 && subject < ENTRY_SUBJECT_MAX);
+
+	for (const char **subtype = entry_subtypes_rfc[subject]; *subtype != NULL; subtype++) {
+		size_t subtype_len = strlen(*subtype);
+
+		if (strncasecmp(name, *subtype, subtype_len) == 0
+			&& name[subtype_len] == '\0') {
+			found_subtype = true;
+		}
+	}
+
+	return found_subtype;
+}
+
+
+/* sets entry->scope and returns remaining string */
+static ATTR_NONNULL(1)
+enum metadata_entry_scope
+parse_entry_scope(const char **name) {
+	for (int scope = 0; scope < ENTRY_SCOPE_MAX; scope++) {
+		size_t scope_len = strlen(entry_scopes[scope]);
+
+		if (strncasecmp(*name, entry_scopes[scope], scope_len) == 0) {
+			*name += scope_len;
+			return scope;
+		}
+	}
+
+	return ENTRY_SCOPE_MAX;
+}
+
+
+/* sets entry->type and returns remaining string */
+static ATTR_NONNULL(1)
+enum metadata_entry_type
+parse_entry_type(const char **name, enum metadata_entry_subject subject) {
+	for (int type = 0; type < ENTRY_TYPE_MAX; type++) {
+		size_t type_len = strlen(entry_types[type]);
+
+		if (strncasecmp(*name, entry_types[type], type_len) == 0) {
+			*name += type_len;
+
+			switch (type) {
+				case ENTRY_TYPE_RFC:
+					if (!is_valid_rfc5464_subtype_name(*name, subject))
+						return ENTRY_TYPE_MAX;
+					break;
+				case ENTRY_TYPE_VENDOR:
+					if (!is_valid_rfc5464_vendor_name(*name))
+						return ENTRY_TYPE_MAX;
+					break;
+			}
+
+			return type;
+		}
+	}
+
+	return ENTRY_TYPE_MAX;
+}
+
+
+/* fill entry with data parsed from entry->full_name */
+static ATTR_NONNULL(2)
+struct metadata_entry *
+parse_entry(struct mailbox *box, const char *name, const char *value) {
+	const char *name_tmp = name;
+	if (name_tmp == NULL || *name_tmp++ != '/')
+		return NULL;
+
+	enum metadata_entry_scope scope = parse_entry_scope(&name_tmp);
+	if (scope >= ENTRY_SCOPE_MAX)
+		return NULL;
+
+	enum metadata_entry_type type = parse_entry_type(&name_tmp, box ? ENTRY_SUBJECT_MAILBOX : ENTRY_SUBJECT_SERVER);
+	if (type >= ENTRY_TYPE_MAX)
+		return NULL;
+
+	return metadata_entry_alloc(box, name, value);
+}
+
+
+static int
+get_and_send_entry(struct client_command_context *cmd, struct mailbox *box, const char *name, int depth, int maxsize, int *longentries) {
+	if (str_has_wildcards(name)) {
+		client_send_tagline(cmd, "NO Wildcards in entry name not allowed.");
+		return -1;
+	}
+
+	if (depth == 0) {
+		struct metadata_entry *entry = parse_entry(box, name, NULL);
+		if (entry == NULL) {
+			client_send_tagline(cmd, "NO Parsing entry failed.");
+			return -1;
+		}
+
+		int success = metadata_get_entry(entry, cmd->client->user);
+		if (success < 0) {
+			i_assert(0);
+			client_send_tagline(cmd, "NO Getting entry failed.");
+			return -1;
+		}
+		else if (success > 0) {
+			const char *str = t_strdup_printf(
+				"* METADATA %s (%s %s)",
+				mailbox_get_vname(box), metadata_entry_get_name(entry), metadata_entry_get_value(entry)
+			);
+
+			return client_send_line(cmd->client, str);
+		}
+
+		return 0;
+	}
+
+	struct metadata_entry *entry = metadata_entry_alloc(box, name, NULL);
+
+	int num_entries = 0;
+
+	string_t *str = t_str_new(128);
+	str_append_printf(str, "* METADATA %s (", mailbox_get_vname(box));
+
+	struct metadata_iterate_context *iter = metadata_iterate_init(box, entry, depth);
+	while (metadata_iterate(iter, entry)) {
+		const char *name = metadata_entry_get_name(entry);
+		const char *value = metadata_entry_get_value(entry);
+
+		/* only respect maxsize if it is not 'undefined' */
+		if (maxsize > 0) {
+			size_t val_len = strlen(value);
+			if (val_len > maxsize && val_len > *longentries) {
+				*longentries = val_len;
+				continue;
+			}
+		}
+
+		str_append_printf(str, "%s %s ", name, value);
+
+		num_entries++;
+	}
+	if (metadata_iterate_deinit(&iter) < 0) {
+		client_send_tagline(cmd, "NO Iterating metadata failed.");
+		return -1;
+	}
+
+	str_append(str, ")");
+
+	if (num_entries > 0) {
+		return client_send_line(cmd->client, str_c(str));
+	}
+
+	return 0;
+}
+
+
+static bool
+cmd_getmetadata(struct client_command_context *cmd) {
+	const struct imap_arg *args;
+	int maxsize = 0, depth = 0;
+
+	if (!client_read_args(cmd, 0, 0, &args))
+		return false;
+
+	if (args[0].type == IMAP_ARG_LIST) { // options
+		const struct imap_arg *arglist = NULL;
+		if (!imap_arg_get_list(&args[0], &arglist)) {
+			client_send_command_error(cmd, "Cannot read options, list expected.");
+			return true;
+		}
+
+		while (arglist->type != IMAP_ARG_EOL) {
+			if (!IMAP_ARG_TYPE_IS_ASTRING(arglist->type)) {
+				client_send_command_error(cmd, "Option not a string.");
+				return true;
+			}
+
+			const char *option = NULL;
+			if (!imap_arg_get_astring(arglist, &option)){
+				client_send_command_error(cmd, "Cannot read option, string expected.");
+				return true;
+			}
+
+			struct option_definition *optdef = parse_getmetadata_option(option);
+			if (optdef == NULL) {
+				const char *estr = t_strdup_printf("Unknown option: %s.", option);
+				client_send_command_error(cmd, estr);
+				return true;
+			}
+
+			arglist++;
+
+			const char *values[optdef->num_values];
+			memset(values, 0, sizeof(*values) * optdef->num_values);
+
+			for (int i = 0; i < optdef->num_values; i++) {
+				if (!IMAP_ARG_TYPE_IS_ASTRING(arglist[i].type)) {
+					const char *estr = t_strdup_printf(
+						"Value %d/%d of %s not a string.",
+						i, optdef->num_values, option
+					);
+					client_send_command_error(cmd, estr);
+					return true;
+				}
+
+				if (!imap_arg_get_astring(&arglist[i], &values[i])){
+					const char *estr = t_strdup_printf(
+						"Cannot read value %d/%d of %s, string expected.",
+						i, optdef->num_values, option
+					);
+					client_send_command_error(cmd, estr);
+					return true;
+				}
+			}
+
+			switch (optdef->option) {
+				case GETMEDADATA_OPTION_DEPTH:
+					depth = parse_getmetadata_depth(values[0]);
+					if (depth < 0) {
+						client_send_command_error(cmd, "Value 1/1 of DEPTH is not numeric and positive or \"infinity\".");
+						return true;
+					}
+					break;
+				case GETMETADATA_OPTION_MAXSIZE:
+					maxsize = parse_getmetadata_maxsize(values[0]);
+					if (maxsize < 0) {
+						client_send_command_error(cmd, "Value 1/1 of MAXSIZE is not numeric and positive.");
+						return true;
+					}
+					break;
+			}
+
+			arglist += optdef->num_values;
+		}
+
+		args++;
+	}
+
+	if (!IMAP_ARG_TYPE_IS_ASTRING(args[0].type)) { // mailbox name
+		client_send_command_error(cmd, "Mailbox name not a string.");
+		return true;
+	}
+
+	const char *mailbox_name = NULL;
+	if (!imap_arg_get_astring(&args[0], &mailbox_name)){
+		client_send_command_error(cmd, "Cannot read mailbox name, string expected.");
+		return true;
+	}
+
+	if (mailbox_name == NULL) {
+		client_send_tagline(cmd, "NO Mailbox name is NULL.");
+		return true;
+	}
+
+	const char **entry_names = NULL;
+	if (!imap_arg_get_astringlist(&args[1], &entry_names)) {
+		client_send_command_error(cmd, "Cannot read entries, string or list of strings expected.");
+		return true;
+	}
+
+	int warn_longentries = 0;
+
+	if (str_has_wildcards(mailbox_name)) {
+		for (const struct mail_namespace *ns = cmd->client->user->namespaces; ns != NULL; ns = ns->next) {
+			const struct mailbox_info *info = NULL;
+
+			struct mailbox_list_iterate_context *ctx = mailbox_list_iter_init(ns->list, mailbox_name, 0);
+			while ((info = mailbox_list_iter_next(ctx)) != NULL) {
+				i_debug("Getting info for mailbox '%s'", info->name);
+
+				struct mailbox *box = mailbox_alloc(ns->list, info->name, MAILBOX_FLAG_READONLY);
+				if (box == NULL) {
+					client_send_tagline(cmd, "NO Allocating mailbox failed.");
+					return TRUE;
+				}
+
+				const char **entry_name = entry_names;
+				while (*entry_name != NULL) {
+					if (get_and_send_entry(cmd, box, *entry_name, depth, maxsize, &warn_longentries) < 0) {
+						/* get_and_send_entry outputs the response for the client, already */
+						mailbox_free(&box);
+						return true;
+					}
+
+					entry_name++;
+				}
+
+				mailbox_free(&box);
+			}
+
+			if (mailbox_list_iter_deinit(&ctx) < 0) {
+				client_send_tagline(cmd, "NO Iterating mailboxes failed.");
+			}
+		}
+	}
+	else {
+		struct mailbox *box = NULL;
+		/* empty mailbox_name -> box=NULL -> server scope */
+		if (*mailbox_name != '\0') {
+			struct mail_namespace *ns = mail_namespace_find(cmd->client->user->namespaces, &mailbox_name);
+			if (ns == NULL) {
+				client_send_tagline(cmd, "NO Mailbox not found.");
+				return true;
+			}
+
+			box = mailbox_alloc(ns->list, mailbox_name, MAILBOX_FLAG_READONLY);
+			if (box == NULL) {
+				client_send_tagline(cmd, "NO Allocating mailbox failed.");
+				return true;
+			}
+		}
+
+		const char **entry_name = entry_names;
+		while (*entry_name != NULL) {
+			if (get_and_send_entry(cmd, box, *entry_name, depth, maxsize, &warn_longentries) < 0) {
+				/* get_and_send_entry outputs the response for the client, already */
+				mailbox_free(&box);
+				return true;
+			}
+
+			entry_name++;
+		}
+
+		mailbox_free(&box);
+	}
+
+	free(entry_names);
+
+	const char *response;
+	if (warn_longentries > 0) {
+		response = t_strdup_printf("OK [METADATA LONGENTRIES %d] Completed.", warn_longentries);
+	}
+	else {
+		response = "OK Completed.";
+	}
+	client_send_tagline(cmd, response);
+
+	return true;
+}
+
+
+static bool
+cmd_setmetadata(struct client_command_context *cmd) {
+	const struct imap_arg *args;
+
+	if (!client_read_args(cmd, 0, 0, &args))
+		return false;
+
+	if (!IMAP_ARG_TYPE_IS_ASTRING(args[0].type)) { // mailbox name
+		client_send_command_error(cmd, "Mailbox name not a string.");
+		return true;
+	}
+
+	const char *mailbox_name = NULL;
+	if (!imap_arg_get_astring(&args[0], &mailbox_name)){
+		client_send_command_error(cmd, "Cannot read mailbox name, string expected.");
+		return true;
+	}
+
+	if (mailbox_name == NULL) {
+		client_send_tagline(cmd, "NO Mailbox name is NULL.");
+		return true;
+	}
+
+	struct mailbox *box = NULL;
+	/* empty name -> box=NULL -> server scope */
+	if (*mailbox_name != '\0') {
+		struct mail_namespace *ns = mail_namespace_find(cmd->client->user->namespaces, &mailbox_name);
+		if (ns == NULL) {
+			client_send_tagline(cmd, "NO Mailbox not found.");
+			return true;
+		}
+
+		box = mailbox_alloc(ns->list, mailbox_name, MAILBOX_FLAG_READONLY);
+		if (box == NULL) {
+			client_send_tagline(cmd, "NO Allocating mailbox failed.");
+			return true;
+		}
+	}
+
+	bool warn_maxsize = false, warn_toomany = false, warn_noprivate = false;
+
+	if (args[1].type == IMAP_ARG_LIST) { // entries
+		const struct imap_arg *arglist = NULL;
+		if (!imap_arg_get_list(&args[1], &arglist)){
+		client_send_command_error(cmd, "Cannot read entries, list expected.");
+			mailbox_free(&box);
+			return true;
+		}
+
+		while (arglist[0].type != IMAP_ARG_EOL) {
+			if (!IMAP_ARG_TYPE_IS_ASTRING(arglist[0].type)) {
+				client_send_command_error(cmd, "Entry name not a string.");
+				mailbox_free(&box);
+				return true;
+			}
+
+			const char *name = NULL;
+			if (!imap_arg_get_astring(&arglist[0], &name)){
+				client_send_command_error(cmd, "Cannot read entry name, string expected.");
+				mailbox_free(&box);
+				return true;
+			}
+
+			if (name == NULL) {
+				client_send_tagline(cmd, "NO Entry name is NULL.");
+				mailbox_free(&box);
+				return true;
+			}
+
+			const char *value;
+			if (arglist[1].type == IMAP_ARG_NIL) {
+				value = NULL;
+			}
+			else if (IMAP_ARG_TYPE_IS_ASTRING(arglist[1].type)) {
+				if (!imap_arg_get_astring(&arglist[1], &value)){
+					client_send_command_error(cmd, "Cannot read value, string expected.");
+					mailbox_free(&box);
+					return true;
+				}
+			}
+			else {
+				client_send_command_error(cmd, "Value not nil or string.");
+				mailbox_free(&box);
+				return true;
+			}
+
+			struct metadata_entry *entry = parse_entry(box, name, value);
+			if (entry == NULL) {
+				client_send_tagline(cmd, "NO Parsing entry failed.");
+				mailbox_free(&box);
+				return true;
+			}
+
+			int ret = metadata_set_entry(entry, cmd->client->user);
+			if (ret == -2) {
+				warn_maxsize = true;
+			}
+			else if (ret == -3) {
+				warn_toomany = true;
+			}
+			else if (ret < 0) {
+				client_send_tagline(cmd, "NO Setting entry failed.");
+				mailbox_free(&box);
+				return true;
+			}
+
+			/* skip this name/value pair */
+			arglist += 2;
+		}
+	}
+	else {
+		client_send_command_error(cmd, "Entries not a list.");
+		mailbox_free(&box);
+		return true;
+	}
+
+	const char *response;
+	if (warn_maxsize) {
+		struct metadata_mail_user *muser = METADATA_USER_CONTEXT(cmd->client->user);
+		if (muser == NULL) {
+			i_error("metadata: found NULL user, can't set metadata");
+			client_send_tagline(cmd, "NO Internal error.");
+			mailbox_free(&box);
+			return true;
+		}
+
+		response = t_strdup_printf("OK [METADATA MAXSIZE %d] Completed.", muser->set->maxsize);
+	}
+	else if (warn_toomany) {
+		response = t_strdup_printf("OK [METADATA TOOMANY] Completed.");
+	}
+	else if (warn_noprivate) {
+		response = t_strdup_printf("OK [METADATA NOPRIVATE] Completed.");
+	}
+	else {
+		response = "OK Completed.";
+	}
+	client_send_tagline(cmd, response);
+
+	mailbox_free(&box);
+
+	return true;
+}
+
+
+static void imap_metadata_client_created(struct client **client)
+{
+	if (mail_user_is_plugin_loaded((*client)->user, imap_metadata_module))
+		str_append((*client)->capability_string, " METADATA");
+
+	if (next_hook_client_created != NULL)
+		next_hook_client_created(client);
+}
+
+
+void imap_metadata_plugin_init(struct module *module)
+{
+	command_register("GETMETADATA", cmd_getmetadata, 0);
+	command_register("SETMETADATA", cmd_setmetadata, 0);
+
+	imap_metadata_module = module;
+	next_hook_client_created = hook_client_created;
+	hook_client_created = imap_metadata_client_created;
+}
+
+
+void imap_metadata_plugin_deinit(void)
+{
+	command_unregister("SETMETADATA");
+	command_unregister("GETMETADATA");
+
+	hook_client_created = next_hook_client_created;
+}

=== added file 'src/mailbox-ext.c'
--- src/mailbox-ext.c	1970-01-01 00:00:00 +0000
+++ src/mailbox-ext.c	2011-09-29 19:49:50 +0000
@@ -0,0 +1,30 @@
+/*
+	Copyright (c) 2010 by Dennis Schridde
+
+	This file is part of dovecot-metadata.
+
+	dovecot-metadata is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	dovecot-metadata is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with dovecot-metadata.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include "mailbox-ext.h"
+
+#include "hex-binary.h"
+
+const char *
+mailbox_get_guid_string(struct mailbox *box) {
+	uint8_t guid[MAIL_GUID_128_SIZE];
+	if (mailbox_get_guid(box, guid) < 0)
+		return NULL;
+
+	return binary_to_hex(guid, sizeof(guid));
+}

=== added file 'src/mailbox-ext.h'
--- src/mailbox-ext.h	1970-01-01 00:00:00 +0000
+++ src/mailbox-ext.h	2011-09-29 19:49:50 +0000
@@ -0,0 +1,30 @@
+/*
+	Copyright (c) 2010 by Dennis Schridde
+
+	This file is part of dovecot-metadata.
+
+	dovecot-metadata is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	dovecot-metadata is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with dovecot-metadata.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#ifndef DOVECOT_MAILBOX_EXT_H
+#define DOVECOT_MAILBOX_EXT_H
+
+#include "metadata-global.h"
+
+#include "mail-storage.h"
+
+const char *
+mailbox_get_guid_string(struct mailbox *box)
+	ATTR_NONNULL(1);
+
+#endif

=== added file 'src/metadata-backend.c'
--- src/metadata-backend.c	1970-01-01 00:00:00 +0000
+++ src/metadata-backend.c	2011-09-29 19:49:50 +0000
@@ -0,0 +1,296 @@
+/*
+	Copyright (c) 2010 by Dennis Schridde
+
+	This file is part of dovecot-metadata.
+
+	dovecot-metadata is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	dovecot-metadata is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with dovecot-metadata.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include "metadata-backend.h"
+
+#include "dict.h"
+#include "mail-storage.h"
+
+#include <string.h>
+
+#include "str-ext.h"
+#include "dict-ext.h"
+#include "mailbox-ext.h"
+#include "metadata-entry-private.h"
+#include "metadata-mail-user-module-private.h"
+
+static const char *
+dict_subjects[ENTRY_SUBJECT_MAX+1] = {
+	"server/", /* ENTRY_SUBJECT_SERVER */
+	"mailbox/", /* ENTRY_SUBJECT_MAILBOX */
+	NULL
+};
+
+static const char*
+dictsubject_from_entry(struct metadata_entry *entry) {
+	switch (metadata_entry_get_subject(entry)) {
+		case ENTRY_SUBJECT_SERVER:
+			return dict_subjects[ENTRY_SUBJECT_SERVER];
+		case ENTRY_SUBJECT_MAILBOX:
+			return t_strconcat(dict_subjects[ENTRY_SUBJECT_MAILBOX], entry->mailbox_guid, "/", NULL);
+		case ENTRY_SUBJECT_MAX:
+			return NULL;
+	}
+
+	return NULL;
+}
+
+static const char*
+t_dictkey_from_entry(struct metadata_entry *entry) {
+	const char *subject = dictsubject_from_entry(entry);
+	if (subject == NULL)
+		return NULL;
+
+	const char *path_prefix = NULL;
+	switch (metadata_entry_get_scope(entry)) {
+		case ENTRY_SCOPE_SHARED:
+			path_prefix = DICT_PATH_SHARED;
+			break;
+		case ENTRY_SCOPE_PRIVATE:
+			path_prefix = DICT_PATH_PRIVATE;
+			break;
+		case ENTRY_SCOPE_INVALID:
+		case ENTRY_SCOPE_NONE:
+			return NULL;
+	}
+
+	// -> "prefix/" "subject/" "name"
+	return t_strconcat(path_prefix, subject, &entry->name[1], NULL);
+}
+
+static int
+count_entries(struct metadata_mail_user *muser) {
+	struct dict_iterate_context *iter;
+	const char *key;
+	const char *value;
+	int num = 0;
+
+	iter = dict_iterate_init(muser->dict, DICT_PATH_SHARED, DICT_ITERATE_FLAG_RECURSE);
+	while (dict_iterate(iter, &key, &value)) {
+		num++;
+	}
+	if (dict_iterate_deinit(&iter) < 0) {
+		i_error("metadata: dict iteration failed, can't count shared entries");
+		return -1;
+	}
+	iter = dict_iterate_init(muser->dict, DICT_PATH_PRIVATE, DICT_ITERATE_FLAG_RECURSE);
+	while (dict_iterate(iter, &key, &value)) {
+		num++;
+	}
+	if (dict_iterate_deinit(&iter) < 0) {
+		i_error("metadata: dict iteration failed, can't count private entries");
+		return -1;
+	}
+
+	return num;
+}
+
+int
+metadata_set_entry(struct metadata_entry *entry, struct mail_user *user) {
+	struct metadata_mail_user *muser = METADATA_USER_CONTEXT(user);
+	if (muser == NULL) {
+		i_error("metadata: found NULL user, can't set their metadata");
+		return -1;
+	}
+
+	if (!metadata_entry_is_valid(entry))
+		return -4;
+	if (strlen(entry->name) > muser->set->maxsize)
+		return -2;
+	if (count_entries(muser) > muser->set->maxentries)
+		return -3;
+
+	const char *key = t_dictkey_from_entry(entry);
+	if (key == NULL)
+		return -1;
+
+	struct dict_transaction_context *dt = dict_transaction_begin(muser->dict);
+
+	if (entry->value == NULL)
+		dict_unset(dt, key);
+	else
+		dict_set(dt, key, entry->value);
+
+	if (dict_transaction_commit(&dt) < 0) {
+		i_error("metadata: dict commit failed");
+		return -1;
+	}
+
+	return 0;
+}
+
+int
+metadata_get_entry(struct metadata_entry *entry, struct mail_user *user) {
+	struct metadata_mail_user *muser = METADATA_USER_CONTEXT(user);
+	if (muser == NULL) {
+		i_error("metadata: found NULL user, can't get their metadata");
+		return -1;
+	}
+
+	if (!metadata_entry_is_valid(entry))
+		return -4;
+
+	const char *key = t_dictkey_from_entry(entry);
+	if (key == NULL)
+		return -1;
+
+	return dict_lookup(muser->dict, user->pool, key, &entry->value);
+}
+
+struct metadata_iterate_context {
+	struct dict_iterate_multiscope_context *dict_ctx;
+	int depth;
+	bool failed;
+};
+
+struct metadata_iterate_context*
+metadata_iterate_init(struct mailbox *mailbox, struct metadata_entry *entry, int depth) {
+	struct metadata_iterate_context *ctx = i_new(struct metadata_iterate_context, 1);
+	memset(ctx, 0, sizeof(*ctx));
+
+	struct mail_storage *storage = mailbox_get_storage(mailbox);
+	struct mail_user *user = mail_storage_get_user(storage);
+	struct metadata_mail_user *muser = METADATA_USER_CONTEXT(user);
+	if (muser == NULL) {
+		i_error("metadata: found NULL user, can't iterate over their metadata");
+		ctx->failed = true;
+		return ctx;
+	}
+
+	i_assert(entry != NULL);
+	if (entry == NULL) {
+		ctx->failed = true;
+		return ctx;
+	}
+
+	const char *entry_name = metadata_entry_get_name(entry);
+	const int root_depth = strchr_num(entry_name, '/');
+	ctx->depth = root_depth + depth;
+
+	enum dict_iterate_multiscope_flags flags = 0;
+	if (depth != 0)
+		flags |= DICT_ITERATE_FLAG_RECURSE;
+
+	switch (metadata_entry_get_scope(entry)) {
+		case ENTRY_SCOPE_SHARED:
+		case ENTRY_SCOPE_PRIVATE:
+			break;
+		case ENTRY_SCOPE_INVALID:
+			ctx->failed = true;
+			return ctx;
+		case ENTRY_SCOPE_NONE:
+			flags |= DICT_ITERATE_MULTISCOPE_FLAG_MULTISCOPE;
+			break;
+	}
+
+	const char *key = t_dictkey_from_entry(entry);
+	if (key == NULL) {
+		ctx->failed = true;
+		return ctx;
+	}
+
+	ctx->dict_ctx = dict_iterate_multiscope_init(muser->dict, key, flags);
+	if (ctx->dict_ctx == NULL) {
+		ctx->failed = true;
+		return ctx;
+	}
+
+	return ctx;
+}
+
+static ATTR_NONNULL(2)
+const char *
+entry_name_from_dict_name(enum metadata_entry_subject subject, const char *dict_name) {
+	/* skip dict internal prefixes: priv/ or shared/ */
+	const char *name_after_scope = strchr(dict_name, '/');
+	if (name_after_scope == NULL) {
+		return NULL;
+	}
+
+	/* skip '/' */
+	name_after_scope++;
+
+	/* skip dict internal prefixes: server/ or mailbox/ */
+	const char *name_after_subject = strchr(name_after_scope, '/');
+	if (name_after_subject == NULL) {
+		return NULL;
+	}
+
+	/* do not skip '/', the name needs to start with a '/'! */
+
+	/* skip dict internal prefixes: <mailbox_guid>/ (for mailboxes only) */
+	if (subject == ENTRY_SUBJECT_MAILBOX) {
+		name_after_subject = strchr(name_after_subject+1, '/');
+		if (name_after_subject == NULL) {
+			return NULL;
+		}
+	}
+
+	return name_after_subject;
+}
+
+bool
+metadata_iterate(struct metadata_iterate_context *ctx, struct metadata_entry *entry) {
+	i_assert(ctx != NULL);
+	if (ctx == NULL)
+		return false;
+
+	if (ctx->failed)
+		return false;
+
+	entry->name = NULL;
+	while (entry->name == NULL) {
+		const char *dict_name = NULL, *dict_value = NULL;
+		if (!dict_iterate_multiscope(ctx->dict_ctx, &dict_name, &dict_value))
+			return false;
+
+		const char *entry_name = entry_name_from_dict_name(metadata_entry_get_subject(entry), dict_name);
+		if (entry_name == NULL) {
+			ctx->failed = true;
+			return false;
+		}
+
+		if (ctx->depth != METADATA_ITERATE_DEPTH_INF && strchr_num(entry_name, '/') > ctx->depth)
+			continue;
+
+		entry->name = i_strdup(entry_name);
+		entry->value = i_strdup(dict_value);
+	}
+
+	return true;
+}
+
+int
+metadata_iterate_deinit(struct metadata_iterate_context **ctx) {
+	i_assert(ctx != NULL);
+	if (ctx == NULL)
+		return -1;
+
+	i_assert(*ctx != NULL);
+	if (*ctx == NULL)
+		return -1;
+
+	int ret = (*ctx)->failed ? -1 : 0;
+
+	if ((*ctx)->dict_ctx != NULL && dict_iterate_multiscope_deinit(&(*ctx)->dict_ctx) < 0)
+		ret = -1;
+
+	i_free(*ctx);
+
+	return ret;
+}

=== added file 'src/metadata-backend.h'
--- src/metadata-backend.h	1970-01-01 00:00:00 +0000
+++ src/metadata-backend.h	2011-09-29 19:49:50 +0000
@@ -0,0 +1,49 @@
+/*
+	Copyright (c) 2010 by Dennis Schridde
+
+	This file is part of dovecot-metadata.
+
+	dovecot-metadata is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	dovecot-metadata is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with dovecot-metadata.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#ifndef DOVECOT_METADATA_BACKEND_H
+#define DOVECOT_METADATA_BACKEND_H
+
+#include "metadata-global.h"
+
+#include <stdbool.h>
+
+#include "metadata-entry.h"
+
+int
+metadata_get_entry(struct metadata_entry *entry, struct mail_user *user)
+	ATTR_NONNULL(1,2);
+int
+metadata_set_entry(struct metadata_entry *entry, struct mail_user *user)
+	ATTR_NONNULL(1,2);
+
+const int METADATA_ITERATE_DEPTH_INF = INT_MAX;
+
+struct metadata_iterate_context;
+
+struct metadata_iterate_context *
+metadata_iterate_init(struct mailbox *mailbox, struct metadata_entry *entry, int depth)
+	ATTR_NONNULL(1,2);
+bool
+metadata_iterate(struct metadata_iterate_context *ctx, struct metadata_entry *entry)
+	ATTR_NONNULL(1,2);
+int
+metadata_iterate_deinit(struct metadata_iterate_context **ctx)
+	ATTR_NONNULL(1);
+
+#endif

=== added file 'src/metadata-entry-private.h'
--- src/metadata-entry-private.h	1970-01-01 00:00:00 +0000
+++ src/metadata-entry-private.h	2011-09-29 19:49:50 +0000
@@ -0,0 +1,32 @@
+/*
+	Copyright (c) 2010 by Dennis Schridde
+
+	This file is part of dovecot-metadata.
+
+	dovecot-metadata is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	dovecot-metadata is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with dovecot-metadata.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#ifndef DOVECOT_METADATA_ENTRY_PRIVATE_H
+#define DOVECOT_METADATA_ENTRY_PRIVATE_H
+
+#include "metadata-entry.h"
+
+struct metadata_entry {
+	enum metadata_entry_scope scope;
+	enum metadata_entry_type type;
+	const char *mailbox_guid; // implicitly defines the subject!
+	const char *name;
+	const char *value;
+};
+
+#endif

=== added file 'src/metadata-entry.c'
--- src/metadata-entry.c	1970-01-01 00:00:00 +0000
+++ src/metadata-entry.c	2011-09-29 19:49:50 +0000
@@ -0,0 +1,173 @@
+/*
+	Copyright (c) 2010 by Dennis Schridde
+
+	This file is part of dovecot-metadata.
+
+	dovecot-metadata is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	dovecot-metadata is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with dovecot-metadata.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include "metadata-entry-private.h"
+
+#include <stdlib.h>
+#include <string.h>
+
+
+#include "mailbox-ext.h"
+
+static
+const char *
+entry_scopes[ENTRY_SCOPE_MAX+1] = {
+	"private/", /* ENTRY_SCOPE_PRIVATE */
+	"shared/", /* ENTRY_SCOPE_SHARED */
+	NULL
+};
+
+static
+enum metadata_entry_scope
+parse_scope(const char *name) {
+	if (name == NULL)
+		return ENTRY_SCOPE_INVALID;
+
+	/* scope must be empty or begin with '/' */
+	if (name[0] != '/') {
+		if (name[0] == '\0')
+			return ENTRY_SCOPE_NONE;
+
+		return ENTRY_SCOPE_INVALID;
+	}
+
+	/* skip '/' */
+	name++;
+
+	/* scope is the first component */
+	for (int i = 0; i < ENTRY_SCOPE_MAX; i++) {
+		if (strncasecmp(entry_scopes[i], name, strlen(entry_scopes[i])) == 0)
+			return i;
+	}
+
+	return ENTRY_SCOPE_INVALID;
+}
+
+static
+const char *
+entry_types[ENTRY_TYPE_MAX+1] = {
+	"vendor/", /* ENTRY_TYPE_VENDOR */
+	"", /* ENTRY_TYPE_RFC */
+	NULL
+};
+
+static
+enum metadata_entry_type
+parse_type(const char *name) {
+	/* lazy evaluation of scope existance */
+	if (name == NULL || *name++ != '/')
+		return ENTRY_TYPE_INVALID;
+
+	/* type is the second component */
+	name = strchr(name, '/');
+	if (name++ == NULL)
+		return ENTRY_TYPE_NONE;
+
+	for (int i = 0; i < ENTRY_TYPE_MAX; i++) {
+		if (strncasecmp(entry_types[i], name, strlen(entry_types[i])) == 0)
+			return i;
+	}
+
+	return ENTRY_TYPE_INVALID;
+}
+
+/* create entry on mailbox with name=value */
+struct metadata_entry *
+metadata_entry_alloc(struct mailbox *mailbox, const char *name, const char *value) {
+	struct metadata_entry *entry = i_new(struct metadata_entry, 1);
+	memset(entry, 0, sizeof(*entry));
+
+	if (mailbox != NULL) {
+		const char *mailbox_guid = mailbox_get_guid_string(mailbox);
+		if (mailbox_guid != NULL)
+			entry->mailbox_guid = strdup(mailbox_guid);
+	}
+
+	entry->scope = parse_scope(name);
+	entry->type = parse_type(name);
+	if (metadata_entry_is_valid(entry)) {
+		if (name != NULL)
+			entry->name = strdup(name);
+		if (value != NULL)
+			entry->value = strdup(value);
+	}
+
+	return entry;
+}
+
+/* free structures allocated for entry and invalidate it */
+void
+entry_free(struct metadata_entry *entry) {
+	free((char*)entry->value);
+	free((char*)entry->name);
+	memset(entry, 0, sizeof(*entry));
+}
+
+bool
+metadata_entry_is_valid(struct metadata_entry *entry) {
+	i_assert(entry != NULL);
+	if (entry == NULL)
+		return false;
+
+	return entry->scope < ENTRY_SCOPE_MAX && entry->type < ENTRY_TYPE_MAX;
+}
+
+const char *
+metadata_entry_get_name(struct metadata_entry *entry) {
+	i_assert(entry != NULL);
+	if (entry == NULL)
+		return NULL;
+
+	return entry->name;
+}
+
+const char *
+metadata_entry_get_value(struct metadata_entry *entry) {
+	i_assert(entry != NULL);
+	if (entry == NULL)
+		return NULL;
+
+	return entry->value;
+}
+
+enum metadata_entry_subject
+metadata_entry_get_subject(struct metadata_entry *entry) {
+	i_assert(entry != NULL);
+	if (entry == NULL)
+		return ENTRY_SUBJECT_INVALID;
+
+	return entry->mailbox_guid ? ENTRY_SUBJECT_MAILBOX : ENTRY_SUBJECT_SERVER;
+}
+
+enum metadata_entry_scope
+metadata_entry_get_scope(struct metadata_entry *entry) {
+	i_assert(entry != NULL);
+	if (entry == NULL)
+		return ENTRY_SCOPE_INVALID;
+
+	return entry->scope;
+}
+
+enum metadata_entry_type
+metadata_entry_get_type(struct metadata_entry *entry) {
+	i_assert(entry != NULL);
+	if (entry == NULL)
+		return ENTRY_TYPE_INVALID;
+
+	return entry->type;
+}

=== added file 'src/metadata-entry.h'
--- src/metadata-entry.h	1970-01-01 00:00:00 +0000
+++ src/metadata-entry.h	2011-09-29 19:49:50 +0000
@@ -0,0 +1,83 @@
+/*
+	Copyright (c) 2010 by Dennis Schridde
+
+	This file is part of dovecot-metadata.
+
+	dovecot-metadata is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	dovecot-metadata is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with dovecot-metadata.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#ifndef DOVECOT_METADATA_ENTRY_H
+#define DOVECOT_METADATA_ENTRY_H
+
+#include "metadata-global.h"
+
+#include <stdbool.h>
+
+#include "mail-storage.h"
+
+enum metadata_entry_subject {
+	ENTRY_SUBJECT_SERVER = 0,
+	ENTRY_SUBJECT_MAILBOX = 1,
+	ENTRY_SUBJECT_MAX,
+	ENTRY_SUBJECT_INVALID = ENTRY_SUBJECT_MAX
+};
+
+enum metadata_entry_scope {
+	ENTRY_SCOPE_PRIVATE = 0,
+	ENTRY_SCOPE_SHARED = 1,
+	ENTRY_SCOPE_MAX,
+	ENTRY_SCOPE_INVALID = ENTRY_SCOPE_MAX,
+	ENTRY_SCOPE_NONE
+};
+
+enum metadata_entry_type {
+	ENTRY_TYPE_VENDOR = 0,
+	ENTRY_TYPE_RFC = 1,
+	ENTRY_TYPE_MAX,
+	ENTRY_TYPE_INVALID = ENTRY_TYPE_MAX,
+	ENTRY_TYPE_NONE
+};
+
+struct metadata_entry *
+metadata_entry_alloc(struct mailbox *mailbox, const char *name, const char *value)
+	ATTR_NONNULL(2);
+
+void
+metadata_entry_free(struct metadata_entry *entry)
+	ATTR_NONNULL(1);
+
+bool
+metadata_entry_is_valid(struct metadata_entry *entry)
+	ATTR_NONNULL(1);
+
+const char *
+metadata_entry_get_name(struct metadata_entry *entry)
+	ATTR_NONNULL(1);
+
+const char *
+metadata_entry_get_value(struct metadata_entry *entry)
+	ATTR_NONNULL(1);
+
+enum metadata_entry_subject
+metadata_entry_get_subject(struct metadata_entry *entry)
+	ATTR_NONNULL(1);
+
+enum metadata_entry_scope
+metadata_entry_get_scope(struct metadata_entry *entry)
+	ATTR_NONNULL(1);
+
+enum metadata_entry_type
+metadata_entry_get_type(struct metadata_entry *entry)
+	ATTR_NONNULL(1);
+
+#endif

=== added file 'src/metadata-global.h'
--- src/metadata-global.h	1970-01-01 00:00:00 +0000
+++ src/metadata-global.h	2011-09-29 19:49:50 +0000
@@ -0,0 +1,52 @@
+/*
+	Copyright (c) 2010 by Dennis Schridde
+
+	This file is part of dovecot-metadata.
+
+	dovecot-metadata is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	dovecot-metadata is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with dovecot-metadata.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#ifndef DOVECOT_METADATA_GLOBAL_H
+#define DOVECOT_METADATA_GLOBAL_H
+
+/*
+	the dovecot include system needs its own special care:
+	* include lib.h first, always
+	* reset all the symbols we use by including metadata-config.h.in,
+		since dovecot's internal config.h leaks through their public headers
+*/
+#include "lib.h"
+
+#define ATTR_NONNULL(...) __attribute__((__nonnull__(__VA_ARGS__)))
+
+/*
+	= error values =
+	< 0 is always an error
+	0 means success or no-more-data
+	> 0 means more-data-available
+
+	= return types =
+	void can never have errors
+
+	== logical functions ==
+	return bool and cannot have errors
+
+	== functions returning pointers ==
+	NULL is an error, everything else not
+
+	== data handling functions ==
+	bool is a continous function which cannot have errors
+	int is any function which can have errors
+*/
+
+#endif

=== added file 'src/metadata-mail-storage-module.c'
--- src/metadata-mail-storage-module.c	1970-01-01 00:00:00 +0000
+++ src/metadata-mail-storage-module.c	2011-09-29 19:49:50 +0000
@@ -0,0 +1,92 @@
+/*
+	Copyright (c) 2010 by Dennis Schridde
+
+	This file is part of dovecot-metadata.
+
+	dovecot-metadata is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	dovecot-metadata is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with dovecot-metadata.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include "metadata-mail-storage-module.h"
+
+#include "dict.h"
+#include "module-context.h"
+#include "mail-storage-private.h"
+
+#include "mailbox-ext.h"
+#include "metadata-mail-user-module-private.h"
+
+#define METADATA_MAILBOX_CONTEXT(obj) MODULE_CONTEXT(obj, metadata_mailbox_module)
+
+static MODULE_CONTEXT_DEFINE_INIT(metadata_mailbox_module, &mail_storage_module_register);
+
+static int
+metadata_mailbox_delete(struct mailbox *box) {
+	union mailbox_module_context *mbox = METADATA_MAILBOX_CONTEXT(box);
+	if (mbox == NULL) {
+		i_error("metadata: found NULL mailbox, can't delete it");
+		return -1;
+	}
+
+	struct mail_storage *storage = mailbox_get_storage(box);
+	struct mail_user *user = mail_storage_get_user(storage);
+	struct metadata_mail_user *muser = METADATA_USER_CONTEXT(user);
+	if (muser == NULL) {
+		i_error("metadata: found NULL user, can't delete mailbox");
+		return -1;
+	}
+
+	struct dict_transaction_context *dt = dict_transaction_begin(muser->dict);
+
+	const char *name;
+	const char *value;
+
+	const char *skey = t_strconcat(DICT_PATH_SHARED, mailbox_get_guid_string(box), NULL);
+
+	struct dict_iterate_context *siter = dict_iterate_init(muser->dict, skey, DICT_ITERATE_FLAG_RECURSE);
+	while (dict_iterate(siter, &name, &value)) {
+		dict_unset(dt, name);
+	}
+	if (dict_iterate_deinit(&siter) < 0) {
+		i_error("metadata: dict iteration (" DICT_PATH_SHARED ") failed, can't update dict");
+		return -1;
+	}
+
+	const char *pkey = t_strconcat(DICT_PATH_PRIVATE, mailbox_get_guid_string(box), NULL);
+
+	struct dict_iterate_context *piter = dict_iterate_init(muser->dict, pkey, DICT_ITERATE_FLAG_RECURSE);
+	while (dict_iterate(piter, &name, &value)) {
+		dict_unset(dt, name);
+	}
+	if (dict_iterate_deinit(&piter) < 0) {
+		i_error("metadata: dict iteration (" DICT_PATH_PRIVATE ") failed, can't update dict");
+		return -1;
+	}
+
+	int super_ret = mbox->super.delete(box);
+	if (super_ret < 0) {
+		dict_transaction_rollback(&dt);
+	} else if (dict_transaction_commit(&dt) < 0) {
+		i_error("metadata: dict commit failed");
+		return -1;
+	}
+
+	return super_ret;
+}
+
+void metadata_mailbox_allocated(struct mailbox *box) {
+	union mailbox_module_context *mbox = p_new(box->pool, union mailbox_module_context, 1);
+	mbox->super = box->v;
+	box->v.delete = metadata_mailbox_delete;
+
+	MODULE_CONTEXT_SET_SELF(box, metadata_mailbox_module, mbox);
+}

=== added file 'src/metadata-mail-storage-module.h'
--- src/metadata-mail-storage-module.h	1970-01-01 00:00:00 +0000
+++ src/metadata-mail-storage-module.h	2011-09-29 19:49:50 +0000
@@ -0,0 +1,28 @@
+/*
+	Copyright (c) 2010 by Dennis Schridde
+
+	This file is part of dovecot-metadata.
+
+	dovecot-metadata is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	dovecot-metadata is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with dovecot-metadata.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#ifndef DOVECOT_METADATA_MAIL_STORAGE_MODULE_H
+#define DOVECOT_METADATA_MAIL_STORAGE_MODULE_H
+
+#include "metadata-global.h"
+
+#include "mail-storage.h"
+
+void metadata_mailbox_allocated(struct mailbox *box);
+
+#endif

=== added file 'src/metadata-mail-user-module-private.h'
--- src/metadata-mail-user-module-private.h	1970-01-01 00:00:00 +0000
+++ src/metadata-mail-user-module-private.h	2011-09-29 19:49:50 +0000
@@ -0,0 +1,40 @@
+/*
+	Copyright (c) 2010 by Dennis Schridde
+
+	This file is part of dovecot-metadata.
+
+	dovecot-metadata is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	dovecot-metadata is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with dovecot-metadata.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#ifndef DOVECOT_METADATA_MAIL_USER_MODULE_PRIVATE_H
+#define DOVECOT_METADATA_MAIL_USER_MODULE_PRIVATE_H
+
+#include "metadata-mail-user-module.h"
+
+#include "dict.h"
+#include "module-context.h"
+#include "mail-user.h"
+
+#include "metadata-settings.h"
+
+#define METADATA_USER_CONTEXT(obj) MODULE_CONTEXT(obj, metadata_mail_user_module)
+
+extern MODULE_CONTEXT_DEFINE(metadata_mail_user_module, &mail_user_module_register);
+
+struct metadata_mail_user {
+	union mail_user_module_context module_ctx;
+	struct dict *dict;
+	struct metadata_settings *set;
+};
+
+#endif

=== added file 'src/metadata-mail-user-module.c'
--- src/metadata-mail-user-module.c	1970-01-01 00:00:00 +0000
+++ src/metadata-mail-user-module.c	2011-09-29 19:49:50 +0000
@@ -0,0 +1,56 @@
+/*
+	Copyright (c) 2010 by Dennis Schridde
+
+	This file is part of dovecot-metadata.
+
+	dovecot-metadata is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	dovecot-metadata is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with dovecot-metadata.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include "metadata-mail-user-module-private.h"
+
+struct metadata_mail_user_module metadata_mail_user_module =
+	MODULE_CONTEXT_INIT(&mail_user_module_register);
+
+static void metadata_mail_user_deinit(struct mail_user *user) {
+	struct metadata_mail_user *muser = METADATA_USER_CONTEXT(user);
+	if (muser == NULL) {
+		i_error("metadata: found NULL user, can't deinit it");
+		return;
+	}
+
+	if (muser->dict != NULL) {
+		dict_deinit(&muser->dict);
+	}
+
+	if (muser->set != NULL) {
+		metadata_settings_deinit(&muser->set);
+	}
+
+	return muser->module_ctx.super.deinit(user);
+}
+
+void metadata_mail_user_created(struct mail_user *user) {
+	struct metadata_mail_user *muser = p_new(user->pool, struct metadata_mail_user, 1);
+	muser->module_ctx.super = user->v;
+	user->v.deinit = metadata_mail_user_deinit;
+
+	metadata_settings_init(&muser->set, user);
+
+	if (muser->set->dict_uri != NULL) {
+		muser->dict = dict_init(muser->set->dict_uri, DICT_DATA_TYPE_STRING, user->username, user->set->base_dir);
+		if (muser->dict == NULL)
+			i_error("metadata: dict_init(%s) failed", muser->set->dict_uri);
+	}
+
+	MODULE_CONTEXT_SET(user, metadata_mail_user_module, muser);
+}

=== added file 'src/metadata-mail-user-module.h'
--- src/metadata-mail-user-module.h	1970-01-01 00:00:00 +0000
+++ src/metadata-mail-user-module.h	2011-09-29 19:49:50 +0000
@@ -0,0 +1,28 @@
+/*
+	Copyright (c) 2010 by Dennis Schridde
+
+	This file is part of dovecot-metadata.
+
+	dovecot-metadata is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	dovecot-metadata is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with dovecot-metadata.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#ifndef DOVECOT_METADATA_MAIL_USER_MODULE_H
+#define DOVECOT_METADATA_MAIL_USER_MODULE_H
+
+#include "metadata-global.h"
+
+#include "mail-user.h"
+
+void metadata_mail_user_created(struct mail_user *user);
+
+#endif

=== modified file 'src/metadata-plugin.c'
--- src/metadata-plugin.c	2010-08-11 17:11:01 +0000
+++ src/metadata-plugin.c	2011-09-29 19:49:50 +0000
@@ -1,352 +1,41 @@
-/* Copyright (C) 2008, 2009 by Intevation GmbH
- * Authors:
- * Bernhard Herzog <[e-mail]>
- *
- * This program is free software under the LGPL (>=v2.1)
- * Read the file COPYING coming with the software for details.
- */
-
-#include "lib.h"
-#include "dict.h"
-#include "common.h"
-#include "commands-util.h"
-#include "module-context.h"
-#include "mailbox-list-private.h"
-
-#include "metadata-plugin.h"
-
-#include <stdlib.h>
-
-
-#define METADATA_LIST_CONTEXT(obj) \
-	MODULE_CONTEXT((obj), metadata_mailbox_list_module)
-static MODULE_CONTEXT_DEFINE_INIT(metadata_mailbox_list_module,
-				  &mailbox_list_module_register);
-
-struct metadata_mailbox_list {
-	union mailbox_list_module_context module_ctx;
+/*
+	Copyright (c) 2010 by Dennis Schridde
+
+	This file is part of dovecot-metadata.
+
+	dovecot-metadata is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	dovecot-metadata is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with dovecot-metadata.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include "metadata-global.h"
+
+#include "mail-storage-hooks.h"
+
+#include "metadata-mail-user-module.h"
+#include "metadata-mail-storage-module.h"
+
+const char *metadata_plugin_version = DOVECOT_VERSION;
+
+static struct mail_storage_hooks metadata_mail_storage_hooks = {
+	.mail_user_created = metadata_mail_user_created,
+	.mailbox_allocated = metadata_mailbox_allocated
 };
 
-static void (*metadata_next_hook_mailbox_list_created)(struct mailbox_list *);
-
-
-static struct dict *metadata_dict;
-static bool metadata_allow_private = FALSE;
-static bool metadata_debug = FALSE;
-
-
-bool metadata_private_allowed(void) {
-	return metadata_allow_private;
-}
-
-
-static const char *mailbox_key_path(struct mailbox_list *list,
-				    const char *mailboxname)
-{
-	return mailbox_list_get_path(list, mailboxname,
-				     MAILBOX_LIST_PATH_TYPE_MAILBOX);
-}
-
-
-static const char *create_dict_key(struct mail_storage *storage,
-				   const char *mailboxname, const char *entry,
-				   bool private)
-{
-	return t_strconcat(private ? DICT_PATH_PRIVATE : DICT_PATH_SHARED,
-			   mailbox_key_path(mail_storage_get_list(storage),
-					    mailboxname),
-			   "/", entry, NULL);
-}
-
-static const char *renamed_key(const char *oldkey, const char *oldpath,
-			       const char *newpath)
-{
-	const char *first_slash;
-	size_t oldlen;
-
-	first_slash = strchr(oldkey, '/');
-	if (!first_slash)
-		return NULL;
-
-	oldlen = strlen(oldpath);
-	if (strncmp(first_slash + 1, oldpath, oldlen) == 0) {
-		return t_strconcat(t_strdup_until(oldkey, first_slash + 1),
-				   newpath,
-				   first_slash + 1 + oldlen,
-				   NULL);
-	}
-
-	return NULL;
-}
-
-static void rename_metadata_of_mailbox(struct dict_transaction_context *dt,
-				       struct mailbox_list *list,
-				       const char *oldname,
-				       const char *newname)
-{
-	struct dict_iterate_context *iter;
-	const char *oldpath;
-	const char *newpath;
-	const char *key;
-	const char *value;
-	const char *newkey;
-
-	oldpath = mailbox_key_path(list, oldname);
-	newpath = mailbox_key_path(list, newname);
-
-	iter = dict_iterate_init(metadata_dict,
-				 t_strconcat(DICT_PATH_SHARED, oldpath, NULL),
-				 DICT_ITERATE_FLAG_RECURSE
-				 | DICT_ITERATE_FLAG_SORT_BY_KEY);
-	while (dict_iterate(iter, &key, &value) > 0) {
-		T_BEGIN {
-			newkey = renamed_key(key, oldpath, newpath);
-			dict_set(dt, newkey, value);
-			dict_unset(dt, key);
-		} T_END;
-	}
-	dict_iterate_deinit(&iter);
-}
-
-static int rename_metadata_of_children(struct dict_transaction_context *dt,
-				       struct mailbox_list *list,
-				       const char *oldname,
-				       const char *newname)
-{
-	struct mailbox_list_iterate_context *iter;
-	const struct mailbox_info *info;
-	const char *pattern;
-	size_t oldnamelen;
-	int ret;
-
-	ret = 0;
-
-	oldnamelen = strlen(oldname);
-	pattern = t_strdup_printf("%s%c*", oldname,
-				  mailbox_list_get_hierarchy_sep(list));
-	iter = mailbox_list_iter_init(list, pattern,
-				      MAILBOX_LIST_ITER_RETURN_NO_FLAGS);
-	while ((info = mailbox_list_iter_next(iter)) != NULL) {
-		const char *renamed;
-
-		/* verify that the prefix matches, otherwise we could have
-		   problems with mailbox names containing '%' and '*' chars */
-		if (strncmp(info->name, oldname, oldnamelen) == 0 &&
-		    info->name[oldnamelen] ==
-		    mailbox_list_get_hierarchy_sep(list)) {
-			T_BEGIN {
-				renamed = t_strconcat(newname,
-						      info->name + oldnamelen,
-						      NULL);
-				rename_metadata_of_mailbox(dt, list,
-							   info->name, renamed);
-			} T_END;
-		}
-	}
-
-	if (mailbox_list_iter_deinit(&iter) < 0) {
-		ret = -1;
-	}
-
-	return ret;
-}
-
-static int metadata_mailbox_list_rename(struct mailbox_list *list,
-					const char *oldname,
-					const char *newname)
-{
-	struct metadata_mailbox_list *mlist = METADATA_LIST_CONTEXT(list);
-	struct dict_transaction_context *dt;
-	int success;
-
-	dt = dict_transaction_begin(metadata_dict);
-
-	T_BEGIN {
-		rename_metadata_of_mailbox(dt, list, oldname, newname);
-		rename_metadata_of_children(dt, list, oldname, newname);
-	} T_END;
-
-
-	success = mlist->module_ctx.super.rename_mailbox(list, oldname,
-							 newname);
-	if (success < 0) {
-		dict_transaction_rollback(&dt);
-	} else {
-		if (dict_transaction_commit(&dt) < 0) {
-			i_error("metadata_mailbox_list_rename:"
-				" could not update metadata dict");
-		}
-	}
-
-	return success;
-}
-
-static int metadata_mailbox_list_delete(struct mailbox_list *list,
-					const char *name)
-{
-	struct metadata_mailbox_list *mlist = METADATA_LIST_CONTEXT(list);
-	struct dict_transaction_context *dt;
-	struct dict_iterate_context *iter;
-	const char *keypath;
-	const char *key;
-	const char *value;
-	int success;
-
-	keypath = mailbox_key_path(list, name);
-
-	dt = dict_transaction_begin(metadata_dict);
-	iter = dict_iterate_init(metadata_dict, t_strconcat(DICT_PATH_SHARED,
-							    keypath, NULL),
-				 DICT_ITERATE_FLAG_RECURSE
-				 | DICT_ITERATE_FLAG_SORT_BY_KEY);
-	while (dict_iterate(iter, &key, &value) > 0) {
-		dict_unset(dt, key);
-	}
-	dict_iterate_deinit(&iter);
-
-	success = mlist->module_ctx.super.delete_mailbox(list, name);
-	if (success < 0) {
-		dict_transaction_rollback(&dt);
-	} else {
-		if (dict_transaction_commit(&dt) < 0) {
-			i_error("metadata_mailbox_list_delete:"
-				" could not update metadata dict");
-		}
-	}
-
-	return success;
-}
-
-
-static void metadata_mailbox_list_created(struct mailbox_list *list)
-{
-	struct metadata_mailbox_list *mlist;
-
-	mlist = p_new(list->pool, struct metadata_mailbox_list, 1);
-	mlist->module_ctx.super = list->v;
-	list->v.rename_mailbox = metadata_mailbox_list_rename;
-	list->v.delete_mailbox = metadata_mailbox_list_delete;
-	MODULE_CONTEXT_SET(list, metadata_mailbox_list_module, mlist);
-
-	if (metadata_next_hook_mailbox_list_created != NULL)
-		metadata_next_hook_mailbox_list_created(list);
-}
-
-
-bool metadata_get_metadata_entry(struct client_command_context *cmd,
-				 const char *mailboxname, const char *entry,
-				 const char **value_r, bool private)
-{
-	int success;
-	struct mail_storage *storage;
-	const char *key;
-
-	if (metadata_debug)
-		i_info("metadata_get_metadata_entry: mailboxname=%s, entry=%s,"
-		       " private=%d", mailboxname, entry, private);
-
-	if (!client_verify_mailbox_name(cmd, mailboxname,
-					CLIENT_VERIFY_MAILBOX_SHOULD_EXIST))
-		return FALSE;
-
-	storage = client_find_storage(cmd, &mailboxname);
-	if (!storage)
-		return FALSE;
-
-	key = create_dict_key(storage, mailboxname, entry, private);
-	if (metadata_debug)
-		i_info("metadata_get_metadata_entry: dict key=%s", key);
-
-	success = dict_lookup(metadata_dict, cmd->pool, key, value_r);
-
-	if (success == 0) {
-		*value_r = NULL;
-	} else if (success < 0) {
-		client_send_tagline(cmd, "NO Lookup failed.");
-	}
-
-	return success >= 0;
-}
-
-bool metadata_set_metadata_entry(struct client_command_context *cmd,
-				 const char *mailboxname, const char *entry,
-				 const char *value, bool private)
-{
-	struct dict_transaction_context *dt;
-	struct mail_storage *storage;
-	const char *key;
-
-	if (metadata_debug)
-		i_info("metadata_set_metadata_entry: mailboxname=%s, entry=%s,"
-		       " value=%s, private=%d", mailboxname, entry,
-		       value != NULL ? value : "<NULL>", private);
-
-	if (!client_verify_mailbox_name(cmd, mailboxname,
-					CLIENT_VERIFY_MAILBOX_SHOULD_EXIST))
-		return FALSE;
-
-	storage = client_find_storage(cmd, &mailboxname);
-	if (!storage)
-		return FALSE;
-
-	key = create_dict_key(storage, mailboxname, entry, private);
-	if (metadata_debug)
-		i_info("metadata_set_metadata_entry: dict key=%s", key);
-
-	dt = dict_transaction_begin(metadata_dict);
-
-	if (value != NULL) {
-		dict_set(dt, key, value);
-	} else {
-		dict_unset(dt, key);
-	}
-
-	if (dict_transaction_commit(&dt) < 0)
-	{
-		client_send_tagline(cmd, "NO Setting meta-data failed.");
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-void metadata_plugin_init(void)
-{
-	const char *username;
-	const char *dict_uri;
-	const char *base_dir;
-
-	username = getenv("USER");
-	if (username == NULL)
-		i_fatal("metadata plugin: USER unset");
-
-	dict_uri = getenv("METADATA_DICT");
-	if (dict_uri == NULL)
-		i_fatal("metadata plugin: METADATA_DICT unset");
-
-	metadata_allow_private = getenv("METADATA_ALLOW_PRIVATE") != NULL;
-	metadata_debug = getenv("METADATA_DEBUG") != NULL;
-
-	base_dir = getenv("BASE_DIR");
-	if (base_dir == NULL)
-	    base_dir = PKG_RUNDIR;
-	metadata_dict = dict_init(dict_uri, DICT_DATA_TYPE_STRING, username,
-				  base_dir);
-
-	if (metadata_dict == NULL)
-		i_fatal("metadata plugin: dict_init() failed");
-
-	metadata_next_hook_mailbox_list_created = hook_mailbox_list_created;
-	hook_mailbox_list_created = metadata_mailbox_list_created;
+void metadata_plugin_init(struct module *module)
+{
+	mail_storage_hooks_add(module, &metadata_mail_storage_hooks);
 }
 
 void metadata_plugin_deinit(void)
 {
-	if (metadata_dict != NULL) {
-		dict_deinit(&metadata_dict);
-	}
-	if (metadata_next_hook_mailbox_list_created) {
-		hook_mailbox_list_created =
-			metadata_next_hook_mailbox_list_created;
-	}
+	mail_storage_hooks_remove(&metadata_mail_storage_hooks);
 }

=== removed file 'src/metadata-plugin.h'
--- src/metadata-plugin.h	2010-08-11 17:11:01 +0000
+++ src/metadata-plugin.h	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-#ifndef __METADATA_PLUGIN
-#define __METADATA_PLUGIN
-
-void metadata_plugin_init(void);
-void metadata_plugin_deinit(void);
-
-bool metadata_private_allowed(void);
-
-bool metadata_get_metadata_entry(struct client_command_context *cmd,
-				 const char *mailboxname, const char *entry,
-				 const char **value_r, bool private);
-
-bool metadata_set_metadata_entry(struct client_command_context *cmd,
-				 const char *mailboxname, const char *entry,
-				 const char *value, bool private);
-
-#endif

=== added file 'src/metadata-settings.c'
--- src/metadata-settings.c	1970-01-01 00:00:00 +0000
+++ src/metadata-settings.c	2011-09-29 19:49:50 +0000
@@ -0,0 +1,85 @@
+/*
+	Copyright (c) 2010 by Dennis Schridde
+
+	This file is part of dovecot-metadata.
+
+	dovecot-metadata is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	dovecot-metadata is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with dovecot-metadata.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include "metadata-settings.h"
+
+#include <stdlib.h>
+
+#define METADATA_MAXSIZE_DEFAULT 1024
+#define METADATA_MAXENTRIES_DEFAULT 65336
+
+void
+metadata_settings_init(struct metadata_settings **set, struct mail_user *user) {
+	*set = i_new(struct metadata_settings, 1);
+	memset(*set, 0, sizeof(**set));
+
+
+	const char *dict_uri = mail_user_plugin_getenv(user, "metadata_dict");
+	if (dict_uri != NULL) {
+		(*set)->dict_uri = dict_uri;
+	}
+	else if (user->mail_debug) {
+		i_debug("metadata: No metadata_dict setting - "
+			"metadata storage is disabled");
+		(*set)->dict_uri = NULL;
+	}
+
+	const char *maxsize = mail_user_plugin_getenv(user, "metadata_maxsize");
+	if (maxsize != NULL) {
+		(*set)->maxsize = strtol(maxsize, NULL, 10);
+		if ((*set)->maxsize < 0 || (*set)->maxsize == LONG_MAX) {
+			if (user->mail_debug) {
+				i_debug("metadata: Illegal metadata_maxsize setting - "
+					"using default of %d", METADATA_MAXSIZE_DEFAULT);
+			}
+			(*set)->maxsize = METADATA_MAXSIZE_DEFAULT;
+		}
+	}
+	else {
+		if (user->mail_debug) {
+			i_debug("metadata: No metadata_maxsize setting - "
+				"using default of %d", METADATA_MAXSIZE_DEFAULT);
+		}
+		(*set)->maxsize = METADATA_MAXSIZE_DEFAULT;
+	}
+
+	const char *maxentries = mail_user_plugin_getenv(user, "metadata_maxentries");
+	if (maxentries != NULL) {
+		(*set)->maxentries = strtol(maxentries, NULL, 10);
+		if ((*set)->maxentries < 0 || (*set)->maxentries == LONG_MAX) {
+			if (user->mail_debug) {
+				i_debug("metadata: Illegal metadata_maxentries setting - "
+					"using default of %d", METADATA_MAXENTRIES_DEFAULT);
+			}
+			(*set)->maxentries = METADATA_MAXENTRIES_DEFAULT;
+		}
+	}
+	else {
+		if (user->mail_debug) {
+			i_debug("metadata: No metadata_maxentries setting - "
+				"using default of %d", METADATA_MAXENTRIES_DEFAULT);
+		}
+		(*set)->maxentries = METADATA_MAXENTRIES_DEFAULT;
+	}
+}
+
+void
+metadata_settings_deinit(struct metadata_settings **set) {
+	free(*set);
+	*set = NULL;
+}

=== added file 'src/metadata-settings.h'
--- src/metadata-settings.h	1970-01-01 00:00:00 +0000
+++ src/metadata-settings.h	2011-09-29 19:49:50 +0000
@@ -0,0 +1,40 @@
+/*
+	Copyright (c) 2010 by Dennis Schridde
+
+	This file is part of dovecot-metadata.
+
+	dovecot-metadata is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	dovecot-metadata is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with dovecot-metadata.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#ifndef DOVECOT_METADATA_SETTINGS_H
+#define DOVECOT_METADATA_SETTINGS_H
+
+#include "metadata-global.h"
+
+#include "mail-user.h"
+
+struct metadata_settings {
+	bool metadata_debug;
+	const char *dict_uri;
+	int maxsize;
+	int maxentries;
+};
+
+void
+metadata_settings_init(struct metadata_settings **set, struct mail_user *user)
+	ATTR_NONNULL(1,2);
+void
+metadata_settings_deinit(struct metadata_settings **set)
+	ATTR_NONNULL(1);
+
+#endif

=== added file 'src/str-ext.c'
--- src/str-ext.c	1970-01-01 00:00:00 +0000
+++ src/str-ext.c	2011-09-29 19:49:50 +0000
@@ -0,0 +1,42 @@
+/*
+	Copyright (c) 2010 by Dennis Schridde
+
+	This file is part of dovecot-metadata.
+
+	dovecot-metadata is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	dovecot-metadata is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with dovecot-metadata.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include "str-ext.h"
+
+#include <string.h>
+
+int
+strchr_num(const char *s, int c) {
+	int num = 0;
+	s = strchr(s, c);
+	while (s != NULL) {
+		num++;
+		s = strchr(s+1, c);
+	}
+	return num;
+}
+
+
+bool
+str_has_wildcards(const char *s) {
+	for (; *s != '\0'; s++) {
+		if (*s == '*' || *s == '%')
+			return TRUE;
+	}
+	return FALSE;
+}

=== added file 'src/str-ext.h'
--- src/str-ext.h	1970-01-01 00:00:00 +0000
+++ src/str-ext.h	2011-09-29 19:49:50 +0000
@@ -0,0 +1,38 @@
+/*
+	Copyright (c) 2010 by Dennis Schridde
+
+	This file is part of dovecot-metadata.
+
+	dovecot-metadata is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	dovecot-metadata is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with dovecot-metadata.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#ifndef DOVECOT_STR_EXT_H
+#define DOVECOT_STR_EXT_H
+
+#include "metadata-global.h"
+
+#include <stdbool.h>
+
+#include "str.h"
+
+#define str_append_printf str_printfa
+
+int
+strchr_num(const char *s, int c)
+	ATTR_NONNULL(1);
+
+bool
+str_has_wildcards(const char *s)
+	ATTR_NONNULL(1);
+
+#endif