--- imap-2004a/src/imapd/imapd.c.orig	2004-07-30 16:34:24.529652112 +0900
+++ imap-2004a/src/imapd/imapd.c	2004-07-30 18:07:13.066105896 +0900
@@ -29,6 +29,11 @@
 #include "c-client.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 */
 
@@ -183,6 +188,14 @@
 
 /* Global storage */
 
+#ifdef DRAC_AUTH
+#define DRACCONF "/etc/dracd/dracd.conf"
+int do_drac_calls = 1;
+#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 = "2004.352";	/* version number of this server */
 time_t alerttime = 0;		/* time of last alert */
 time_t sysalerttime = 0;	/* time of last system alert */
@@ -1251,6 +1264,47 @@
 	      lasterror ());
       return;
     }
+
+#ifdef DRAC_AUTH
+    if (do_drac_calls && (time (0) > lastdrac + DRACTIMEOUT))
+    {
+        FILE *dracconf;
+        char host[100];
+        char *drachost;
+        char *err;
+        char *p;
+
+        if ( (dracconf = fopen(DRACCONF, "r")) == NULL)
+        {
+          syslog (LOG_INFO, "dracd: failed to open %s config file", DRACCONF);
+          syslog (LOG_INFO, "dracd: no further open attempts will be made");
+          do_drac_calls = 0;
+        }
+
+        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 ("* ");
--- imap-2004a/src/ipopd/ipop3d.c.orig	2004-07-30 16:39:58.138935792 +0900
+++ imap-2004a/src/ipopd/ipop3d.c	2004-07-30 18:10:01.869443888 +0900
@@ -28,6 +28,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 */
 
@@ -57,6 +62,14 @@
 
 /* Global storage */
 
+#ifdef DRAC_AUTH
+#define DRACCONF "/etc/dracd/dracd.conf"
+#define DRACTIMEOUT 10*60     /* check every 10 minutes */
+int do_drac_calls = 1;
+time_t lastdrac = 0;          /* time of last drac check */
+extern char *getenv ();
+#endif /* DRAC_AUTH */
+
 char *version = "2004.88";	/* server version */
 short state = AUTHORIZATION;	/* server state */
 short critical = NIL;		/* non-zero if in critical code */
@@ -89,6 +102,9 @@
 int mbxopen (char *mailbox);
 long blat (char *text,long lines,unsigned long size);
 void rset ();
+#ifdef DRAC_AUTH
+void drac_auth();
+#endif /* DRAC_AUTH */
 
 /* Main program */
 
@@ -205,9 +221,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=%ld/%ld",
 		      user,tcp_clienthost (),nmsgs,stream->nmsgs);
+            }
 	    else syslog (LOG_INFO,"Auth user=%.80s host=%.80s no mailbox",
 			 user,tcp_clienthost ());
 	  }
@@ -235,10 +255,14 @@
 	      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)
-	      syslog (LOG_INFO,"APOP user=%.80s host=%.80s nmsgs=%ld/%ld",
-		      user,tcp_clienthost (),nmsgs,stream->nmsgs);
-	    else syslog (LOG_INFO,"APOP user=%.80s host=%.80s no mailbox",
+            else if ((state = mbxopen ("INBOX")) == TRANSACTION) {
+#ifdef DRAC_AUTH
+                drac_auth();
+#endif /* DRAC_AUTH */
+                syslog (LOG_INFO,"APOP user=%.80s host=%.80s nmsgs=%ld/%ld",
+                            user,tcp_clienthost (),nmsgs,stream->nmsgs);
+            }
+            else syslog (LOG_INFO,"APOP user=%.80s host=%.80s no mailbox",
 			 user,tcp_clienthost ());
 	  }
 	  else PSOUT ("-ERR Not supported\015\012");
@@ -458,6 +482,51 @@
   return 0;			/* stupid compilers */
 }
 
+#ifdef DRAC_AUTH
+/* DRAC Authorization
+ */
+void drac_auth ()
+{
+   if (do_drac_calls && (time (0) > lastdrac + DRACTIMEOUT))
+   {
+      FILE *dracconf;
+      char host[100];
+      char *drachost;
+      char *err;
+      char *p;
+
+      if ( (dracconf = fopen(DRACCONF, "r")) == NULL)
+      {
+         syslog (LOG_INFO, "dracd: failed to open %s config file", DRACCONF);
+         syslog (LOG_INFO, "dracd: no further open attempts will be made");
+         do_drac_calls = 0;
+      }
+
+      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 */
+
 /* Clock interrupt
  */
 
@@ -575,6 +644,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=%ld/%ld",
 		t ? "Admin " : "",user,tcp_clienthost (),nmsgs,stream->nmsgs);