fix issues in the expresion manager

Author: thatch45

salt/master.py

@@ -229,7 +229,7 @@ def publish(self, clear_load):
         '''
         if not clear_load.pop('key') == self.key:
             return ''
-        jid = self._prep_jid(load)
+        jid = self._prep_jid(clear_load)
         payload = {'enc': 'aes'}
         load = {
                 'fun': clear_load['fun'],

salt/minion.py

@@ -135,7 +135,7 @@ def _handle_aes(self, load):
             return ret
         # Verify that the publication applies to this minion
         if data.has_key('tgt_type'):
-            if not getattr(self, '_' + data['tgt_type'] + '_match')(*(data['tgt'])):
+            if not getattr(self, '_' + data['tgt_type'] + '_match')(data['tgt']):
                 return ret
         else:
             if not self._glob_match(data['tgt']):