Changeset 1523
- Timestamp:
- 09/06/10 11:43:58 (1 year ago)
- Files:
-
- 5200R/trunk/ui/base-email.mod/Makefile (modified) (1 diff)
- 5200R/trunk/ui/base-email.mod/glue/handlers/handle_alias.pl (modified) (1 diff)
- 5200R/trunk/ui/base-email.mod/glue/handlers/mapmaker.pl (modified) (1 diff)
- 5200R/trunk/ui/base-email.mod/glue/handlers/system.pl (modified) (2 diffs)
- 5200R/trunk/ui/base-email.mod/templates/rpmdefs.tmpl (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
5200R/trunk/ui/base-email.mod/Makefile
r1521 r1523 8 8 9 9 VERSION=1.5.0 10 RELEASE=0BQ2 810 RELEASE=0BQ29 11 11 12 12 # add a buildarch if desired 5200R/trunk/ui/base-email.mod/glue/handlers/handle_alias.pl
r1495 r1523 92 92 93 93 # rollback to recreate db to avoid having to copy the db file at all 94 Sauce::Util::addrollbackcommand("/usr/bin/post aliashash:$Email::VIRTUSER >/dev/null 2>&1");94 Sauce::Util::addrollbackcommand("/usr/bin/postmap hash:$Email::VIRTUSER >/dev/null 2>&1"); 95 95 my $ok = Sauce::Util::editfile( 96 96 $Email::VIRTUSER, 5200R/trunk/ui/base-email.mod/glue/handlers/mapmaker.pl
r1495 r1523 55 55 # shell return values in perl always makes me do a double take so I 56 56 # took the clearest path, ratehr than the shortest. 57 58 if( system("/usr/sbin/postalias hash:$map >/dev/null 2>&1") == 0 ) { 59 return 1; 57 if ($map != $Email::VIRTUSER) { 58 if( system("/usr/sbin/postalias hash:$map >/dev/null 2>&1") == 0 ) { 59 return 1; 60 } else { 61 return 0; 62 } 60 63 } else { 61 return 0; 64 if( system("/usr/sbin/postmap hash:$map >/dev/null 2>&1") == 0 ) { 65 return 1; 66 } else { 67 return 0; 68 } 62 69 } 63 70 } 5200R/trunk/ui/base-email.mod/glue/handlers/system.pl
r1495 r1523 38 38 39 39 # add rollback to recreate virtusertable.db 40 Sauce::Util::addrollbackcommand("/usr/bin/post aliashash:$Email::VIRTUSER >/dev/null 2>&1");40 Sauce::Util::addrollbackcommand("/usr/bin/postmap hash:$Email::VIRTUSER >/dev/null 2>&1"); 41 41 42 42 if (!Sauce::Util::replaceblock($Email::VIRTUSER, … … 48 48 $cce->bye('FAIL'); 49 49 } 50 system("/usr/sbin/post aliashash:$Email::VIRTUSER >/dev/null 2>&1");50 system("/usr/sbin/postmap hash:$Email::VIRTUSER >/dev/null 2>&1"); 51 51 52 52 $cce->bye("SUCCESS"); 5200R/trunk/ui/base-email.mod/templates/rpmdefs.tmpl
r1521 r1523 87 87 /usr/sausalito/bin/remove_domain.pl 88 88 fi 89 90 /usr/sbin/postmap hash:/etc/postfix/virtual > /dev/null 2>&1 89 91 <end glue> 90 92 <begin ui> … … 118 120 119 121 <begin $CHANGELOG> 122 * Mon Sep 06 2010 Hisao SHIBUYA <shibuya@bluequartz.org> 1.5.0-0BQ29 123 - use postmap for virtual.db instead of postalias. 124 120 125 * Fri Aug 13 2010 Hisao SHIBUYA <shibuya@bluequartz.org> 1.5.0-0BQ28 121 126 - resolved the issue that TLS doesn't work when SMTPS is disabled.
