Easy bug fixes for this round.

[~andy/fetchmail] / fetchmail.h

diff --git a/fetchmail.h b/fetchmail.h
index fe3eb32021ece813617b3d6e5c73fc385b79448a..463446275773c0e51f05ffc7b73cddfe51eed598 100644 (file)
--- a/fetchmail.h
+++ b/fetchmail.h
@@ -255,6 +255,7 @@ struct query
 
     /* per-forwarding-target data */
     struct idlist *smtphunt;   /* list of SMTP hosts to try forwarding to */
+    struct idlist *domainlist; /* domainlist to fetch from */
     char *smtpaddress;         /* address to force in RCPT TO */ 
     char *smtpname;             /* full RCPT TO name, including domain */
     struct idlist *antispam;   /* list of listener's antispam response */
@@ -379,8 +380,7 @@ extern char *home;          /* home directory of invoking user */
 extern char *fmhome;           /* fetchmail home directory */
 extern int pass;               /* number of re-polling pass */
 extern flag configdump;                /* dump control blocks as Python dictionary */
-extern const char *fetchmailhost;
-                               /* either "localhost" or an FQDN */
+extern char *fetchmailhost;    /* either "localhost" or an FQDN */
 extern int suppress_tags;      /* suppress tags in tagged protocols? */
 extern char shroud[PASSWORDLEN];       /* string to shroud in debug output */
 #ifdef SDPS_ENABLE
@@ -431,6 +431,7 @@ extern struct msgblk msgblk;
 void lock_setup(void), lock_assert(void);
 void lock_or_die(void), lock_release(void);
 int lock_state(void);
+void lock_dispose(void);
 
 /* use these to track what was happening when the nonresponse timer fired */
 #define GENERAL_WAIT   0       /* unknown wait type */
@@ -460,6 +461,7 @@ extern int mytimeout;
 int interruptible_idle(int interval);
 
 /* sink.c: forwarding */
+int smtp_open(struct query *);
 int stuffline(struct query *, char *);
 int open_sink(struct query*, struct msgblk *, int*, int*);
 void release_sink(struct query *);
@@ -503,7 +505,7 @@ int prc_filecheck(const char *, const flag);
 
 /* base64.c */
 void to64frombits(unsigned char *, const unsigned char *, int);
-int from64tobits(char *, const char *);
+int from64tobits(char *, const char *, int len);
 
 /* unmime.c */
 /* Bit-mask returned by MimeBodyType */
@@ -537,8 +539,8 @@ char *xstrdup(const char *);
 #endif
 #endif
 #define        xalloca(ptr, t, n)      if (!(ptr = (t) alloca(n)))\
-       {report(stderr, _("alloca failed")); exit(PS_UNDEFINED);}
-#if FALSE
+       {report(stderr, GT_("alloca failed")); exit(PS_UNDEFINED);}
+#if 0
 /*
  * This is a hack to help xgettext which cannot find strings in
  * macro definitions like the one for xalloca above.
@@ -551,9 +553,10 @@ int doPOP2 (struct query *);
 int doPOP3 (struct query *);
 int doIMAP (struct query *);
 int doETRN (struct query *);
+int doODMR (struct query *);
 
 /* authentication functions */
-int do_cram_md5(int sock, char *command, struct query *ctl);
+int do_cram_md5(int sock, char *command, struct query *ctl, char *strip);
 int do_rfc1731(int sock, char *command, char *truename);
 int do_gssauth(int sock, char *command, char *hostname, char *username);
 int do_otp(int sock, char *command, struct query *ctl);