[Mailman-Developers] changes to mailpasswd to support multiple domains

[Jeff Hahn]

  This message is in MIME format.  The first part should be readable text,
  while the remaining parts are likely unreadable without MIME-aware tools.
  Send mail to mime@docserver.cac.washington.edu for more info.

--1523646986-1305930720-923239353=:8555
Content-Type: TEXT/PLAIN; CHARSET=US-ASCII
Content-ID: <Pine.LNX.3.95.990404100800.8555C@alcatraz.streek.com>

Attached is a patch to cron/mailpasswds and templates/cronpass.txt to
support multiple domains in the monthly password reminder.

Patch is against latest CVS sources (1.0b11)

WARNING: Apply with care! I'm just getting familiar with Python and
Mailman so I could have made some really idiotic mistakes, but it works
here...

To Apply:

	cd /usr/src/mailman ("main" source directory)
	patch -p1 -b <password.dif

Primary reason the patch file is so large is that I "de-tabbed" the source
file (removed leading tabs and replaced with spaces).  The original source
was about half tabs and half spaces for indents. I'm not sure what the
"official" position is on indenting for mailman.  Let me know if this
isn't necessary in the future.

-Jeff


--1523646986-1305930720-923239353=:8555
Content-Type: TEXT/PLAIN; CHARSET=US-ASCII; NAME="password.dif"
Content-Transfer-Encoding: BASE64
Content-ID: <Pine.LNX.4.04.9904041007220.31724@rikers.streek.com>
Content-Description: 

ZGlmZiAtYyAtciBNTS5vcmlnL2Nyb24vbWFpbHBhc3N3ZHMgTU0vY3Jvbi9t
YWlscGFzc3dkcw0KKioqIE1NLm9yaWcvY3Jvbi9tYWlscGFzc3dkcwlTYXQg
QXByICAzIDA5OjE4OjE5IDE5OTkNCi0tLSBNTS9jcm9uL21haWxwYXNzd2Rz
CVN1biBBcHIgIDQgMTA6MDA6MjQgMTk5OQ0KKioqKioqKioqKioqKioqDQoq
KiogNTEsNzkgKioqKg0KICANCiAgICAgIFRoZSBsaXN0IGNhbiBiZSBhbnkg
cmFuZG9tIG9uZSAtIGl0IGlzIG9ubHkgdXNlZCBmb3IgdGhlIG1lc3NhZ2UN
CiAgICAgIGRlbGl2ZXJ5IG1lY2hhbmlzbS4iIiINCiEgICAgIHN1YmogPSAn
JXMgbWFpbGxpc3QgbWVtYmVyc2hpcHMgcmVtaW5kZXJcbicgJSBsaXN0Lmhv
c3RfbmFtZQ0KICAgICAgY291bnQgPSBQQVVTRV9GUkVRVUVOQ1kNCiAgICAg
IGZvciB1c2VyLCBkYXRhIGluIHVzZXJzLml0ZW1zKCk6DQohIAl0YWJsZSA9
IFtdDQohIAlmb3IgbCwgcCwgdSBpbiBkYXRhOg0KISAJICAgIGlmIGxlbihs
KSA+IDk6DQohIAkJdGFibGUuYXBwZW5kKCIlc1xuICAgICAgICAgICAlLTEw
c1xuJXNcbiIgJSAobCwgcCwgdSkpDQohIAkgICAgZWxzZToNCiEgCQl0YWJs
ZS5hcHBlbmQoIiUtMTBzICUtMTBzXG4lc1xuIiAlIChsLCBwLCB1KSkNCiEg
CWhlYWRlciA9ICgiJS0xMHMgJS0xMHNcbiUtMTBzICUtMTBzIg0KISAJCSAg
JSAoIkxpc3QiLCAiUGFzc3dvcmQgLy8gVVJMIiwgIi0tLS0iLCAiLS0tLS0t
LS0iKSkNCiAgICAgICAgICB0ZXh0ID0gVXRpbHMubWFrZXRleHQoDQogICAg
ICAgICAgICAgICdjcm9ucGFzcy50eHQnLA0KISAgICAgICAgICAgICB7J2hv
c3RuYW1lJzogbGlzdC5ob3N0X25hbWUsDQogICAgICAgICAgICAgICAndXNl
cicgICAgOiB1c2VyLA0KISAgICAgICAgICAgICAgJ29uZV9saXN0JzogbCwN
CiAgICAgICAgICAgICAgIH0pDQogICAgICAgICAgIyBhZGQgdGhpcyB0byB0
aGUgZW5kIHNvIGl0IGRvZXNuJ3QgZ2V0IHdyYXBwZWQvZmlsbGVkDQogICAg
ICAgICAgdGV4dCA9IHRleHQgKyBoZWFkZXIgKyAnXG4nICsgc3RyaW5nLmpv
aW4odGFibGUsICdcbicpDQohICAgIAlsaXN0LlNlbmRUZXh0VG9Vc2VyKHN1
YmplY3QgPSBzdWJqLA0KISAgICAJCQkgICAgcmVjaXBpZW50ID0gdXNlciwN
CiEgICAgCQkJICAgIHRleHQgPSB0ZXh0LA0KISAgCQkJICAgIHNlbmRlciA9
IG1tX2NmZy5NQUlMTUFOX09XTkVSLA0KICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgYWRkX2hlYWRlcnMgPSBbIlgtTm8tQXJjaGl2ZTogeWVzIiwN
CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICJQcmVjZWRlbmNlOiBidWxrIl0pDQogICAgICAgICAgY291bnQgPSBjb3Vu
dCAtIDENCi0tLSA1MSw4MiAtLS0tDQogIA0KICAgICAgVGhlIGxpc3QgY2Fu
IGJlIGFueSByYW5kb20gb25lIC0gaXQgaXMgb25seSB1c2VkIGZvciB0aGUg
bWVzc2FnZQ0KICAgICAgZGVsaXZlcnkgbWVjaGFuaXNtLiIiIg0KISAgICAg
ZGVmYXVsdF9ob3N0ID0gbW1fY2ZnLkRFRkFVTFRfSE9TVF9OQU1FDQohICAg
ICBtYWlsbWFuX293bmVyID0gbW1fY2ZnLk1BSUxNQU5fT1dORVINCiEgICAg
IHN1YmogPSAnJXMgbWFpbGxpc3QgbWVtYmVyc2hpcHMgcmVtaW5kZXJcbicg
JSBkZWZhdWx0X2hvc3QNCiAgICAgIGNvdW50ID0gUEFVU0VfRlJFUVVFTkNZ
DQogICAgICBmb3IgdXNlciwgZGF0YSBpbiB1c2Vycy5pdGVtcygpOg0KISAg
ICAgICAgIHRhYmxlID0gW10NCiEgICAgICAgICBmb3IgbCwgciwgcCwgdSBp
biBkYXRhOg0KISAgICAgICAgICAgICBpZiBsZW4obCkgPiAzOToNCiEgICAg
ICAgICAgICAgICAgIHRhYmxlLmFwcGVuZCgiJXNcbiAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgJS0xMHNcbiVzXG4iICUgKGws
IHAsIHUpKQ0KISAgICAgICAgICAgICBlbHNlOg0KISAgICAgICAgICAgICAg
ICAgdGFibGUuYXBwZW5kKCIlLTQwcyAlLTEwc1xuJXNcbiIgJSAobCwgcCwg
dSkpDQohICAgICAgICAgaGVhZGVyID0gKCIlLTQwcyAlLTEwc1xuJS00MHMg
JS0xMHMiDQohICAgICAgICAgICAgICAgICAgICAlICgiTGlzdCIsICJQYXNz
d29yZCAvLyBVUkwiLCAiLS0tLSIsICItLS0tLS0tLSIpKQ0KICAgICAgICAg
IHRleHQgPSBVdGlscy5tYWtldGV4dCgNCiAgICAgICAgICAgICAgJ2Nyb25w
YXNzLnR4dCcsDQohICAgICAgICAgICAgIHsnZGVmX2hvc3QnOiBkZWZhdWx0
X2hvc3QsDQogICAgICAgICAgICAgICAndXNlcicgICAgOiB1c2VyLA0KISAg
ICAgICAgICAgICAgJ2V4X3JlcScgIDogciwNCiEgICAgICAgICAgICAgICdt
bV9vd25lcic6IG1haWxtYW5fb3duZXIsDQogICAgICAgICAgICAgICB9KQ0K
ICAgICAgICAgICMgYWRkIHRoaXMgdG8gdGhlIGVuZCBzbyBpdCBkb2Vzbid0
IGdldCB3cmFwcGVkL2ZpbGxlZA0KICAgICAgICAgIHRleHQgPSB0ZXh0ICsg
aGVhZGVyICsgJ1xuJyArIHN0cmluZy5qb2luKHRhYmxlLCAnXG4nKQ0KISAg
ICAgICAgIGxpc3QuU2VuZFRleHRUb1VzZXIoc3ViamVjdCA9IHN1YmosDQoh
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICByZWNpcGllbnQgPSB1c2Vy
LA0KISAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdGV4dCA9IHRleHQs
DQohICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzZW5kZXIgPSBtYWls
bWFuX293bmVyLA0KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYWRk
X2hlYWRlcnMgPSBbIlgtTm8tQXJjaGl2ZTogeWVzIiwNCiAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJQcmVjZWRlbmNl
OiBidWxrIl0pDQogICAgICAgICAgY291bnQgPSBjb3VudCAtIDENCioqKioq
KioqKioqKioqKg0KKioqIDg3LDExOSAqKioqDQogICAgICB0aGUgdXNlciBh
IHNpbmdsZSBtZXNzYWdlIHdpdGggdGhlIGluZm8gZm9yIGFsbCB0aGVpciBs
aXN0cyBvbiB0aGlzDQogICAgICBzaXRlLiIiIg0KICAgICAgbGlzdCA9IE5v
bmUNCiEgICAgIHVzZXJzID0ge30JCQkJIyB1c2VyOiAobGlzdG5hbWUsIHBh
c3N3b3JkLCB1cmwpDQogICAgICAjIENvbnN0cmFpbiB0byBzcGVjaWZpZWQg
dXNlcnMsIGlmIGFueS4NCiAgICAgIGNvbmZpbmVkX3RvID0gYXJnc1sxOl0N
CiAgICAgIGFfcHVibGljX2xpc3QgPSBOb25lDQogICAgICBmb3IgbmFtZSBp
biBVdGlscy5saXN0X25hbWVzKCk6DQohIAlsaXN0ID0gTWFpbExpc3QuTWFp
bExpc3QobmFtZSwgbG9jayA9IDApDQogICAgICAgICAgaWYgbm90IGFfcHVi
bGljX2xpc3QgYW5kIGxpc3QuYWR2ZXJ0aXNlZDoNCiAgICAgICAgICAgICAg
YV9wdWJsaWNfbGlzdCA9IGxpc3QNCiEgCWxpc3RfbmFtZSA9IGxpc3QucmVh
bF9uYW1lDQohIAl1bWJyZWxsYV9saXN0ID0gbGlzdC51bWJyZWxsYV9saXN0
DQohIAlpZiBub3QgbGlzdC5zZW5kX3JlbWluZGVyczoNCiEgCSAgICBjb250
aW51ZQ0KISAJZm9yIHVzZXIsIHBhc3N3b3JkIGluIGxpc3QucGFzc3dvcmRz
Lml0ZW1zKCk6DQogICAgICAgICAgICAgIGlmIGNvbmZpbmVkX3RvOg0KICAg
ICAgICAgICAgICAgICAgaWYgdXNlciBub3QgaW4gY29uZmluZWRfdG86DQog
ICAgICAgICAgICAgICAgICAgICAgY29udGludWUNCiAgICAgICAgICAgICAg
ICAgIGVsc2U6DQogICAgICAgICAgICAgICAgICAgICAgIyBXZSdyZSBhIGJp
dCB2ZXJib3NlIHdoZW4gb3BlcmF0aW5nICJjb25maW5lZF90byI6DQogICAg
ICAgICAgICAgICAgICAgICAgcHJpbnQgIiVzIGluICVzIiAlICh1c2VyLCBs
aXN0LnJlYWxfbmFtZSkNCiEgCSAgICB1cmwgPSBsaXN0LkdldEFic29sdXRl
T3B0aW9uc1VSTCh1c2VyKQ0KICAgICAgICAgICAgICByZWNpcGllbnQgPSBs
aXN0LkdldE1lbWJlckFkbWluRW1haWwodXNlcikNCiEgCSAgICBpZiB1c2Vy
cy5oYXNfa2V5KHJlY2lwaWVudCk6DQohIAkJdXNlcnNbcmVjaXBpZW50XS5h
cHBlbmQobGlzdF9uYW1lLCBwYXNzd29yZCwgdXJsKQ0KISAJICAgIGVsc2U6
DQohIAkJdXNlcnNbcmVjaXBpZW50XSA9IFsobGlzdF9uYW1lLCBwYXNzd29y
ZCwgdXJsKV0NCiAgICAgIGlmIGxpc3Q6DQohIAlNYWlsQWxsUGFzc3dvcmRz
KGFfcHVibGljX2xpc3Qgb3IgbGlzdCwgdXNlcnMpDQogIA0KICBkZWYgd2Fp
dGFsbCgpOg0KICAgICAgIiIiUmV0dXJuIG9ubHkgd2hlbiB0aGVyZSBhcmUg
bm8gZm9ya2VkIHN1YnByb2Nlc3NlcyBydW5uaW5nLiIiIg0KLS0tIDkwLDEy
NSAtLS0tDQogICAgICB0aGUgdXNlciBhIHNpbmdsZSBtZXNzYWdlIHdpdGgg
dGhlIGluZm8gZm9yIGFsbCB0aGVpciBsaXN0cyBvbiB0aGlzDQogICAgICBz
aXRlLiIiIg0KICAgICAgbGlzdCA9IE5vbmUNCiEgICAgIHVzZXJzID0ge30J
CSMgdXNlcjogKGxpc3QgYWRkcmVzcywgcmVxdWVzdCBhZGRyZXNzLCBwYXNz
d29yZCwgdXJsKQ0KICAgICAgIyBDb25zdHJhaW4gdG8gc3BlY2lmaWVkIHVz
ZXJzLCBpZiBhbnkuDQogICAgICBjb25maW5lZF90byA9IGFyZ3NbMTpdDQog
ICAgICBhX3B1YmxpY19saXN0ID0gTm9uZQ0KICAgICAgZm9yIG5hbWUgaW4g
VXRpbHMubGlzdF9uYW1lcygpOg0KISAgICAgICAgIGxpc3QgPSBNYWlsTGlz
dC5NYWlsTGlzdChuYW1lLCBsb2NrID0gMCkNCiAgICAgICAgICBpZiBub3Qg
YV9wdWJsaWNfbGlzdCBhbmQgbGlzdC5hZHZlcnRpc2VkOg0KICAgICAgICAg
ICAgICBhX3B1YmxpY19saXN0ID0gbGlzdA0KISAgICAgICAgIGxpc3RfYWRk
cmVzcyA9IGxpc3QuR2V0TGlzdEVtYWlsKCkNCiEgICAgICAgICBsaXN0X3Jl
cXVlc3QgPSBsaXN0LkdldFJlcXVlc3RFbWFpbCgpDQohICAgICAgICAgdW1i
cmVsbGFfbGlzdCA9IGxpc3QudW1icmVsbGFfbGlzdA0KISAgICAgICAgIGlm
IG5vdCBsaXN0LnNlbmRfcmVtaW5kZXJzOg0KISAgICAgICAgICAgICBjb250
aW51ZQ0KISAgICAgICAgIGZvciB1c2VyLCBwYXNzd29yZCBpbiBsaXN0LnBh
c3N3b3Jkcy5pdGVtcygpOg0KICAgICAgICAgICAgICBpZiBjb25maW5lZF90
bzoNCiAgICAgICAgICAgICAgICAgIGlmIHVzZXIgbm90IGluIGNvbmZpbmVk
X3RvOg0KICAgICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlDQogICAgICAg
ICAgICAgICAgICBlbHNlOg0KICAgICAgICAgICAgICAgICAgICAgICMgV2Un
cmUgYSBiaXQgdmVyYm9zZSB3aGVuIG9wZXJhdGluZyAiY29uZmluZWRfdG8i
Og0KICAgICAgICAgICAgICAgICAgICAgIHByaW50ICIlcyBpbiAlcyIgJSAo
dXNlciwgbGlzdC5yZWFsX25hbWUpDQohICAgICAgICAgICAgIHVybCA9IGxp
c3QuR2V0QWJzb2x1dGVPcHRpb25zVVJMKHVzZXIpDQogICAgICAgICAgICAg
IHJlY2lwaWVudCA9IGxpc3QuR2V0TWVtYmVyQWRtaW5FbWFpbCh1c2VyKQ0K
ISAgICAgICAgICAgICBpZiB1c2Vycy5oYXNfa2V5KHJlY2lwaWVudCk6DQoh
ICAgICAgICAgICAgICAgICB1c2Vyc1tyZWNpcGllbnRdLmFwcGVuZChsaXN0
X2FkZHJlc3MsIGxpc3RfcmVxdWVzdCwgDQohICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHBhc3N3
b3JkLCB1cmwpDQohICAgICAgICAgICAgIGVsc2U6DQohICAgICAgICAgICAg
ICAgICB1c2Vyc1tyZWNpcGllbnRdID0gWyhsaXN0X2FkZHJlc3MsIGxpc3Rf
cmVxdWVzdCwgDQohICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgIHBhc3N3b3JkLCB1cmwpXQ0KICAg
ICAgaWYgbGlzdDoNCiEgICAgICAgICBNYWlsQWxsUGFzc3dvcmRzKGFfcHVi
bGljX2xpc3Qgb3IgbGlzdCwgdXNlcnMpDQogIA0KICBkZWYgd2FpdGFsbCgp
Og0KICAgICAgIiIiUmV0dXJuIG9ubHkgd2hlbiB0aGVyZSBhcmUgbm8gZm9y
a2VkIHN1YnByb2Nlc3NlcyBydW5uaW5nLiIiIg0KZGlmZiAtYyAtciBNTS5v
cmlnL3RlbXBsYXRlcy9jcm9ucGFzcy50eHQgTU0vdGVtcGxhdGVzL2Nyb25w
YXNzLnR4dA0KKioqIE1NLm9yaWcvdGVtcGxhdGVzL2Nyb25wYXNzLnR4dAlT
YXQgQXByICAzIDA5OjE4OjI4IDE5OTkNCi0tLSBNTS90ZW1wbGF0ZXMvY3Jv
bnBhc3MudHh0CVN1biBBcHIgIDQgMDg6MDc6MzggMTk5OQ0KKioqKioqKioq
KioqKioqDQoqKiogMSw0ICoqKioNCiEgVGhpcyBpcyBhIHJlbWluZGVyLCBz
ZW50IG91dCBvbmNlIGEgbW9udGgsIGFib3V0IHlvdXIgJShob3N0bmFtZSlz
DQogIG1haWxpbmcgbGlzdCBtZW1iZXJzaGlwcy4gIEl0IGluY2x1ZGVzIHlv
dXIgc3Vic2NyaXB0aW9uIGluZm8gYW5kDQogIGhvdyB0byB1c2UgaXQgdG8g
Y2hhbmdlIGl0IG9yIHVuc3Vic2NyaWJlIGZyb20gYSBsaXN0Lg0KICANCi0t
LSAxLDQgLS0tLQ0KISBUaGlzIGlzIGEgcmVtaW5kZXIsIHNlbnQgb3V0IG9u
Y2UgYSBtb250aCwgYWJvdXQgeW91ciAlKGRlZl9ob3N0KXMNCiAgbWFpbGlu
ZyBsaXN0IG1lbWJlcnNoaXBzLiAgSXQgaW5jbHVkZXMgeW91ciBzdWJzY3Jp
cHRpb24gaW5mbyBhbmQNCiAgaG93IHRvIHVzZSBpdCB0byBjaGFuZ2UgaXQg
b3IgdW5zdWJzY3JpYmUgZnJvbSBhIGxpc3QuDQogIA0KKioqKioqKioqKioq
KioqDQoqKiogOCwxOCAqKioqDQogIA0KICBJbiBhZGRpdGlvbiB0byB0aGUg
VVJMIGludGVyZmFjZXMsIHlvdSBjYW4gYWxzbyB1c2UgZW1haWwgdG8gbWFr
ZSBzdWNoDQogIGNoYW5nZXMuICBGb3IgbW9yZSBpbmZvLCBzZW5kIGEgbWVz
c2FnZSB0byB0aGUgJy1yZXF1ZXN0JyBhZGRyZXNzIG9mDQohIHRoZSBsaXN0
IChmb3IgZXhhbXBsZSwgJShvbmVfbGlzdClzLXJlcXVlc3RAJShob3N0bmFt
ZSlzKSBjb250YWluaW5nDQogIGp1c3QgdGhlIHdvcmQgJ2hlbHAnIGluIHRo
ZSBtZXNzYWdlIGJvZHksIGFuZCBhbiBlbWFpbCBtZXNzYWdlIHdpbGwgYmUN
CiAgc2VudCB0byB5b3Ugd2l0aCBpbnN0cnVjdGlvbnMuDQogIA0KICBJZiB5
b3UgaGF2ZSBxdWVzdGlvbnMsIHByb2JsZW1zLCBjb21tZW50cywgZXRjLCBz
ZW5kIHRoZW0gdG8NCiEgbWFpbG1hbi1vd25lckAlKGhvc3RuYW1lKXMuICBU
aGFua3MhDQogIA0KICBQYXNzd29yZHMgZm9yICUodXNlcilzOg0KLS0tIDgs
MTkgLS0tLQ0KICANCiAgSW4gYWRkaXRpb24gdG8gdGhlIFVSTCBpbnRlcmZh
Y2VzLCB5b3UgY2FuIGFsc28gdXNlIGVtYWlsIHRvIG1ha2Ugc3VjaA0KICBj
aGFuZ2VzLiAgRm9yIG1vcmUgaW5mbywgc2VuZCBhIG1lc3NhZ2UgdG8gdGhl
ICctcmVxdWVzdCcgYWRkcmVzcyBvZg0KISB0aGUgbGlzdCAoZm9yIGV4YW1w
bGUsICUoZXhfcmVxKXMpIGNvbnRhaW5pbmcNCiAganVzdCB0aGUgd29yZCAn
aGVscCcgaW4gdGhlIG1lc3NhZ2UgYm9keSwgYW5kIGFuIGVtYWlsIG1lc3Nh
Z2Ugd2lsbCBiZQ0KICBzZW50IHRvIHlvdSB3aXRoIGluc3RydWN0aW9ucy4N
CiAgDQogIElmIHlvdSBoYXZlIHF1ZXN0aW9ucywgcHJvYmxlbXMsIGNvbW1l
bnRzLCBldGMsIHNlbmQgdGhlbSB0bw0KISAlKG1tX293bmVyKXMuICBUaGFu
a3MhDQogIA0KICBQYXNzd29yZHMgZm9yICUodXNlcilzOg0KKyANCg==
--1523646986-1305930720-923239353=:8555--