--- a/src/spamass.h	Sun Aug 26 20:54:59 2007 -0700
+++ b/src/spamass.h	Mon Aug 27 20:49:19 2007 -0700
@@ -21,18 +21,17 @@
 
 #include <list>
 
+extern char *spamc;
+extern char *spamc_empty;
 using namespace std;
 
 class mlfiPriv;
 
 class SpamAssassin {
 public:
-	SpamAssassin();
+	SpamAssassin(mlfiPriv *priv_, int ip, char *helo_, char *from, char *qid);
 	~SpamAssassin();
 
-	void mlfi_connect(mlfiPriv *priv_, int ip);
-	void mlfi_helo(char *helohost);
-	void mlfi_envfrom(char *from, char *qid);
 	void mlfi_envrcpt(SMFICTX *ctx, char *envrcpt);
 	void mlfi_header(char* headerf, char* headerv);
 	void mlfi_eoh();
@@ -58,12 +57,12 @@
 
 	// connection back to main dnsbl priv structure for logging
 	mlfiPriv *priv;
+	int 	 ip4;		// ip4 address of smtp client
 
 	// strings owned by main dnsbl
-	char *queueid;		// the sendmail queue id for this message
+	char *helo; 		// client helo value
 	char *envfrom;		// envelope from value for this message
-	char *helo; 		// client helo value
-	int  ip4;			// ip4 address of smtp client
+	char *queueid;		// the sendmail queue id for this message
 
 	// Process handling variables
 	pid_t pid;