[SPAM] vdominfo quota bug

This is a multi-part message in MIME format.
--------------070403030001050300050901
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: 7bit

In vpopmail-5.5.0 there is a bug in vdominfo that means option 'q' does 
not work, there is a missing break after the 'q' case. Additionally 
vdominfo's output differs from vuserinfo's output in that in vuserinfo 
the quota and the quota usage are treated seperatly, I have changed 
vdominfo to fix the bug and make it similar to vuserinfo.  Patch attached.


!DSPAM:55f7e54541556238488843!

--------------070403030001050300050901
Content-Type: text/plain; charset=UTF-8;
 name="vpopmail-5.5.0-vdominfo-quota.patch"
Content-Transfer-Encoding: base64
Content-Disposition: attachment;
 filename="vpopmail-5.5.0-vdominfo-quota.patch"

ZGlmZiAtdVByIHZwb3BtYWlsLTUuNS4wLm9yaWcvdmRvbWluZm8uYyB2cG9wbWFpbC01LjUu
MC92ZG9taW5mby5jCi0tLSB2cG9wbWFpbC01LjUuMC5vcmlnL3Zkb21pbmZvLmMJMjAxMC0x
MS0wNSAxODozNzoyMy4wMDAwMDAwMDAgKzAwMDAKKysrIHZwb3BtYWlsLTUuNS4wL3Zkb21p
bmZvLmMJMjAxNS0wOS0wNyAxMDo1MToyMi4yMTUwOTU3MzggKzAxMDAKQEAgLTQzLDYgKzQz
LDcgQEAKIGludCBEaXNwbGF5VG90YWxVc2VyczsKIGludCBEaXNwbGF5UmVhbERvbWFpbjsK
IGludCBEaXNwbGF5UXVvdGE7CitpbnQgRGlzcGxheVF1b3RhVXNhZ2U7CiAKIHZvaWQgdXNh
Z2UoKTsKIHZvaWQgZ2V0X29wdGlvbnMoaW50IGFyZ2MsIGNoYXIgKiphcmd2KTsKQEAgLTYw
LDcgKzYxLDcgQEAKIAogICAgcmV0ID0gdmF1dGhfbG9hZF9tb2R1bGUoTlVMTCk7CiAgICBp
ZiAoIXJldCkKLQkgIHZleGl0ZXJyb3Ioc3RkZXJyLCAiY291bGQgbm90IGxvYWQgYXV0aGVu
dGljYXRpb24gbW9kdWxlIik7CisgICAgICB2ZXhpdGVycm9yKHN0ZGVyciwgImNvdWxkIG5v
dCBsb2FkIGF1dGhlbnRpY2F0aW9uIG1vZHVsZSIpOwogCiAgICAgaWYoIHZhdXRoX29wZW4o
IDAgKSkgewogICAgICAgICB2ZXhpdGVycm9yKCBzdGRlcnIsICJJbml0aWFsIG9wZW4uIiAp
OwpAQCAtODksNyArOTAsOCBAQAogICAgIHByaW50ZigiICAgICAgICAgLWQgKGRpc3BsYXkg
ZG9tYWluIGRpcmVjdG9yeSlcbiIpOwogICAgIHByaW50ZigiICAgICAgICAgLXQgKGRpc3Bs
YXkgdG90YWwgdXNlcnMpXG4iKTsKICAgICBwcmludGYoIiAgICAgICAgIC1yIChkaXNwbGF5
IHJlYWwgZG9tYWluKVxuIik7Ci0JcHJpbnRmKCIgICAgICAgICAtcSAoZGlzcGxheSBxdW90
YSB1c2FnZSlcbiIpOworICAgIHByaW50ZigiICAgICAgICAgLXEgKGRpc3BsYXkgcXVvdGEg
ZmllbGQpXG4iKTsKKyAgICBwcmludGYoIiAgICAgICAgIC1RIChkaXNwbGF5IHF1b3RhIHVz
YWdlKVxuIik7CiB9CiAKIHZvaWQgZ2V0X29wdGlvbnMoaW50IGFyZ2MsIGNoYXIgKiphcmd2
KQpAQCAtMTA0LDEzICsxMDYsMTQgQEAKICAgICBEaXNwbGF5RGlyID0gMDsKICAgICBEaXNw
bGF5VG90YWxVc2VycyA9IDA7CiAgICAgRGlzcGxheUFsbCA9IDE7Ci0JRGlzcGxheVJlYWxE
b21haW4gPSAwOwotCURpc3BsYXlRdW90YSA9IDA7CisgICAgRGlzcGxheVJlYWxEb21haW4g
PSAwOworICAgIERpc3BsYXlRdW90YSA9IDA7CisgICAgRGlzcGxheVF1b3RhVXNhZ2UgPSAw
OwogCiAgICAgbWVtc2V0KERvbWFpbiwgMCwgc2l6ZW9mKERvbWFpbikpOwogCiAgICAgZXJy
ZmxhZyA9IDA7Ci0gICAgd2hpbGUoICFlcnJmbGFnICYmIChjPWdldG9wdChhcmdjLGFyZ3Ys
InZhbnVnZHRycSIpKSAhPSAtMSApIHsKKyAgICB3aGlsZSggIWVycmZsYWcgJiYgKGM9Z2V0
b3B0KGFyZ2MsYXJndiwidmFudWdkdHJxUSIpKSAhPSAtMSApIHsKICAgICAgICAgc3dpdGNo
KGMpIHsKICAgICAgICAgICAgIGNhc2UgJ3YnOgogICAgICAgICAgICAgICAgIHByaW50Zigi
dmVyc2lvbjogJXNcbiIsIFZFUlNJT04pOwpAQCAtMTQwLDExICsxNDMsMTYgQEAKICAgICAg
ICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgIGNhc2UgJ3InOgogICAgICAgICAgICAg
ICAgIERpc3BsYXlSZWFsRG9tYWluID0gMTsKLQkJCQlEaXNwbGF5QWxsID0gMDsKKyAgICAg
ICAgICAgICAgICBEaXNwbGF5QWxsID0gMDsKKyAgICAgICAgICAgICAgICBicmVhazsKKyAg
ICAgICAgICAgIGNhc2UgJ3EnOgorICAgICAgICAgICAgICAgIERpc3BsYXlRdW90YSA9IDE7
CisgICAgICAgICAgICAgICAgRGlzcGxheUFsbCA9IDA7CisgICAgICAgICAgICAgICAgYnJl
YWs7CisgICAgICAgICAgICBjYXNlICdRJzoKKyAgICAgICAgICAgICAgICBEaXNwbGF5UXVv
dGFVc2FnZSA9IDE7CisgICAgICAgICAgICAgICAgRGlzcGxheUFsbCA9IDA7CiAgICAgICAg
ICAgICAgICAgYnJlYWs7Ci0JCQljYXNlICdxJzoKLQkJCQlEaXNwbGF5UXVvdGEgPSAxOwot
CQkJCURpc3BsYXlBbGwgPSAwOwogICAgICAgICAgICAgZGVmYXVsdDoKICAgICAgICAgICAg
ICAgICBlcnJmbGFnID0gMTsKICAgICAgICAgICAgICAgICBicmVhazsKQEAgLTE1NywxOCAr
MTY1LDQ3IEBACiAgICAgfQogCiAgICAgaWYgKCBvcHRpbmQgPCBhcmdjICkgewotCXNucHJp
bnRmKERvbWFpbiwgc2l6ZW9mKERvbWFpbiksICIlcyIsIGFyZ3Zbb3B0aW5kXSk7IAorICAg
IHNucHJpbnRmKERvbWFpbiwgc2l6ZW9mKERvbWFpbiksICIlcyIsIGFyZ3Zbb3B0aW5kXSk7
IAogICAgICAgICArK29wdGluZDsKICAgICB9CiB9CiAKLXZvaWQgZGlzcGxheV9kb21haW4o
Y2hhciAqZG9tYWluLCBjaGFyICpkaXIsIHVpZF90IHVpZCwgZ2lkX3QgZ2lkLCBjaGFyICpy
ZWFsZG9tYWluKQordm9pZCBkaXNwbGF5X3F1b3RhKGNoYXIgKnJlYWxkb21haW4pCiB7CiAg
ICBpbnQgcmV0ID0gMDsKICAgIHN0cnVjdCB2bGltaXRzIHZsOworCisgICAgcmV0ID0gdmdl
dF9saW1pdHMocmVhbGRvbWFpbiwgJnZsKTsKKyAgICBpZiAoIXJldCkKKyAgICAgICAgcHJp
bnRmKCJTPSVsbHUsQz0lbGx1XG4iLCAoc3RvcmFnZV90KSgoKHN0b3JhZ2VfdCl2bC5kaXNr
cXVvdGEpKigoc3RvcmFnZV90KTEwMDAwMDApKSwgKHN0b3JhZ2VfdCkodmwubWF4bXNnY291
bnQpKTsKKyAgICBlbHNlCisgICAgICAgIHByaW50ZigiTk9RVU9UQVxuIik7Cit9CisKK3Zv
aWQgZGlzcGxheV9xdW90YV91c2FnZShjaGFyICpyZWFsZG9tYWluKQoreworICAgaW50IHJl
dCA9IDAsIGxlbiA9IDA7CisgICBzdHJ1Y3QgdmxpbWl0cyB2bDsKICAgIHN0b3JhZ2VfdCBi
eXRlcyA9IDAsIGNvdW50ID0gMDsKICAgIGNoYXIgYlsyNTZdID0geyAwIH07CiAKKyAgICBy
ZXQgPSB2Z2V0X2xpbWl0cyhyZWFsZG9tYWluLCAmdmwpOworICAgIGxlbiA9IHN0cmxlbihy
ZWFsZG9tYWluKTsKKyAgICBpZiAobGVuIDw9IChzaXplb2YoYikgLSAyKSkgeworICAgICAg
ICBtZW1jcHkoKGIgKyAxKSwgcmVhbGRvbWFpbiwgbGVuKTsKKyAgICAgICAgKmIgPSAnQCc7
CisgICAgICAgICooYiArIGxlbiArIDEpID0gJ1wwJzsKKworICAgICAgICBxdW90YV9nZXRf
dXNhZ2UoYiwgJmJ5dGVzLCAmY291bnQpOworICAgIH0KKworICAgIHByaW50ZigiJWQlJSAo
JWxsdSBieXRlKHMpIGluICVsbHUgZmlsZShzKSlcbiIsCisgICAgICAgICAgICBxdW90YV9w
ZXJjZW50KGJ5dGVzLCBjb3VudCwgKHN0b3JhZ2VfdCkoKHN0b3JhZ2VfdCl2bC5kaXNrcXVv
dGEgKiAoKHN0b3JhZ2VfdCkxMDAwMDAwKSksIHZsLm1heG1zZ2NvdW50KSwKKyAgICAgICAg
ICAgIGJ5dGVzLCBjb3VudCk7Cit9CisKK3ZvaWQgZGlzcGxheV9kb21haW4oY2hhciAqZG9t
YWluLCBjaGFyICpkaXIsIHVpZF90IHVpZCwgZ2lkX3QgZ2lkLCBjaGFyICpyZWFsZG9tYWlu
KQorewogICAgIGlmICggRGlzcGxheUFsbCApIHsKICAgICAgICAgaWYoc3RyY21wKGRvbWFp
biwgcmVhbGRvbWFpbik9PTApCiAgICAgICAgICAgICBwcmludGYoImRvbWFpbjogJXNcbiIs
IGRvbWFpbik7CkBAIC0xODAsMjcgKzIxNywxMCBAQAogICAgICAgICBvcGVuX2JpZ19kaXIo
cmVhbGRvbWFpbiwgdWlkLCBnaWQpOwogICAgICAgICBwcmludGYoInVzZXJzOiAgJWx1XG4i
LCAgdmRpci5jdXJfdXNlcnMpOwogICAgICAgICBjbG9zZV9iaWdfZGlyKHJlYWxkb21haW4s
dWlkLGdpZCk7Ci0KLQkJcmV0ID0gdmdldF9saW1pdHMocmVhbGRvbWFpbiwgJnZsKTsKLQkJ
aWYgKCFyZXQpCi0JCSAgIHByaW50ZigicXVvdGE6ICBTPSVsbHUsQz0lbGx1XG4iLCAoc3Rv
cmFnZV90KSgoKHN0b3JhZ2VfdCl2bC5kaXNrcXVvdGEpKigoc3RvcmFnZV90KTEwMDAwMDAp
KSwgKHN0b3JhZ2VfdCkodmwubWF4bXNnY291bnQpKTsKLQotCQkgZWxzZQotCQkJcHJpbnRm
KCJxdW90YTogIE5PUVVPVEFcbiIpOwotCi0JCSByZXQgPSBzdHJsZW4ocmVhbGRvbWFpbik7
Ci0JCSBpZiAocmV0IDw9IChzaXplb2YoYikgLSAyKSkgewotCQkJbWVtY3B5KChiICsgMSks
IHJlYWxkb21haW4sIHJldCk7Ci0JCQkqYiA9ICdAJzsKLQkJCSooYiArIHJldCArIDEpID0g
J1wwJzsKLQotCQkJcXVvdGFfZ2V0X3VzYWdlKGIsICZieXRlcywgJmNvdW50KTsKLQkJIH0K
LQotCQkgcHJpbnRmKCJ1c2FnZTogICVkJSUgKCVsbHUgYnl0ZShzKSBpbiAlbGx1IGZpbGUo
cykpXG4iLAotCQkJICAgcXVvdGFfcGVyY2VudChieXRlcywgY291bnQsIChzdG9yYWdlX3Qp
KChzdG9yYWdlX3QpdmwuZGlza3F1b3RhICogKChzdG9yYWdlX3QpMTAwMDAwMCkpLCB2bC5t
YXhtc2djb3VudCksCi0JCQkgICBieXRlcywgY291bnQpOwotCisgICAgICAgIHByaW50Zigi
cXVvdGE6ICAiKTsKKyAgICAgICAgZGlzcGxheV9xdW90YShyZWFsZG9tYWluKTsKKyAgICAg
ICAgcHJpbnRmKCJ1c2FnZTogICIpOworICAgICAgICBkaXNwbGF5X3F1b3RhX3VzYWdlKHJl
YWxkb21haW4pOwogICAgIH0gZWxzZSB7CiAgICAgICAgIGlmICggRGlzcGxheU5hbWUgKSB7
CiAgICAgICAgICAgaWYoc3RyY21wKGRvbWFpbiwgcmVhbGRvbWFpbik9PTApCkBAIC0yMTcs
NyArMjM3LDEwIEBACiAgICAgICAgICAgICBjbG9zZV9iaWdfZGlyKHJlYWxkb21haW4sdWlk
LGdpZCk7CiAgICAgICAgIH0KIAotCQlpZiAoIERpc3BsYXlSZWFsRG9tYWluICkgcHJpbnRm
KCIlc1xuIiwgcmVhbGRvbWFpbik7CisgICAgICAgIGlmICggRGlzcGxheVJlYWxEb21haW4g
KSBwcmludGYoIiVzXG4iLCByZWFsZG9tYWluKTsKKworICAgICAgICBpZiAoIERpc3BsYXlR
dW90YSApIGRpc3BsYXlfcXVvdGEocmVhbGRvbWFpbik7CisgICAgICAgIGlmICggRGlzcGxh
eVF1b3RhVXNhZ2UgKSBkaXNwbGF5X3F1b3RhX3VzYWdlKHJlYWxkb21haW4pOwogICAgIH0K
IH0KIApAQCAtMjM3LDEwICsyNjAsMTAgQEAKICAgICB9CiAKICAgICB3aGlsZSggZW50cnkg
KSB7Ci0JZGlzcGxheV9kb21haW4oZW50cnktPmRvbWFpbiwgZW50cnktPnBhdGgsIGVudHJ5
LT51aWQsIAorICAgICAgICBkaXNwbGF5X2RvbWFpbihlbnRyeS0+ZG9tYWluLCBlbnRyeS0+
cGF0aCwgZW50cnktPnVpZCwgCiAgICAgICAgICAgICAgICAgICAgICAgIGVudHJ5LT5naWQs
IGVudHJ5LT5yZWFsZG9tYWluKTsKIAotCXByaW50ZiAoIlxuIik7CisgICAgICAgIHByaW50
ZiAoIlxuIik7CiAgICAgICAgIGVudHJ5ID0gZ2V0X2RvbWFpbl9lbnRyaWVzKE5VTEwpOwog
ICAgIH0KIH0KQEAgLTI2MywyMSArMjg2LDIxIEBACiAgICAgfQogCiAgICAgd2hpbGUoIGVu
dHJ5ICkgewotCWlmIChzdHJjbXAoZW50cnktPmRvbWFpbiwgZW50cnktPnJlYWxkb21haW4p
ICE9IDApIHsKLS8vIAkJcHJpbnRmICgiTm90ZTogICAlcyBpcyBhbiBhbGlhcyBmb3IgJXNc
biIsCisgICAgaWYgKHN0cmNtcChlbnRyeS0+ZG9tYWluLCBlbnRyeS0+cmVhbGRvbWFpbikg
IT0gMCkgeworLy8gICAgICAgICBwcmludGYgKCJOb3RlOiAgICVzIGlzIGFuIGFsaWFzIGZv
ciAlc1xuIiwKIC8vICAgICAgICAgICAgICAgICAgICAgICAgIGVudHJ5LT5kb21haW4sIGVu
dHJ5LT5yZWFsZG9tYWluKTsKICAgICAgICAgICAgICAgICBhbGlhc2VzW2FsaWFzY291bnQr
K10gPSBzdHJkdXAoZW50cnktPmRvbWFpbik7CiAKICAgICAgICAgfSBlbHNlIHsKLQkJZGlz
cGxheV9kb21haW4oZW50cnktPmRvbWFpbiwgZW50cnktPnBhdGgsIGVudHJ5LT51aWQsIAot
ICAgICAgICAJICAgICAgICAgICAgICAgZW50cnktPmdpZCwgZW50cnktPnJlYWxkb21haW4p
OwotCX0KKyAgICAgICAgZGlzcGxheV9kb21haW4oZW50cnktPmRvbWFpbiwgZW50cnktPnBh
dGgsIGVudHJ5LT51aWQsIAorICAgICAgICAgICAgICAgICAgICAgICAgICAgZW50cnktPmdp
ZCwgZW50cnktPnJlYWxkb21haW4pOworICAgIH0KIAogICAgICAgICBlbnRyeSA9IGdldF9k
b21haW5fZW50cmllcyhOVUxMKTsKICAgICB9CiAKICAgICBmb3IoaT0wO2k8YWxpYXNjb3Vu
dDtpKyspIHsKLSAJcHJpbnRmICgiYWxpYXM6ICAlc1xuIiwgYWxpYXNlc1tpXSk7CisgICAg
IHByaW50ZiAoImFsaWFzOiAgJXNcbiIsIGFsaWFzZXNbaV0pOwogICAgICAgICBmcmVlKCBh
bGlhc2VzW2ldICk7CiAgICAgfSAKIH0K
--------------070403030001050300050901--