This commit was manufactured by cvs2svn to create tag 'pymilter-0_9_4'.

Sprout from master 2011-03-05 03:12:02 UTC Stuart Gathman <stuart@gathman.org> 'Release 1.0' Cherrypick from bmsi 2005-05-31 18:23:49 UTC Stuart Gathman <stuart@gathman.org> 'Development changes since 0.7.2': sample.py test/big5 test/bounce test/bounce1 test/bound test/honey test/missingboundary test/samp1 test/spam44 test/spam7 test/spam8 test/test1 test/test8 test/virus1 test/virus13 test/virus2 test/virus3 test/virus4 test/virus5 test/virus6 test/virus7
2011-03-05 03:12:03 +00:00
20 changed files with 123 additions and 608 deletions
@@ -31,7 +31,7 @@ PROJECT_NAME           = pymilter
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.

-PROJECT_NUMBER         = 0.9.6
+PROJECT_NUMBER         = 0.9.3

 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
 # base path where the generated documentation will be put. 
@@ -814,7 +814,7 @@ DOCSET_FEEDNAME        = "Doxygen generated docs"
 # reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen 
 # will append .docset to the name.

-DOCSET_BUNDLE_ID       = com.bmsi.pymilter
+DOCSET_BUNDLE_ID       = org.doxygen.Project

 # If the GENERATE_HTMLHELP tag is set to YES, additional index files 
 # will be generated that can be used as input for tools like the 
@@ -8,27 +8,19 @@
 # Copyright 2001,2009 Business Management Systems, Inc.
 # This code is under the GNU General Public License.  See COPYING for details.

-__version__ = '0.9.7'
+__version__ = '0.9.3'

 import os
-import re
 import milter
 import thread

 from milter import *
-from functools import wraps

 _seq_lock = thread.allocate_lock()
 _seq = 0

-## @fn set_flags(flags)
-# @brief Enable optional %milter actions.
-# Certain %milter actions need to be enabled before calling milter.runmilter()
-# or they throw an exception. 
-# @param flags Bit ored mask of optional actions to enable
-
 def uniqueID():
-  """Return a unique sequence number (incremented on each call).
+  """Return a sequence number unique to this process.
  """
  global _seq
  _seq_lock.acquire()
@@ -36,7 +28,6 @@ def uniqueID():
  _seq_lock.release()
  return seqno

-## @private
 OPTIONAL_CALLBACKS = {
  'connect':(P_NR_CONN,P_NOCONNECT),
  'hello':(P_NR_HELO,P_NOHELO),
@@ -49,10 +40,6 @@ OPTIONAL_CALLBACKS = {
  'header':(P_NR_HDR,P_NOHDRS)
 }

-## @private
-R = re.compile(r'%+')
-
-## @private
 def decode_mask(bits,names):
  t = [ (s,getattr(milter,s)) for s in names]
  nms = [s for s,m in t if bits & m]
@@ -62,17 +49,16 @@ def decode_mask(bits,names):

 ## Class decorator to enable optional protocol steps.
 # P_SKIP is enabled by default when supported, but
-# applications may wish to enable P_HDR_LEADSPC
+# milter applications may wish to enable P_HDR_LEADSPC
 # to send and receive the leading space of header continuation
 # lines unchanged, and/or P_RCPT_REJ to have recipients 
 # detected as invalid by the MTA passed to the envcrpt callback.
 #
 # Applications may want to check whether the protocol is actually
-# supported by the MTA in use.  Base._protocol
-# is a bitmask of protocol options negotiated.  So,
+# supported by the MTA in use.  The <code>_protocol</code> 
+# member is a bitmask of protocol options negotiated.  So,
 # for instance, if <code>self._protocol & Milter.P_RCPT_REJ</code>
-# is true, then that feature was successfully negotiated with the MTA
-# and the application will see recipients the MTA has flagged as invalid.
+# is true, then that feature was successfully negotiated with the MTA.
 # 
 # Sample use:
 # <pre>
@@ -82,59 +68,21 @@ def decode_mask(bits,names):
 # myMilter = Milter.enable_protocols(myMilter,Milter.P_RCPT_REJ)
 # </pre>
 # @since 0.9.3
-# @param klass the %milter application class to modify
+# @param klass the milter application class to modify
 # @param mask a bitmask of protocol steps to enable
-# @return the modified %milter class
+# @return the modified milter class
 def enable_protocols(klass,mask):
  klass._protocol_mask = klass.protocol_mask() & ~mask
  return klass

-## Milter rejected recipients. A class decorator that calls
-# enable_protocols() with the P_RCPT_REJ flag.  By default, the MTA
-# does not pass recipients that it knows are invalid on to the milter.
-# This decorator enables a %milter app to see all recipients if supported
-# by the MTA.  Use like this with python-2.6 and later:
-# <pre>
-# @@Milter.rejected_recipients
-# class myMilter(Milter.Base):
-#   def envrcpt(self,to,*params):
-#     return Milter.CONTINUE
-# </pre>
-# @since 0.9.5
-# @param klass the %milter application class to modify
-# @return the modified %milter class
-def rejected_recipients(klass):
-  return enable_protocols(klass,P_RCPT_REJ)
-
-## Milter leading space on headers. A class decorator that calls
-# enable_protocols() with the P_HEAD_LEADSPC flag.  By default,
-# header continuation lines are collected and joined before getting
-# sent to a milter.  Headers modified or added by the milter are
-# folded by the MTA as necessary according to its own standards.
-# With this flag, header continuation lines are preserved
-# with their newlines and leading space.  In addition, header folding
-# done by the milter is preserved as well.
-# Use like this with python-2.6 and later:
-# <pre>
-# @@Milter.header_leading_space
-# class myMilter(Milter.Base):
-#   def header(self,hname,value):
-#     return Milter.CONTINUE
-# </pre>
-# @since 0.9.5
-# @param klass the %milter application class to modify
-# @return the modified %milter class
-def header_leading_space(klass):
-  return enable_protocols(klass,P_HEAD_LEADSPC)
-
 ## Function decorator to disable callback methods.
-# If the MTA supports it, tells the MTA not to invoke this callback,
+# If the MTA supports it, tells the MTA not to call this callback,
 # increasing efficiency.  All the callbacks (except negotiate)
 # are disabled in Milter.Base, and overriding them reenables the
 # callback.  An application may need to use @@nocallback when it extends
-# another %milter and wants to disable a callback again.
+# another milter and wants to disable a callback again.
 # The disabled method should still return Milter.CONTINUE, in case the MTA does
-# not support protocol negotiation, and for when called from a test harness.
+# not support protocol negotiation.
 # @since 0.9.2
 def nocallback(func):
  try:
@@ -142,12 +90,7 @@ def nocallback(func):
  except KeyError:
    raise ValueError(
      '@nocallback applied to non-optional method: '+func.__name__)
-  def wrapper(self,*args):
-    if func(self,*args) != CONTINUE:
-      raise RuntimeError('%s return code must be CONTINUE with @nocallback'
-        % func.__name__)
-    return CONTINUE
-  return wrapper
+  return func

 ## Function decorator to disable callback reply.
 # If the MTA supports it, tells the MTA not to wait for a reply from
@@ -162,14 +105,9 @@ def noreply(func):
  except KeyError:
    raise ValueError(
      '@noreply applied to non-optional method: '+func.__name__)
-  @wraps(func)
  def wrapper(self,*args):
    rc = func(self,*args)
-    if self._protocol & nr_mask:
-      if rc != CONTINUE:
-        raise RuntimeError('%s return code must be CONTINUE with @noreply'
-	  % func.__name__)
-      return NOREPLY
+    if self._protocol & nr_mask: return NOREPLY
    return rc
  wrapper.milter_protocol = nr_mask
  return wrapper
@@ -184,87 +122,49 @@ def noreply(func):
 class DisabledAction(RuntimeError):
  pass

-## A do "nothing" Milter base class representing an SMTP connection.
-#
+## A do "nothing" Milter base class.
 # Python milters should derive from this class
-# unless they are using the low level milter module directly.  
-#
-# Most of the methods are either "actions" or "callbacks".  Callbacks
-# are invoked by the MTA at certain points in the SMTP protocol.  For
-# instance when the HELO command is seen, the MTA calls the helo
-# callback before returning a response code.  All callbacks must
-# return one of these constants: CONTINUE, TEMPFAIL, REJECT, ACCEPT,
-# DISCARD, SKIP.  The NOREPLY response is supplied automatically by
-# the @@noreply decorator if negotiation with the MTA is successful.
-# @@noreply and @@nocallback methods should return CONTINUE for two reasons:
-# the MTA may not support negotiation, and the class may be running in a test
-# harness.
-# 
-# Optional callbacks are disabled with the @@nocallback decorator, and
-# automatically reenabled when overridden.  Disabled callbacks should
-# still return CONTINUE for testing and MTAs that do not support
-# negotiation.  
-
-# Each SMTP connection to the MTA calls the factory method you provide to
-# create an instance derived from this class.  This is typically the
-# constructor for a class derived from Base.  The _setctx() method attaches
-# the instance to the low level milter.milterContext object.  When the SMTP
-# connection terminates, the close callback is called, the low level connection
-# object is destroyed, and this normally causes instances of this class to be
-# garbage collected as well.  The close() method should release any global
-# resources held by instances.
+# unless they are using the low lever milter module directly.  
+# All optional callbacks are disabled, and automatically
+# reenabled when overridden.
 # @since 0.9.2
 class Base(object):
-  "The core class interface to the %milter module."
+  "The core class interface to the milter module."

  ## Attach this Milter to the low level milter.milterContext object.
  def _setctx(self,ctx):
-    ## The low level @ref milter.milterContext object.
    self._ctx = ctx
-    ## A bitmask of actions this connection has negotiated to use.
-    # By default, all actions are enabled.  High throughput milters
-    # may want to disable unused actions to increase efficiency.
-    # Some optional actions may be disabled by calling milter.set_flags(), or
-    # by overriding the negotiate callback.  The bits include:
-    # <code>ADDHDRS,CHGBODY,MODBODY,ADDRCPT,ADDRCPT_PAR,DELRCPT
-    #  CHGHDRS,QUARANTINE,CHGFROM,SETSMLIST</code>.
-    # The <code>Milter.CURR_ACTS</code> bitmask is all actions
-    # known when the milter module was compiled.
-    # Application code can also inspect this field to determine
-    # which actions are available.  This is especially useful in
-    # generic library code designed to work in multiple milters.
-    # @since 0.9.2
-    #
    self._actions = CURR_ACTS         # all actions enabled by default
-    ## A bitmask of protocol options this connection has negotiated.
-    # An application may inspect this
-    # variable to determine which protocol steps are supported.  Options
-    # of interest to applications: the SKIP result code is allowed
-    # only if the P_SKIP bit is set, rejected recipients are passed to the
-    # %milter application only if the P_RCPT_REJ bit is set, and
-    # header values are sent and received with leading spaces (in the
-    # continuation lines) intact if the P_HDR_LEADSPC bit is set (so
-    # that the application can customize indenting).  
-    #
-    # The P_N* bits should be negotiated via the @@noreply and @@nocallback
-    # method decorators, and P_RCPT_REJ, P_HDR_LEADSPC should
-    # be enabled using the enable_protocols class decorator.
-    #
-    # The bits include: <code>
-    # P_RCPT_REJ P_NR_CONN P_NR_HELO P_NR_MAIL P_NR_RCPT P_NR_DATA P_NR_UNKN
-    # P_NR_EOH P_NR_BODY P_NR_HDR P_NOCONNECT P_NOHELO P_NOMAIL P_NORCPT
-    # P_NODATA P_NOUNKNOWN P_NOEOH P_NOBODY P_NOHDRS P_HDR_LEADSPC P_SKIP
-    # </code> (all under the Milter namespace).
-    # @since 0.9.2
    self._protocol = 0                # no protocol options by default
    if ctx:
      ctx.setpriv(self)
+  ## @var _actions
+  # A bitmask of actions this milter has negotiated to use.
+  # By default, all actions are enabled.  This may be changed
+  # by calling <code>milter.set_flags</code>, or by overriding
+  # the negotiate callback.  The bits include:
+  # <code>ADDHDRS,CHGBODY,MODBODY,ADDRCPT,ADDRCPT_PAR,DELRCPT
+  #  CHGHDRS,QUARANTINE,CHGFROM,SETSMLIST</code>.
+  # The <code>Milter.CURR_ACTS</code> bitmask is all actions
+  # known when the milter module was compiled.
+  # @since 0.9.2
+  #
+
+  ## @var _protocol
+  # A bitmask of protocol options this milter has negotiated.
+  # The bits generally indicate that a particular step should be
+  # skipped, since previous versions of the milter protocol had
+  # no provision for skipping steps.
+  # The bits include: <code>
+  # P_RCPT_REJ P_NR_CONN P_NR_HELO P_NR_MAIL P_NR_RCPT P_NR_DATA P_NR_UNKN
+  # P_NR_EOH P_NR_BODY P_NR_HDR P_NOCONNECT P_NOHELO P_NOMAIL P_NORCPT
+  # P_NODATA P_NOUNKNOWN P_NOEOH P_NOBODY P_NOHDRS P_HDR_LEADSPC P_SKIP
+  # </code> (all under the Milter namespace).
+  # @since 0.9.2

  ## Defined by subclasses to write log messages.
  def log(self,*msg): pass
-  ## Called for each connection to the MTA.  Called by the
-  # <a href="https://www.milter.org/developers/api/xxfi_connect">
-  # xxfi_connect</a> callback.  
+  ## Called for each connection to the MTA.
  # The <code>hostname</code> provided by the local MTA is either
  # the PTR name or the IP in the form "[1.2.3.4]" if no PTR is available.
  # The format of hostaddr depends on the socket family:
@@ -277,17 +177,6 @@ class Base(object):
  # <dt><code>socket.AF_UNIX</code>
  # <dd>A string with the socketname
  # </dl>
-  # To vary behavior based on what port the client connected to,
-  # for example skipping blacklist checks for port 587 (which must 
-  # be authenticated), use @link #getsymval getsymval('{daemon_port}') @endlink.
-  # The <code>{daemon_port}</code> macro must be enabled in sendmail.cf
-  # <pre>
-  # O Milter.macros.connect=j, _, {daemon_name}, {daemon_port}, {if_name}, {if_addr}
-  # </pre>
-  # or sendmail.mc
-  # <pre>
-  # define(`confMILTER_MACROS_CONNECT', ``j, _, {daemon_name}, {daemon_port}, {if_name}, {if_addr}'')dnl
-  # </pre>
  # @param hostname the PTR name or bracketed IP of the SMTP client
  # @param family <code>socket.AF_INET</code>, <code>socket.AF_INET6</code>,
  #     or <code>socket.AF_UNIX</code>
@@ -299,26 +188,12 @@ class Base(object):
  # this almost always results in terminating the connection.
  @nocallback
  def hello(self,hostname): return CONTINUE
-  ## Called when the SMTP client says MAIL FROM. Called by the
-  # <a href="https://www.milter.org/developers/api/xxfi_envfrom">
-  # xxfi_envfrom</a> callback.  
+  ## Called when the SMTP client says MAIL FROM.
  # Returning REJECT rejects the message, but not the connection.
-  # The sender is the "envelope" from as defined by
-  # <a href="http://tools.ietf.org/html/rfc5321">RFC 5321</a>.
-  # For the From: header (author) defined in 
-  # <a href="http://tools.ietf.org/html/rfc5322">RFC 5322</a>,
-  # see @link #header the header callback @endlink.
  @nocallback
  def envfrom(self,f,*str): return CONTINUE
-  ## Called when the SMTP client says RCPT TO. Called by the
-  # <a href="https://www.milter.org/developers/api/xxfi_envrcpt">
-  # xxfi_envrcpt</a> callback.
+  ## Called when the SMTP client says RCPT TO.
  # Returning REJECT rejects the current recipient, not the entire message.
-  # The recipient is the "envelope" recipient as defined by 
-  # <a href="http://tools.ietf.org/html/rfc5321">RFC 5321</a>.
-  # For recipients defined in 
-  # <a href="http://tools.ietf.org/html/rfc5322">RFC 5322</a>, 
-  # for example To: or Cc:, see @link #header the header callback @endlink.
  @nocallback
  def envrcpt(self,to,*str): return CONTINUE
  ## Called when the SMTP client says DATA.
@@ -352,7 +227,7 @@ class Base(object):
  ## Called when the connection is closed.
  def close(self): return CONTINUE

-  ## Return mask of SMFIP_N* protocol option bits to clear for this class
+  ## Return mask of SMFIP_N.. protocol option bits to clear for this class
  # The @@nocallback and @@noreply decorators set the
  # <code>milter_protocol</code> function attribute to the protocol mask bit to
  # pass to libmilter, causing that callback or its reply to be skipped.
@@ -376,20 +251,10 @@ class Base(object):
      klass._protocol_mask = p
      return p
    
-  ## Negotiate milter protocol options.  Called by the
-  # <a href="https://www.milter.org/developers/api/xxfi_negotiate">
-  # xffi_negotiate</a> callback.  This is an advanced callback,
-  # do not override unless you know what you are doing.  Most
-  # negotiation can be done simply by using the supplied 
-  # class and function decorators.
-  # Options are passed as 
-  # a list of 4 32-bit ints which can be modified and are passed
-  # back to libmilter on return.
+  ## Negotiate milter protocol options.
  # Default negotiation sets P_NO* and P_NR* for callbacks
  # marked @@nocallback and @@noreply respectively, leaves all
-  # actions enabled, and enables Milter.SKIP.  The @@enable_protocols
-  # class decorator can customize which protocol steps are implemented.
-  # @param opts a modifiable list of 4 ints with negotiated options
+  # actions enabled, and enables Milter.SKIP.
  # @since 0.9.2
  def negotiate(self,opts):
    try:
@@ -408,24 +273,14 @@ class Base(object):
  ## Return the value of an MTA macro.  Sendmail macro names
  # are either single chars (e.g. "j") or multiple chars enclosed
  # in braces (e.g. "{auth_type}").  Macro names are MTA dependent.
-  # See <a href="https://www.milter.org/developers/api/smfi_getsymval">
-  # smfi_getsymval</a> for default sendmail macros.
  # @param sym the macro name
  def getsymval(self,sym):
    return self._ctx.getsymval(sym)

  ## Set the SMTP reply code and message.
  # If the MTA does not support setmlreply, then only the
-  # first msg line is used.  Any '%' in a message line
-  # must be doubled, or libmilter will silently ignore the setreply.
-  # Beginning with 0.9.6, we test for that case and throw ValueError to avoid
-  # head scratching.  What will <i>really</i> irritate you, however,
-  # is that if you carefully double any '%', your message will be
-  # sent - but with the '%' still doubled!
+  # first msg line is used.
  def setreply(self,rcode,xcode=None,msg=None,*ml):
-    for m in (msg,)+ml:
-      if 1 in [len(s)&1 for s in R.findall(m)]:
-        raise ValueError("'%' must be doubled: "+m)
    return self._ctx.setreply(rcode,xcode,msg,*ml)

  ## Tell the MTA which macro names will be used.
@@ -444,36 +299,28 @@ class Base(object):
  # Milter methods which can only be called from eom callback.

  ## Add a mail header field.
-  # Calls <a href="https://www.milter.org/developers/api/smfi_addheader">
-  # smfi_addheader</a>.  
  # The <code>Milter.ADDHDRS</code> action flag must be set.
  #
  # May be called from eom callback only.
  # @param field        the header field name
  # @param value        the header field value
  # @param idx header field index from the top of the message to insert at
-  # @throws DisabledAction if ADDHDRS is not enabled
  def addheader(self,field,value,idx=-1):
    if not self._actions & ADDHDRS: raise DisabledAction("ADDHDRS")
    return self._ctx.addheader(field,value,idx)

  ## Change the value of a mail header field.
-  # Calls <a href="https://www.milter.org/developers/api/smfi_chgheader">
-  # smfi_chgheader</a>.  
  # The <code>Milter.CHGHDRS</code> action flag must be set.
  #
  # May be called from eom callback only.
  # @param field the name of the field to change
  # @param idx index of the field to change when there are multiple instances
  # @param value the new value of the field
-  # @throws DisabledAction if CHGHDRS is not enabled
  def chgheader(self,field,idx,value):
    if not self._actions & CHGHDRS: raise DisabledAction("CHGHDRS")
    return self._ctx.chgheader(field,idx,value)

-  ## Add a recipient to the message.  
-  # Calls <a href="https://www.milter.org/developers/api/smfi_addrcpt">
-  # smfi_addrcpt</a>.  
+  ## Add a recipient to the message.
  # If no corresponding mail header is added, this is like a Bcc.
  # The syntax of the recipient is the same as used in the SMTP
  # RCPT TO command (and as delivered to the envrcpt callback), for example
@@ -485,42 +332,33 @@ class Base(object):
  # May be called from eom callback only.
  # @param rcpt the message recipient 
  # @param params an optional list of ESMTP parameters
-  # @throws DisabledAction if ADDRCPT or ADDRCPT_PAR is not enabled 
  def addrcpt(self,rcpt,params=None):
    if not self._actions & ADDRCPT: raise DisabledAction("ADDRCPT")
    if params and not self._actions & ADDRCPT_PAR:
        raise DisabledAction("ADDRCPT_PAR")
    return self._ctx.addrcpt(rcpt,params)
  ## Delete a recipient from the message.
-  # Calls <a href="https://www.milter.org/developers/api/smfi_delrcpt">
-  # smfi_delrcpt</a>.  
  # The recipient should match one passed to the envrcpt callback.
  # The <code>Milter.DELRCPT</code> action flag must be set.
  #
  # May be called from eom callback only.
  # @param rcpt the message recipient to delete
-  # @throws DisabledAction if DELRCPT is not enabled
  def delrcpt(self,rcpt):
    if not self._actions & DELRCPT: raise DisabledAction("DELRCPT")
    return self._ctx.delrcpt(rcpt)

  ## Replace the message body.
-  # Calls <a href="https://www.milter.org/developers/api/smfi_replacebody">
-  # smfi_replacebody</a>.  
  # The entire message body must be replaced.  
  # Call repeatedly with blocks of data until the entire body is transferred.
  # The <code>Milter.MODBODY</code> action flag must be set.
  #
  # May be called from eom callback only.
  # @param body a chunk of body data
-  # @throws DisabledAction if MODBODY is not enabled
  def replacebody(self,body):
    if not self._actions & MODBODY: raise DisabledAction("MODBODY")
    return self._ctx.replacebody(body)

  ## Change the SMTP envelope sender address.
-  # Calls <a href="https://www.milter.org/developers/api/smfi_chgfrom">
-  # smfi_chgfrom</a>.  
  # The syntax of the sender is that same as used in the SMTP
  # MAIL FROM command (and as delivered to the envfrom callback),
  # for example <code>self.chgfrom('<bar@example.com>')</code>.
@@ -530,28 +368,22 @@ class Base(object):
  # @since 0.9.1
  # @param sender the new sender address
  # @param params an optional list of ESMTP parameters
-  # @throws DisabledAction if CHGFROM is not enabled
  def chgfrom(self,sender,params=None):
    if not self._actions & CHGFROM: raise DisabledAction("CHGFROM")
    return self._ctx.chgfrom(sender,params)

  ## Quarantine the message.
-  # Calls <a href="https://www.milter.org/developers/api/smfi_quarantine">
-  # smfi_quarantine</a>.  
  # When quarantined, a message goes into the mailq as if to be delivered,
  # but delivery is deferred until the message is unquarantined.
  # The <code>Milter.QUARANTINE</code> action flag must be set.
  #
  # May be called from eom callback only.
  # @param reason a string describing the reason for quarantine
-  # @throws DisabledAction if QUARANTINE is not enabled
  def quarantine(self,reason):
    if not self._actions & QUARANTINE: raise DisabledAction("QUARANTINE")
    return self._ctx.quarantine(reason)

  ## Tell the MTA to wait a bit longer.
-  # Calls <a href="https://www.milter.org/developers/api/smfi_progress">
-  # smfi_progress</a>.  
  # Resets timeouts in the MTA that detect a "hung" milter.
  def progress(self):
    return self._ctx.progress()
@@ -633,14 +465,12 @@ class Milter(Base):
 factory = Milter

 ## @private
-# @brief Connect context to connection instance and return enabled callbacks.
 def negotiate_callback(ctx,opts):
  m = factory()
  m._setctx(ctx)
  return m.negotiate(opts)

 ## @private
-# @brief Connect context if needed and invoke connect method.
 def connect_callback(ctx,hostname,family,hostaddr,nr_mask=P_NR_CONN):
  m = ctx.getpriv()
  if not m:     
@@ -651,7 +481,6 @@ def connect_callback(ctx,hostname,family,hostaddr,nr_mask=P_NR_CONN):
  return m.connect(hostname,family,hostaddr)

 ## @private
-# @brief Disconnect milterContext and call close method.
 def close_callback(ctx):
  m = ctx.getpriv()
  if not m: return CONTINUE
@@ -698,11 +527,11 @@ def envcallback(c,args):
      pargs.append(s)
  return c(*pargs,**kw)

-## Run the %milter.
-# @param name the name of the %milter known to the MTA
-# @param socketname the socket to be passed to milter.setconn()
+## Run the milter.
+# @param name the name of the milter known by the MTA
+# @param socketname the socket to be passed to <code>milter.setconn</code>
 # @param timeout the time in secs the MTA should wait for a response before 
-#	considering this %milter dead
+#	considering this milter dead
 def runmilter(name,socketname,timeout = 0):
  # This bit is here on the assumption that you will be starting this filter
  # before sendmail.  If sendmail is not running and the socket already exists,
@@ -769,5 +598,4 @@ for priv in ('os','milter','thread','factory','_seq','_seq_lock','__version__'):
 __all__ = __all__.keys()

 ## @example milter-template.py
-## @example milter-nomix.py
 #
@@ -70,23 +70,15 @@ class Session(object):
    pre: qtype in ['A', 'AAAA', 'MX', 'PTR', 'TXT', 'SPF']
    post: isinstance(__return__, types.ListType)
    """
-    if name.endswith('.'): name = name[:-1]
-    if not reduce(lambda x,y:x and 0 < len(y) < 64, name.split('.'),True):
-        return []   # invalid DNS name (too long or empty)
    result = self.cache.get( (name, qtype) )
    cname = None
-    if result: return result
-    cnamek = (name,'CNAME')
-    cname = self.cache.get( cnamek )

-    if cname:
-        cname = cname[0]
-    else:
+    if not result:
        safe2cache = Session.SAFE2CACHE
        for k, v in DNSLookup(name, qtype):
-            if k == cnamek:
+            if k == (name, 'CNAME'):
                cname = v
-            if k[1] == 'CNAME' or (qtype,k[1]) in safe2cache:
+            if (qtype,k[1]) in safe2cache:
                self.cache.setdefault(k, []).append(v)
        result = self.cache.get( (name, qtype), [])
    if not result and cname:
@@ -97,22 +89,10 @@ class Session(object):
            raise DNSError('Length of CNAME chain exceeds %d' % MAX_CNAME)
        cnames[name] = cname
        if cname in cnames:
-            raise DNSError('CNAME loop')
+            raise DNSError, 'CNAME loop'
        result = self.dns(cname, qtype, cnames=cnames)
-        if result:
-            self.cache[(name,qtype)] = result
    return result

-  def dns_txt(self, domainname, enc='ascii'):
-    "Get a list of TXT records for a domain name."
-    if domainname:
-        try:
-            return [''.join(s.decode(enc) for s in a)
-                for a in self.dns(domainname, 'TXT')]
-        except UnicodeEncodeError:
-            raise DNSError('Non-ascii character in SPF TXT record.')
-    return []
-
 DNS.DiscoverNameServers()

 if __name__ == '__main__':
@@ -5,9 +5,6 @@
 # Send DSNs, do call back verification,
 # and generate DSN messages from a template
 # $Log$
-# Revision 1.21  2011/03/03 05:11:58  customdesigned
-# Release 0.9.4
-#
 # Revision 1.20  2010/10/11 00:29:47  customdesigned
 # Handle multiple recipients.  For CBV or auto whitelist of multiple emails.
 #
@@ -152,7 +149,7 @@ def send_dsn(mailfrom,receiver,msg=None,timeout=600,session=None,ourfrom=''):
      pass		# MX didn't accept connections, try next one
    except socket.timeout:
      pass		# MX too slow, try next one
-    if hasattr(smtp,'sock'): smtp.close()
+    smtp.close()
    if time.time() > toolate:
      return (450,'No MX response within %f minutes'%(timeout/60.0))
  return (450,'No MX servers available')	# temp error
@@ -48,10 +48,9 @@ def is_dynip(host,addr):
  True
  """
  if host.startswith('[') and host.endswith(']'):
-    return True                                 # no ptr
+    return True
  if addr:
    if host.find(addr) >= 0: return True
-    if addr.find(':') >= 0: return False        # IP6
    a = addr.split('.')
    ia = map(int,a)
    h = host
@@ -50,7 +50,7 @@ class Greylist(object):
          # expired
          log.debug('Expired greylist: %s',key)
          r = Record()
-        elif now < r.firstseen + self.greylist_time + 5:
+        elif now < r.firstseen + self.greylist_time:
          # still greylisted
          log.debug('Early greylist: %s',key)
          #r = Record()
@@ -28,28 +28,23 @@ ip6re = re.compile(                 '(?:%(hex4)s:){6}%(ls32)s$'
    }, re.IGNORECASE)

 # from spf.py
-def addr2bin(s):
+def addr2bin(str):
  """Convert a string IPv4 address into an unsigned integer."""
-  if s.find(':') >= 0:
-    try:
-      return bin2long6(inet_pton(s))
-    except:
-      raise socket.error("Invalid IP6 address: "+s)
  try:
-    return struct.unpack("!L", socket.inet_aton(s))[0]
+    return struct.unpack("!L", socket.inet_aton(str))[0]
  except socket.error:
-    raise socket.error("Invalid IP4 address: "+s)
+    raise socket.error("Invalid IP4 address: "+str)

-def bin2long6(s):
+def bin2long6(str):
    """Convert binary IP6 address into an unsigned Python long integer."""
-    h, l = struct.unpack("!QQ", s)
+    h, l = struct.unpack("!QQ", str)
    return h << 64 | l

 if hasattr(socket,'has_ipv6') and socket.has_ipv6:
    def inet_ntop(s):
        return socket.inet_ntop(socket.AF_INET6,s)
    def inet_pton(s):
-        return socket.inet_pton(socket.AF_INET6,s.strip())
+        return socket.inet_pton(socket.AF_INET6,s)
 else:
    from pyip6 import inet_ntop, inet_pton

@@ -185,7 +180,7 @@ def parse_header(val):
    for s,enc in h:
      if enc:
        try:
-	  u.append(unicode(s,enc,'replace'))
+	  u.append(unicode(s,enc))
 	except LookupError:
 	  u.append(unicode(s))
      else:
@@ -197,6 +192,5 @@ def parse_header(val):
      except UnicodeError: continue
  except UnicodeDecodeError: pass
  except LookupError: pass
-  except ValueError: pass
  except email.Errors.HeaderParseError: pass
  return val
@@ -69,7 +69,8 @@ Not-so-quick Installation
 First install Sendmail.  Make sure you read libmilter/README in the Sendmail
 source directory, and make sure you enable libmilter before you build.  The
 8.11 series had libmilter marked as FFR (For Future Release); 8.12
-officially supports libmilter, but it's still not built by default.
+officially
+supports libmilter, but it's still not built by default.

 Install Python, and enable threading in Modules/Setup.

@@ -1,5 +1,6 @@
 ## @mainpage Writing Milters in Python
 #
+# 
 # At the lowest level, the <code>milter</code> module provides a thin wrapper
 # around the <a href="https://www.milter.org/developers/api/index"> sendmail
 # libmilter API</a>.  This API lets you register callbacks for a number of
@@ -33,21 +34,3 @@
 # The <code>mime</code> module provides a wrapper for the Python email package
 # that fixes some bugs, and simplifies modifying selected parts of a MIME
 # message.
-#
-# @section threading
-#
-# The libmilter library which pymilter wraps 
-# <a href="https://www.milter.org/developers/overview#SignalHandling">handles
-# all signals</a> itself, and expects to be called from a single main thread.
-# It handles SIGTERM, SIGHUP, and SIGINT, mapping the first two to 
-# <a href="https://www.milter.org/developers/api/smfi_stop">smfi_stop</a>
-# and the last to an internal ABORT.
-#
-# If you use python threads or threading modules, then signal handling gets
-# confused.  Threads may still be useful, but you may need to provide an
-# alternate means of causing graceful shutdown.
-#
-# You may find the
-# <a href="http://docs.python.org/release/2.6.6/library/multiprocessing.html">
-# multiprocessing</a> module useful.  It can be a drop-in
-# replacement for threading as illustrated in @ref milter-template.py.
@@ -20,52 +20,23 @@
 # and converts function callbacks to instance method invocations.
 #
 class milterContext(object):
-  ## Calls <a href="https://www.milter.org/developers/api/smfi_getsymval">smfi_getsymval</a>.
  def getsymval(self,sym): pass
-  ## Calls <a href="https://www.milter.org/developers/api/smfi_setreply">
-  # smfi_setreply</a> or
-  # <a href="https://www.milter.org/developers/api/smfi_setmlreply">
-  # smfi_setmlreply</a>.
-  # @param rcode SMTP response code
-  # @param xcode extended SMTP response code
-  # @param msg one or more message lines.  If the MTA does not support 
-  #     multiline messages, only the first is used.
  def setreply(self,rcode,xcode,*msg): pass
-  ## Calls <a href="https://www.milter.org/developers/api/smfi_addheader">smfi_addheader</a>.
  def addheader(self,name,value,idx=-1): pass
-  ## Calls <a href="https://www.milter.org/developers/api/smfi_chgheader">smfi_chgheader</a>.
  def chgheader(self,name,idx,value): pass
-  ## Calls <a href="https://www.milter.org/developers/api/smfi_addrcpt">smfi_addrcpt</a>.
  def addrcpt(self,rcpt,params=None): pass
-  ## Calls <a href="https://www.milter.org/developers/api/smfi_delrcpt">smfi_delrcpt</a>.
  def delrcpt(self,rcpt): pass
-  ## Calls <a href="https://www.milter.org/developers/api/smfi_replacebody">smfi_replacebody</a>.
  def replacebody(self,data): pass
-  ## Attach a Python object to this connection context.
-  # @return the old value or None
  def setpriv(self,priv): pass
-  ## Return the Python object attached to this connection context.
  def getpriv(self): pass
-  ## Calls <a href="https://www.milter.org/developers/api/smfi_quarantine">smfi_quarantine</a>.
  def quarantine(self,reason): pass
-  ## Calls <a href="https://www.milter.org/developers/api/smfi_progress">smfi_progress</a>.
  def progress(self): pass
-  ## Calls <a href="https://www.milter.org/developers/api/smfi_chgfrom">smfi_chgfrom</a>.
  def chgfrom(self,sender,param=None): pass
-  ## Tell the MTA which macro values we are interested in for a given stage.
-  # Of interest only when you need to squeeze a few more bytes of bandwidth.
  def setsmlist(self,stage,macrolist): pass

 class error(Exception): pass

-## Enable optional milter actions.
-# Certain milter actions need to be enabled before calling main()
-# or they throw an exception.  Pymilter enables them all by
-# default (since 0.9.2), but you may wish to disable unneeded
-# actions as an optimization.
-# @param flags Bit or mask of optional actions to enable
 def set_flags(flags): pass
-
 def set_connect_callback(cb): pass
 def set_helo_callback(cb): pass
 def set_envfrom_callback(cb): pass
@@ -75,57 +46,19 @@ def set_eoh_callback(cb): pass
 def set_body_callback(cb): pass
 def set_abort_callback(cb): pass
 def set_close_callback(cb): pass
-
-## Sets the return code for untrapped Python exceptions during a callback.
-# Must be one of TEMPFAIL,REJECT,CONTINUE
 def set_exception_policy(code): pass
-
-## Register python milter with libmilter.
-# The name we pass is used to identify the milter in the MTA configuration.
-# Callback functions must be set using the set_*_callback() functions before
-# registering the milter.
-# Three additional callbacks are specified as keyword parameters.  These
-# were added by recent versions of libmilter.  The keyword parameters is
-# a nicer way to do it, I think, since it makes clear that you have to do
-# it before registering.  I may move all the callbacks 
-# in the future (perhaps keeping the set functions for compatibility).
-# @param name the milter name by which the MTA finds us
-# @param negotiate the
-#       <a href="https://www.milter.org/developers/api/xxfi_negotiate">
-#       xxfi_negotiate</a> callback, called to negotiate supported
-#       actions, callbacks, and protocol steps.
-# @param unknown the
-#       <a href="https://www.milter.org/developers/api/xxfi_unknown">
-#       xxfi_unknown</a> callback, called when for SMTP commands
-#       not recognized by the MTA. (Extend SMTP in your milter!)
-# @param data the
-#       <a href="https://www.milter.org/developers/api/xxfi_data">
-#       xxfi_data</a> callback, called when the DATA
-#       SMTP command is received.
 def register(name,negotiate=None,unknown=None,data=None): pass
 def opensocket(rmsock): pass
-
-## Transfer control to libmilter.
-# Calls <a href="https://www.milter.org/developers/api/smfi_main">
-#   smfi_main</a>.
 def main(): pass

 ## Set the libmilter debugging level.
-# <a href="https://www.milter.org/developers/api/smfi_setdbg">smfi_setdbg</a>
-# sets the milter library's internal debugging level to a new level
+# smfi_setdbg sets the milter library's internal debugging level to a new level
 # so that code details may be traced. A level of zero turns off debugging. The
 # greater (more positive) the level the more detailed the debugging. Six is the
-# current, highest, useful value.  Must be called before calling main().
+# current, highest, useful value.
 def setdbg(lev): pass

-## Set timeout for MTA communication.
-# Calls <a href="https://www.milter.org/developers/api/smfi_settimeout">
-# smfi_settimeout</a>.  Must be called before calling main().
 def settimeout(secs): pass
-
-## Set socket backlog.
-# Calls <a href="https://www.milter.org/developers/api/smfi_setbacklog">
-# smfi_setbacklog</a>.  Must be called before calling main().
 def setbacklog(n): pass

 ## Set the socket used to communicate with the MTA.
@@ -2,8 +2,8 @@ web:
 	doxygen
 	rsync -ravK doc/html/ spidey2.bmsi.com:/Public/pymilter

-VERSION=0.9.6
-CVSTAG=pymilter-0_9_6
+VERSION=0.9.4
+CVSTAG=pymilter-0_9_4
 PKG=pymilter-$(VERSION)
 SRCTAR=$(PKG).tar.gz

@@ -1,79 +0,0 @@
-## A very simple milter to prevent mixing of internal and external mail.  
-# Internal is defined as using one of a list of internal top level domains.
-#  This code is open-source on the same terms as Python.
-
-import Milter
-import time
-import sys
-from Milter.utils import parse_addr
-
-internal_tlds = ["corp", "personal"]
-
-## Determine if a hostname is internal or not. 
-# True if internal, False otherwise
-def is_internal(hostname):
-    components = hostname.split(".")
-    return components.pop() in internal_tlds:
-
-# Determine if internal and external hosts are mixed based on a list
-# of hostnames
-def are_mixed(hostnames):
-    hostnames_mapped = map(is_internal, hostnames)
-
-    # Num internals
-    num_internal_hosts = hostnames_mapped.count(True)
-
-    # Num externals
-    num_external_hosts = hostnames_mapped.count(False)
-
-    return num_external_hosts >= 1 and num_internal_hosts >= 1
-
-class NoMixMilter(Milter.Base):
-
-  def __init__(self):  # A new instance with each new connection.
-    self.id = Milter.uniqueID()  # Integer incremented with each call.
-
-
-  ##  def envfrom(self,f,*str):
-  @Milter.noreply
-  def envfrom(self, mailfrom, *str):
-    self.mailfrom = mailfrom
-    self.domains = []
-    t = parse_addr(mailfrom)
-    if len(t) > 1:
-      self.domains.append(t[1])
-    else:
-      self.domains.append('local')
-    self.internal = False
-    return Milter.CONTINUE
-
-  ##  def envrcpt(self, to, *str):
-  def envrcpt(self, to, *str):
-    self.R.append(to)
-    t = parse_addr(to)
-    if len(t) > 1:
-      self.domains.append(t[1])
-    else:
-      self.domains.append('local')
-
-    if are_mixed(self.domains):
-      # FIXME: log recipients collected in self.mailfrom and self.R
-      self.setreply('550','5.7.1','Mixing internal and external TLDs')
-      return Milter.REJECT
-        
-    return Milter.CONTINUE
-    
-def main():
-  socketname = "/var/run/nomixsock"
-  timeout = 600
-  # Register to have the Milter factory create instances of your class:
-  Milter.factory = NoMixMilter
-  print "%s milter startup" % time.strftime('%Y%b%d %H:%M:%S')
-  sys.stdout.flush()
-  Milter.runmilter("nomixfilter",socketname,timeout)
-  logq.put(None)
-  bt.join()
-  print "%s nomix milter shutdown" % time.strftime('%Y%b%d %H:%M:%S')
-
-if __name__ == "__main__":
-  main()
@@ -11,16 +11,9 @@ import Milter
 import StringIO
 import time
 import email
-import sys
 from socket import AF_INET, AF_INET6
-from Milter.utils import parse_addr
-if True:
-  from multiprocessing import Process as Thread, Queue
-else:
-  from threading import Thread
-  from Queue import Queue
+from Milter import parse_addr

-logq = Queue(maxsize=4)

 class myMilter(Milter.Base):

@@ -30,7 +23,7 @@ class myMilter(Milter.Base):
  # each connection runs in its own thread and has its own myMilter
  # instance.  Python code must be thread safe.  This is trivial if only stuff
  # in myMilter instances is referenced.
-  @Milter.noreply
+  @noreply
  def connect(self, IPname, family, hostaddr):
    # (self, 'ip068.subnet71.example.com', AF_INET, ('215.183.71.68', 4720) )
    # (self, 'ip6.mxout.example.com', AF_INET6,
@@ -78,25 +71,25 @@ class myMilter(Milter.Base):


  ##  def envrcpt(self, to, *str):
-  @Milter.noreply
-  def envrcpt(self, to, *str):
+  @noreply
+  def envrcpt(self, recipient, *str):
    rcptinfo = to,Milter.dictfromlist(str)
    self.R.append(rcptinfo)
    
    return Milter.CONTINUE


-  @Milter.noreply
+  @noreply
  def header(self, name, hval):
    self.fp.write("%s: %s\n" % (name,hval))	# add header to buffer
    return Milter.CONTINUE

-  @Milter.noreply
+  @noreply
  def eoh(self):
    self.fp.write("\n")				# terminate headers
    return Milter.CONTINUE

-  @Milter.noreply
+  @noreply
  def body(self, chunk):
    self.fp.write(chunk)
    return Milter.CONTINUE
@@ -110,6 +103,7 @@ class myMilter(Milter.Base):
    self.addrcpt('<%s>' % 'spy@example.com')
    return Milter.ACCEPT

+
  def close(self):
    # always called, even when abort is called.  Clean up
    # any external resources here.
@@ -122,25 +116,15 @@ class myMilter(Milter.Base):
  ## === Support Functions ===

  def log(self,*msg):
-    logq.put((msg,self.id,time.time()))
-
-def background():
-  while True:
-    t = logq.get()
-    if not t: break
-    msg,id,ts = t
-    print "%s [%d]" % (time.strftime('%Y%b%d %H:%M:%S',time.localtime(ts)),id),
+    print "%s [%d]" % (time.strftime('%Y%b%d %H:%M:%S'),self.id),
    # 2005Oct13 02:34:11 [1] msg1 msg2 msg3 ...
    for i in msg: print i,
    print

+
 ## ===
    
 def main():
-  bt = Thread(target=background)
-  bt.start()
-  socketname = "/home/stuart/pythonsock"
-  timeout = 600
  # Register to have the Milter factory create instances of your class:
  Milter.factory = myMilter
  flags = Milter.CHGBODY + Milter.CHGHDRS + Milter.ADDHDRS
@@ -150,8 +134,6 @@ def main():
  print "%s milter startup" % time.strftime('%Y%b%d %H:%M:%S')
  sys.stdout.flush()
  Milter.runmilter("pythonfilter",socketname,timeout)
-  logq.put(None)
-  bt.join()
  print "%s bms milter shutdown" % time.strftime('%Y%b%d %H:%M:%S')

 if __name__ == "__main__":
@@ -35,18 +35,6 @@ $ python setup.py help
     libraries=["milter","smutil","resolv"]

 * $Log$
- * Revision 1.30  2012/04/12 23:08:06  customdesigned
- * Support RFC2553 on BSD
- *
- * Revision 1.29  2011/06/09 15:45:27  customdesigned
- * Print callback name for non-int return error.
- *
- * Revision 1.28  2011/06/08 23:13:48  customdesigned
- * Generate special exception when callback return not int.
- *
- * Revision 1.27  2009/07/28 21:45:54  customdesigned
- * Add getversion() to return runtime version.
- *
 * Revision 1.26  2009/07/28 21:08:20  customdesigned
 * Increment del count.
 *
@@ -263,10 +251,10 @@ $ python setup.py help
 #define HAVE_IPV6_SUPPORT /* use this for #ifdef's later on */
 /* Now see if it supports the RFC-2553 socket's API spec.  Early
 * IPv6 "prototype" implementations existed before the RFC was
- * published.  Unfortunately I know of no good way to do this
+ * published.  Unfortunately I know of now good way to do this
 * other than with OS-specific tests.
 */
-#if defined(__FreeBSD_kernel__) || defined(__linux__)
+#ifdef linux
 #define HAVE_IPV6_RFC2553
 #include <arpa/inet.h>
 #endif
@@ -280,52 +268,19 @@ $ python setup.py help
 #endif
 #endif

-enum callbacks {
-	CONNECT,HELO,ENVFROM,ENVRCPT,HEADER,EOH,BODY,EOM,ABORT,CLOSE,
-#ifdef SMFIS_ALL_OPTS
-	UNKNOWN,DATA,NEGOTIATE,
-#endif
-	NUMCALLBACKS
-};

-#define connect_callback callback[CONNECT].cb
-#define helo_callback callback[HELO].cb
-#define envfrom_callback callback[ENVFROM].cb
-#define envrcpt_callback callback[ENVRCPT].cb
-#define header_callback callback[HEADER].cb
-#define eoh_callback callback[EOH].cb
-#define body_callback callback[BODY].cb
-#define eom_callback callback[EOM].cb
-#define abort_callback callback[ABORT].cb
-#define close_callback callback[CLOSE].cb
-#define unknown_callback callback[UNKNOWN].cb
-#define data_callback callback[DATA].cb
-#define negotiate_callback callback[NEGOTIATE].cb
-
-/* Yes, these are static.  If you need multiple different callbacks, 
-   it's cleaner to use multiple filters, or convert to OO method calls. */
-
-static struct MilterCallback {
-  PyObject *cb;
-  const char *name;
-} callback[NUMCALLBACKS+1] = {
-      { NULL ,"connect" },
-      { NULL ,"helo" },
-      { NULL ,"envfrom" },
-      { NULL ,"envrcpt" },
-      { NULL ,"header" },
-      { NULL ,"eoh" },
-      { NULL ,"body" },
-      { NULL ,"eom" },
-      { NULL ,"abort" },
-      { NULL ,"close" },
-#ifdef SMFIS_ALL_OPTS
-      { NULL ,"unknown" },
-      { NULL ,"data" },
-      { NULL ,"negotiate" },
-#endif
-      { NULL , NULL }
-    };
+/* Yes, these are static.  If you need multiple different callbacks, */
+/* it's cleaner to use multiple filters, or convert to OO method calls. */
+static PyObject *connect_callback = NULL;
+static PyObject *helo_callback    = NULL;
+static PyObject *envfrom_callback = NULL;
+static PyObject *envrcpt_callback = NULL;
+static PyObject *header_callback  = NULL;
+static PyObject *eoh_callback     = NULL;
+static PyObject *body_callback    = NULL;
+static PyObject *eom_callback     = NULL;
+static PyObject *abort_callback   = NULL;
+static PyObject *close_callback   = NULL;

 staticforward struct smfiDesc description; /* forward declaration */

@@ -676,23 +631,9 @@ _generic_wrapper(milter_ContextObject *self, PyObject *cb, PyObject *arglist) {
  result = PyEval_CallObject(cb, arglist);
  Py_DECREF(arglist);
  if (result == NULL) return _report_exception(self);
-  if (!PyInt_Check(result)) {
-    const struct MilterCallback *p;
-    const char *cbname = "milter";
-    char buf[40];
-    Py_DECREF(result);
-    for (p = callback; p->name; ++p) {
-      if (cb == p->cb) {
-        cbname = p->name;
-	break;
-      }
-    }
-    sprintf(buf,"The %s callback must return int",cbname);
-    PyErr_SetString(MilterError,buf);
-    return _report_exception(self);
-  }
-  retval = PyInt_AS_LONG(result);
+  retval = PyInt_AsLong(result);
  Py_DECREF(result);
+  if (PyErr_Occurred()) return _report_exception(self);
  _release_thread(self->t);
  return retval;
 }
@@ -881,6 +822,10 @@ milter_wrap_abort(SMFICTX *ctx) {
 }

 #ifdef SMFIS_ALL_OPTS
+static PyObject *unknown_callback = NULL;
+static PyObject *data_callback    = NULL;
+static PyObject *negotiate_callback = NULL;
+
 static int
 milter_wrap_unknown(SMFICTX *ctx, const char *cmd) {
   PyObject *arglist;
@@ -1,7 +1,4 @@
 # $Log$
-# Revision 1.7  2009/06/13 21:15:12  customdesigned
-# Doxygen updates.
-#
 # Revision 1.6  2009/06/09 03:13:13  customdesigned
 # More doxygen docs.
 #
@@ -168,14 +165,15 @@ class MimeMessage(Message):
  """
  def __init__(self,fp=None,seekable=1):
    Message.__init__(self)
+    self.headerchange = None
    self.submsg = None
    self.modified = False
+
  ## @var headerchange
  # Provide a headerchange event for integration with Milter.
  #   The headerchange attribute can be assigned a function to be called when
  #   changing headers.  The signature is:
  #   headerchange(msg,name,value) -> None
-    self.headerchange = None

  def get_param(self, param, failobj=None, header='content-type', unquote=True):
    val = Message.get_param(self,param,failobj,header,unquote)
@@ -1,21 +1,20 @@
 %define __python python2.6
-%define pythonbase python26

 %define libdir %{_libdir}/pymilter
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%define pythonbase python26

 Summary: Python interface to sendmail milter API
 Name: %{pythonbase}-pymilter
-Version: 0.9.7
+Version: 0.9.4
 Release: 1%{dist}
 Source: http://downloads.sourceforge.net/pymilter/pymilter-%{version}.tar.gz
 License: GPLv2+
 Group: Development/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Url: http://www.bmsi.com/python/milter.html
-# python-2.6.4 gets RuntimeError: not holding the import lock
-Requires: %{pythonbase} >= 2.6.5, sendmail >= 8.13
-# Need python2.6 specific pydns, not the version for system python
+Requires: %{pythonbase}, sendmail >= 8.13
+# Need python2.4 specific pydns, not the version for system python
 Requires: %{pythonbase}-pydns
 # Needed for callbacks, not a core function but highly useful for milters
 BuildRequires: ed, %{pythonbase}-devel, sendmail-devel >= 8.13
@@ -75,21 +74,6 @@ chmod a+x $RPM_BUILD_ROOT%{libdir}/start.sh
 rm -rf $RPM_BUILD_ROOT

 %changelog
-* Sat Feb 25 2012 Stuart Gathman <stuart@bmsi.com> 0.9.7-1
- Raise RuntimeError when result != CONTINUE for @noreply and @nocallback
- Remove redundant table in miltermodule
- Fix CNAME chain duplicating TXT records in Milter.dns (from pyspf).
-
-* Sat Feb 25 2012 Stuart Gathman <stuart@bmsi.com> 0.9.6-1
- Raise ValueError on unescaped '%' passed to setreply
- Grace time at end of Greylist window
-
-* Fri Aug 19 2011 Stuart Gathman <stuart@bmsi.com> 0.9.5-1
- Print milter.error for invalid callback return type.
-  (Since stacktrace is empty, the TypeError exception is confusing.)
- Fix milter-template.py
- Tweak Milter.utils.addr2bin and Milter.dynip to handle IP6
-
 * Wed Mar 02 2010 Stuart Gathman <stuart@bmsi.com> 0.9.4-1
 - Handle IP6 in Milter.utils.iniplist()
 - python-2.6
@@ -35,9 +35,7 @@ class sampleMilter(Milter.Milter):
  # multiple messages can be received on a single connection
  # envfrom (MAIL FROM in the SMTP protocol) seems to mark the start
  # of each message.
-  @Milter.noreply
  def envfrom(self,f,*str):
-    "start of MAIL transaction"
    self.log("mail from",f,str)
    self.fp = StringIO.StringIO()
    self.tempname = None
@@ -2,9 +2,6 @@ import os
 import sys
 from distutils.core import setup, Extension

-if sys.version < '2.6.5':
-  sys.exit('ERROR: Sorry, python 2.6.5 is required for this module.')
-
 # FIXME: on some versions of sendmail, smutil is renamed to sm.
 # On slackware and debian, leave it out entirely.  It depends
 # on how libmilter was built by the sendmail package.
@@ -12,8 +9,15 @@ if sys.version < '2.6.5':
 libs = ["milter"]
 libdirs = ["/usr/lib/libmilter"]    # needed for Debian

+# patch distutils if it can't cope with the "classifiers" or
+# "download_url" keywords
+if sys.version < '2.2.3':
+  from distutils.dist import DistributionMetadata
+  DistributionMetadata.classifiers = None
+  DistributionMetadata.download_url = None
+
 # NOTE: importing Milter to obtain version fails when milter.so not built
-setup(name = "pymilter", version = '0.9.7',
+setup(name = "pymilter", version = '0.9.4',
 	description="Python interface to sendmail milter API",
 	long_description="""\
 This is a python extension module to enable python scripts to
@@ -1,16 +1,13 @@
 #!/bin/sh
 appname="$1"
 script="${2:-${appname}}"
-datadir="/var/lib/milter"
-logdir="/var/log/milter"
+datadir="/var/log/milter"
 piddir="/var/run/milter"
 libdir="/usr/lib/pymilter"
 python="python2.4"
-exec >>${logdir}/${appname}.log 2>&1
+exec >>${datadir}/${appname}.log 2>&1
 if test -s ${datadir}/${script}.py; then
-  cd ${datadir} # use version in data dir if it exists for debugging
-elif test -s ${logdir}/${script}.py; then
-  cd ${logdir} # use version in log dir if it exists for debugging
+  cd ${datadir} # use version in log dir if it exists for debugging
 else
  cd ${libdir}
 fi
@@ -1,7 +1,4 @@
 # $Log$
-# Revision 1.4  2005/07/20 14:49:44  customdesigned
-# Handle corrupt and empty ZIP files.
-#
 # Revision 1.3  2005/06/17 01:49:39  customdesigned
 # Handle zip within zip.
 #
@@ -29,7 +26,6 @@ import socket
 import StringIO
 import email
 import sys
-import Milter
 from email import Errors

 samp1_txt1 = """Dear Agent 1
@@ -150,31 +146,6 @@ class MimeTestCase(unittest.TestCase):
    # test zip within zip
    self.testDefang('ziploop',1,'stuart@bmsi.com.zip')

-  def _chk_name(self,name):
-    self.filename = name
-
-  def _chk_attach(self,msg):
-    "Filter attachments by content."
-    # check for bad extensions
-    mime.check_name(msg,ckname=self._chk_name,scan_zip=True)
-    # remove scripts from HTML
-    mime.check_html(msg)
-    # don't let a tricky virus slip one past us
-    msg = msg.get_submsg()
-    if isinstance(msg,email.Message.Message):
-      return mime.check_attachments(msg,self._chk_attach)
-    return Milter.CONTINUE
-
-  def testCheckAttach(self,fname="test1"):
-    # test1 contains a very long filename
-    msg = mime.message_from_file(open('test/'+fname,'r'))
-    mime.defang(msg,scan_zip=True)
-    self.failIf(msg.ismodified())
-    msg = mime.message_from_file(open('test/tmpytgcE5.fail','r'))
-    rc = mime.check_attachments(msg,self._chk_attach)
-    self.assertEquals(self.filename,"7501'S FOR TWO GOLDEN SOURCES SHIPMENTS FOR TAX & DUTY PURPOSES ONLY.PDF")
-    self.assertEquals(rc,Milter.CONTINUE)
-
  def testHTML(self,fname=""):
    result = StringIO.StringIO()
    filter = mime.HTMLScriptFilter(result)