--- sendmail-8.12.8/cf/m4/proto.m4	Mon Dec 30 10:46:02 2002
+++ sendmail-8.12.8-patched/cf/m4/proto.m4	Sun Mar  9 14:52:56 2003
@@ -1039,8 +1039,8 @@
 R$+			$: <!> $1		Mark for lookup
 dnl input: <!> local<@domain>
 ifdef(`_VIRTUSER_ENTIRE_DOMAIN_',
-`R<!> $+ < @ $* $={VirtHost} . > 	$: < $(virtuser $1 @ $2 $3 $@ $1 $: @ $) > $1 < @ $2 $3 . >',
-`R<!> $+ < @ $={VirtHost} . > 	$: < $(virtuser $1 @ $2 $@ $1 $: @ $) > $1 < @ $2 . >')
+`R<!> $+ < @ $* $={VirtHost} . > 	$: < $(virtuser $1 @ $2 $3 $@ $1 $@ 2 $@ 3 $: @ $) > $1 < @ $2 $3 . >',
+`R<!> $+ < @ $={VirtHost} . > 	$: < $(virtuser $1 @ $2 $@ $1 $@ $2  $: @ $) > $1 < @ $2 . >')
 dnl input: <result-of-lookup | @> local<@domain> | <!> local<@domain>
 R<!> $+ < @ $=w . > 	$: < $(virtuser $1 @ $2 $@ $1 $: @ $) > $1 < @ $2 . >
 dnl if <@> local<@domain>: no match but try lookup
@@ -1063,6 +1063,18 @@
 R<@> $+ + $* < @ $+ . >	$: < $(virtuser @ $3 $@ $1 $@ $2 $@ +$2 $: ! $) > $1 + $2 < @ $3 . >
 dnl without +detail
 R<@> $+ < @ $+ . >	$: < $(virtuser @ $2 $@ $1 $: @ $) > $1 < @ $2 . >
+
+ifdef(`_MY_DIRTY_VIRTUSER_LOCALPART_HACK_',`dnl
+dnl Try matches withonly local part
+ifdef(`_VIRTUSER_ENTIRE_DOMAIN_',`dnl
+R<@> $+ < @ $* $={VirtHost} . > 	$: < $(virtuser $1 @  $@ $1 $@ $2 $@ $3 $: @ $) > $1 < @ $2 $3 . >
+R<@> $+ < @ $* $=w . > 	$: < $(virtuser $1 @ $@ $1 $@ $2 $: @ $) > $1 < @ $2 . >
+',`dnl
+R<@> $+ < @ $={VirtHost} . > 	$: < $(virtuser $1 @ $@ $1 $@ $2 $: @ $) > $1 < @ $2 . >
+R<@> $+ < @ $=w . > 	$: < $(virtuser $1 @ $@ $1 $@ $2 $: @ $) > $1 < @ $2 . >
+')dnl
+')dnl
+
 dnl no match
 R<@> $+			$: $1
 dnl remove mark