# HG changeset patch
# User Pascal Volk <neverseen@users.sourceforge.net>
# Date 1269165545 0
# Node ID 55503d63ba303a61db961eccdaa42c2ef4a18ca5
# Parent  3c766114d0b965615d40d0053fd8181bd5689409# Parent  8c4df3dd2d2c65acdf00e4a038b95152e89c285b
merged changes from default(8c4df3dd2d2c)

diff -r 3c766114d0b9 -r 55503d63ba30 VirtualMailManager/Handler.py
--- a/VirtualMailManager/Handler.py	Sun Mar 21 09:26:00 2010 +0000
+++ b/VirtualMailManager/Handler.py	Sun Mar 21 09:59:05 2010 +0000
@@ -383,9 +383,11 @@
             return '{%s}%s' % (self._scheme, self.__pwMD4(password))
         elif self._scheme in ['SMD5', 'SSHA', 'CRAM-MD5', 'HMAC-MD5',
                 'LANMAN', 'NTLM', 'RPA']:
-            return Popen([self._Cfg.dget('bin.dovecotpw'),
-                         '-s', self._scheme, '-p', password],
-                         stdout=PIPE).communicate()[0][:-1]
+            cmd_args = [self._Cfg.dget('bin.dovecotpw'), '-s', self._scheme,
+                        '-p', password]
+            if self._Cfg.dget('misc.dovecot_version') >= 20:
+                cmd_args.insert(1, 'pw')
+            return Popen(cmd_args, stdout=PIPE).communicate()[0][:-1]
         else:
             return '{%s}%s' % (self._scheme, password)