Merge branch '4-integration-retrieve-error-policy' into next

[~andy/fetchmail] / fetchmail.h

diff --git a/fetchmail.h b/fetchmail.h
index 8cda2b3af2b238741f19979f3fe17393e8e46992..a1048dc8bff2a35641c5e8fe1c92569475d2fc1a 100644 (file)
--- a/fetchmail.h
+++ b/fetchmail.h
@@ -27,6 +27,10 @@ struct addrinfo;
 
 #include "uid_db.h"
 
+#ifdef HAVE_LIBPWMD
+#include <libpwmd.h>
+#endif
+
 /* constants designating the various supported protocols */
 #define                P_AUTO          1
 #define                P_POP3          3
@@ -157,6 +161,9 @@ struct runctl
     char       *pidfile;       /** where to record the PID of daemon mode processes */
     const char *postmaster;
     char       *properties;
+#ifdef HAVE_LIBPWMD
+    int                pinentry_timeout;
+#endif
     int                poll_interval;  /** poll interval in seconds (daemon mode, 0 == off) */
     flag       bouncemail;
     flag       spambounce;
@@ -246,7 +253,7 @@ struct hostdata             /* shared among all user connections to given server */
     struct idlist *akalist;            /* server name first, then akas */
     struct idlist *localdomains;       /* list of pass-through domains */
     int protocol;                      /* protocol type */
-    const char *service;               /* service name */
+    char *service;                     /* service name */
     int interval;                      /* # cycles to skip between polls */
     int authenticate;                  /* authentication mode to try */
     int timeout;                       /* inactivity timout in seconds */
@@ -310,6 +317,11 @@ struct query
     char *password;            /* remote password to use */
     struct idlist *mailboxes;  /* list of mailboxes to check */
 
+#ifdef HAVE_LIBPWMD
+    char *pwmd_socket;         /* socket to connect to */
+    char *pwmd_file;           /* file to open on the server */
+#endif
+
     /* per-forwarding-target data */
     struct idlist *smtphunt;   /* list of SMTP hosts to try forwarding to */
     struct idlist *domainlist; /* domainlist to fetch from */