Ready to ship.

[~andy/fetchmail] / fetchmail.h

diff --git a/fetchmail.h b/fetchmail.h
index e4792fb1d62ea6148ab27c9c749dd74e3dc86057..aa1c1215f110bf39b86e8c5cf99e065806265751 100644 (file)
--- a/fetchmail.h
+++ b/fetchmail.h
@@ -96,6 +96,7 @@ struct runctl
     int                poll_interval;
     flag       use_syslog;
     flag       invisible;
+    char       *postmaster;
 };
 
 struct idlist
@@ -141,6 +142,11 @@ struct hostdata            /* shared among all user connections to given server */
     flag skip;                         /* suppress poll in implicit mode? */
     flag dns;                          /* do DNS lookup on multidrop? */
     flag uidl;                         /* use RFC1725 UIDLs? */
+#ifdef SDPS_ENABLE
+    flag sdps;                         /* use Demon Internet SDPS *ENV */
+#endif /* SDPS_ENABLE */
+    flag checkalias;                   /* resolve aliases by comparing IPs? */
+
 
 #ifdef linux
     char *interface;
@@ -171,7 +177,7 @@ struct query
     struct idlist *smtphunt;   /* list of SMTP hosts to try forwarding to */
     char *smtphost;            /* actual SMTP host to point to */
     char *smtpaddress;         /* address we want to force in the delivery messages */ 
-    int        antispam;               /* listener's antispam response */
+    struct idlist *antispam;   /* list of listener's antispam response */
     char *mda;                 /* local MDA to pass mail to */
     char *preconnect;          /* pre-connection command to execute */
     char *postconnect;         /* post-connection command to execute */
@@ -273,7 +279,6 @@ extern int linelimit;               /* limit # lines retrieved per site */
 extern flag versioninfo;       /* emit only version info */
 extern char *user;             /* name of invoking user */
 extern char *home;             /* home directory of invoking user */
-extern char *fetchmailhost;    /* the name of the host running fetchmail */
 extern int pass;               /* number of re-polling pass */
 extern flag configdump;                /* dump control blocks as Python dictionary */
 
@@ -370,7 +375,6 @@ int doETRN (struct query *);
 /* miscellanea */
 struct query *hostalloc(struct query *); 
 int parsecmdline (int, char **, struct runctl *, struct query *);
-void optmerge(struct query *, struct query *);
 char *MD5Digest (unsigned char *);
 int POP3_auth_rpa(unsigned char *, unsigned char *, int socket);
 int daemonize(const char *, void (*)(int));
@@ -379,6 +383,10 @@ void escapes(const char *, char *);
 char *visbuf(const char *);
 char *showproto(int);
 void dump_config(struct runctl *runp, struct query *querylist);
+int is_host_alias(const char *, struct query *);
+#ifdef SDPS_ENABLE
+char *sdps_envto;
+#endif /* SDPS_ENABLE */
 
 void yyerror(const char *);
 int yylex(void);
@@ -397,5 +405,6 @@ void itimerthread(void*);
 #endif
 
 #define STRING_DISABLED        (char *)-1
+#define STRING_DUMMY   ""
 
 /* fetchmail.h ends here */