postfix-xforward 0.1.2 → 0.1.3

data/CHANGELOG.rdoc

@@ -1,7 +1,7 @@
-= 0.1.1, release 2010-08-26
+= 0.1.3, release 2010-08-26
 
-* fixed #xtext to allow non-string arguments (returns nil)
-* fixed it so XFORWARD attribute values explicitly set, but set to nil or the empty string will instead send '[UNAVAILABLE]' for the value
+* fixed #xtext to allow non-string arguments (returns empty string)
+* fixed it so that any provided XFORWARD attribute that are set to anything other than non-blank strings won't be sent
 
 = 0.1.0, release 2010-08-19
 

data/lib/postfix-xforward/smtp.rb

@@ -247,16 +247,15 @@ module PostfixXForward
       cmd = XCMD.dup
       cap = capable_xforward_attrs
       @xforward_attrs.each do |attr, value|
-        if cap.include?(attr)
-          value = '[UNAVAILABLE]' if value.nil? or value.empty?
-          tmp = " #{attr}=#{Utils.xtext(value)}"
+        if cap.include?(attr) and value.is_a?(String) and value.strip != ''
+          tmp = " #{attr}=#{Utils.xtext(value.strip)}"
           if cmd.length + tmp.length > MAXLEN
             getok(cmd)
             cmd = XCMD.dup
           end
           cmd << tmp
         else
-          logging("ignoring XFORWARD attribute '#{attr}': unsupported by server")
+          logging("ignoring XFORWARD attribute '#{attr}': unsupported by server or no valid value specified")
         end
       end
       getok(cmd) if cmd != XCMD

data/lib/postfix-xforward/utils.rb

@@ -2,7 +2,7 @@ module PostfixXForward
   class Utils
     # Convert the txt string to "xtext" as defined in RFC 1891
     def Utils.xtext(txt)
-      return nil unless txt.respond_to?(:gsub)
+      return '' unless txt.respond_to?(:gsub)
       txt.gsub(/[+=\x00-\x20\x7f-\xff]/) do |c|
         "+#{c.unpack('H2').first.upcase}"
       end

data/lib/postfix-xforward/version.rb

@@ -2,7 +2,7 @@ module PostfixXForward
   module Version
     MAJOR  = 0
     MINOR  = 1
-    TINY   = 2
+    TINY   = 3
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: postfix-xforward
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Kendall Gifford