firma no longer declares/unsets global variables and functions at the beginning/end of execution. BASH can take care of that just fine.

1 files changed, 0 insertions, 94 deletions

diff --git a/firma b/firma
index 57466bd..e23f557 100755
--- a/firma
+++ b/firma
@@ -2464,91 +2464,6 @@ VERSION="0.3"
 export LANG=en_US
 umask 0077
 
-# declare global variables and functions used during execution
-GLOBAL_VARS="
-  GPG_BINARY MAIL_AGENT MAIL_AGENT_ARGS LISTS_DIR LOG_TO_SYSLOG LOGGER_BINARY SYSLOG_PRIORITY
-  USE_GPG_HIDDEN_RECIPIENT_OPTION REMOVE_THESE_HEADERS_ON_ALL_LISTS SILENTLY_DISCARD_INVALID_MESSAGES
-  LIST_ADDRESS LIST_ADMIN LIST_HOMEDIR PASSPHRASE SUBJECT_PREFIX REMOVE_THESE_HEADERS REPLIES_SHOULD_GO_TO_LIST
-  FIRMA_CONFIG_FILE VERSION
-  KEY_DESCRIPTION LIST_NAME LIST_PATH LIST_CONFIG_FILE KEY_EXPIRATION KEY_SIZE
-  GPG_FLAGS GPG GPG_LIST_KEYS GPG_DECRYPT GPG_ENCRYPT
-  STDIN
-  ORIG_MESSAGE
-  FIRST_BLANK_LINE ENCRYPTED_BLOC_BEGINS ENCRYPTED_BLOC_ENDS ORIG_GPG_MESSAGE
-  ENCRYPTED_TO_LIST GOOD_SIGNATURE BAD_SIGNATURE SIGNATURE_CHECKING_FAILED MESSAGE_DECRYPTION_OKAY
-  SUBSCRIBERS_LIST
-  ORIG_MESSAGE_HEADERS ORIG_MESSAGE_BODY
-  GPG_MESSAGE
-  DECRYPTED_MESSAGE
-  MESSAGE_HEADERS MESSAGE_BODY
-  MESSAGE
-  BASENAME
-  FIRMA_USER
-  FIRMA_GROUP
-  KEYSERVER
-  MODE
-  REQUIRE_SIGNATURE
-  SIGNATURE_MADE_BY_SENDER
-  DELIVERY_RANDOMIZATION
-  REPLAY_FILE
-  REPLAY_DEFAULT_FILE
-  REPLAY_PROTECTION
-  REPLAY_COUNT
-  FUNCTION FUNCTIONS
-  GLOBAL_VARS"
-
-FUNCTIONS="
-  Usage
-  Version
-  DeclareGpgVars
-  CheckPassphrase
-  CheckFirmaConfigFile
-  CheckListConfigFile
-  GetMessage
-  GetGpgMessage
-  ParseGpgDecryptStderr
-  GetSubscribersList
-  GetMessageHeadersAndBody
-  EditListMessageHeaders
-  DecryptGpgMessage
-  ReplaceGpgMessage
-  GetSenderAddress
-  AssembleMessage
-  ReEncryptAndSendListMessage
-  ComposeAndSendWarningMessage
-  ComposeAndSendBounceMessage
-  ProcessMessage
-  NewList
-  AdminHelp
-  ListAdministration
-  ChooseUid
-  CheckPermission
-  CheckListPermissions
-  CheckValidEmail
-  UnsubscribeUser
-  LogMessage
-  SubscribeUsers
-  SendListPubkey
-  GetSubscribersInfo
-  FixListOwnership
-  RandomString
-  AdminLog
-  EmailListAdministration
-  AllowMessageProcessing
-  MimeWrapMessage
-  CreateMessageBodyPart
-  EvalConfigParameter
-  SourceFirmaConfig
-  SourceListConfig
-  ConfigHelp
-  DeliveryRandomization
-  ReplayProtectionFlush
-  ReplayProtectionCheck"
-
-for VAR in $GLOBAL_VARS; do
-  declare $VAR
-done
-
 # set initial exit code
 EXIT_CODE=0
 
@@ -2714,15 +2629,6 @@ case $# in
 # end main case
 esac
 
-# erase all functions and global variables
-for FUNCTION in $FUNCTIONS; do
-  unset -f $FUNCTION
-done
-
-for VAR in $GLOBAL_VARS; do
-  unset $VAR
-done
-
 # exit
 exit $EXIT_CODE