diff -ur imap-2007.orig/src/imapd/imapd.c imap-2007/src/imapd/imapd.c
--- imap-2007.orig/src/imapd/imapd.c	2007-11-02 23:10:47.000000000 +0100
+++ imap-2007/src/imapd/imapd.c	2008-02-16 20:24:50.000000000 +0100
@@ -39,6 +39,11 @@
 #include "newsrc.h"
 #include <sys/stat.h>
 
+#ifdef DRAC_AUTH
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <stdlib.h>
+#endif /* DRAC_AUTH */
 
 #define CRLF PSOUT ("\015\012")	/* primary output terpri */
 
@@ -205,6 +210,12 @@
 
 /* Global storage */
 
+#ifdef DRAC_AUTH
+#define DRACTIMEOUT 10*60     /* check every 10 minutes */
+time_t lastdrac = 0;          /* time of last drac check */
+extern char *getenv ();
+#endif /* DRAC_AUTH */
+
 char *version = "398";		/* edit number of this server */
 char *logout = "Logout";	/* syslogreason for logout */
 char *goodbye = NIL;		/* bye reason */
@@ -1511,7 +1522,46 @@
 	      lasterror ());
       return;
     }
-				/* change in number of messages? */
+
+#ifdef DRAC_AUTH
+    if (time (0) > lastdrac + DRACTIMEOUT)
+    {
+        FILE *dracconf;
+        char host[100];
+        char *drachost;
+        char *err;
+        char *p;
+
+        if ( (dracconf = fopen("/etc/mail/dracd.host", "r")) == NULL)
+        {
+          syslog (LOG_INFO, "dracd: error opening /etc/mail/dracd.host config file");
+          exit(1);
+        }
+
+        fgets(host, 100, dracconf);
+        p = strchr(host, '\n');
+        if(p != NULL)
+          *p = '\0';
+        fclose(dracconf);
+
+        if( drachost = (host) )
+        {
+            struct sockaddr_in sin;
+            int sinlen = sizeof (struct sockaddr_in);
+            char *client = getpeername (0,(struct sockaddr *) &sin,(void *) &sinlen) ?
+              "UNKNOWN" : inet_ntoa (sin.sin_addr);
+
+            lastdrac = time(0);
+
+            if (dracauth(drachost, inet_addr(client), &err) != 0)
+                syslog (LOG_INFO, err);
+            else
+                syslog (LOG_INFO, "dracd: authorized ip %s", client);
+        }
+    }
+#endif /* DRAC_AUTH */
+
+			/* change in number of messages? */
     if (existsquelled || (nmsgs != stream->nmsgs)) {
       PSOUT ("* ");
       pnum (nmsgs = stream->nmsgs);
diff -ur imap-2007.orig/src/ipopd/ipop3d.c imap-2007/src/ipopd/ipop3d.c
--- imap-2007.orig/src/ipopd/ipop3d.c	2007-09-18 03:53:27.000000000 +0200
+++ imap-2007/src/ipopd/ipop3d.c	2008-02-16 20:31:45.000000000 +0100
@@ -36,6 +36,11 @@
 #include <time.h>
 #include "c-client.h"
 
+#ifdef DRAC_AUTH
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <stdlib.h>
+#endif /* DRAC_AUTH */
 
 #define CRLF PSOUT ("\015\012")	/* primary output terpri */
 
@@ -61,6 +66,12 @@
 
 /* Global storage */
 
+#ifdef DRAC_AUTH
+#define DRACTIMEOUT 10*60     /* check every 10 minutes */
+time_t lastdrac = 0;          /* time of last drac check */
+extern char *getenv ();
+#endif /* DRAC_AUTH */
+
 char *version = "101";		/* edit number of this server */
 short state = AUTHORIZATION;	/* server state */
 short critical = NIL;		/* non-zero if in critical code */
@@ -101,6 +112,9 @@
 char *responder (void *challenge,unsigned long clen,unsigned long *rlen);
 int mbxopen (char *mailbox);
 long blat (char *text,long lines,unsigned long size,STRING *st);
+#ifdef DRAC_AUTH
+void drac_auth();
+#endif /* DRAC_AUTH */
 void rset ();
 
 /* Main program */
@@ -220,9 +234,13 @@
 	      syslog (LOG_INFO,"AUTHENTICATE %s failure host=%.80s",s,
 		      tcp_clienthost ());
 	    }
-	    else if ((state = mbxopen ("INBOX")) == TRANSACTION)
+	    else if ((state = mbxopen ("INBOX")) == TRANSACTION) {
+                  #ifdef DRAC_AUTH
+                  drac_auth();
+                  #endif /* DRAC_AUTH */
 	      syslog (LOG_INFO,"Auth user=%.80s host=%.80s nmsgs=%lu/%lu",
 		      user,tcp_clienthost (),nmsgs,stream->nmsgs);
+            }
 	    else syslog (LOG_INFO,"Auth user=%.80s host=%.80s no mailbox",
 			 user,tcp_clienthost ());
 	  }
@@ -252,9 +270,13 @@
 	      PSOUT ("-ERR Missing APOP argument\015\012");
 	    else if (!(user = apop_login (challenge,s,t,argc,argv)))
 	      PSOUT ("-ERR Bad APOP\015\012");
-	    else if ((state = mbxopen ("INBOX")) == TRANSACTION)
+	    else if ((state = mbxopen ("INBOX")) == TRANSACTION) {
 	      syslog (LOG_INFO,"APOP user=%.80s host=%.80s nmsgs=%lu/%lu",
 		      user,tcp_clienthost (),nmsgs,stream->nmsgs);
+                        #ifdef DRAC_AUTH
+                        drac_auth();
+                        #endif /* DRAC_AUTH */
+            }
 	    else syslog (LOG_INFO,"APOP user=%.80s host=%.80s no mailbox",
 			 user,tcp_clienthost ());
 	  }
@@ -530,6 +552,49 @@
   return 0;			/* stupid compilers */
 }
 
+#ifdef DRAC_AUTH
+/* DRAC Authorization
+ */
+void drac_auth ()
+{
+  if (time (0) > lastdrac + DRACTIMEOUT)
+  {
+	  FILE *dracconf;
+	  char host[100];
+	  char *drachost;
+	  char *err;
+	  char *p;
+
+	  if ( (dracconf = fopen("/etc/mail/dracd.host", "r")) == NULL)
+	  {
+		syslog (LOG_INFO, "dracd: error opening /etc/mail/dracd.host config file");
+		exit(1);
+	  }
+
+	  fgets(host, 100, dracconf);
+	  p = strchr(host, '\n');
+	  if(p != NULL)
+		*p = '\0';
+	  fclose(dracconf);
+
+	  if( drachost = (host) )
+	  {
+		  struct sockaddr_in sin;
+		  int sinlen = sizeof (struct sockaddr_in);
+		  char *client = getpeername (0,(struct sockaddr *) &sin,(void *) &sinlen) ?
+			"UNKNOWN" : inet_ntoa (sin.sin_addr);
+
+		  lastdrac = time(0);
+
+		  if (dracauth(drachost, inet_addr(client), &err) != 0)
+			  syslog (LOG_INFO, err);
+		  else
+			  syslog (LOG_INFO, "dracd: authorized ip %s", client);
+	  }
+  }
+}
+#endif /* DRAC_AUTH */
+
 
 /* Say goodbye
  * Accepts: exit status
@@ -657,6 +722,9 @@
 				/* attempt the login */
     if (server_login (user,pass,t,argc,argv)) {
       int ret = mbxopen ("INBOX");
+	  #ifdef DRAC_AUTH
+	  drac_auth();
+	  #endif /* DRAC_AUTH */
       if (ret == TRANSACTION)	/* mailbox opened OK? */
 	syslog (LOG_INFO,"%sLogin user=%.80s host=%.80s nmsgs=%lu/%lu",
 		t ? "Admin " : "",user,tcp_clienthost (),nmsgs,stream->nmsgs);