*** OMakefile	Thu Sep 21 20:55:10 2000
--- Makefile	Thu Nov 23 14:21:43 2000
***************
*** 61,76 ****
  CYRUS_USER=cyrus
  CYRUS_GROUP=mail
  
! DEFS = -DHAVE_CONFIG_H 
  CPPFLAGS = -I. -I.. -I../sieve -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../acap -I./../et -I$(srcdir)/../sieve -I/usr/local/include -I/usr/local/src/db/db-3.1.17/build_unix -I/usr/local/src/OpenSSL/openssl-0.9.5a/include -I/usr/local/src/zephyr/zephyr-2.0.4/h/zephyr/include -I/usr/local/src/cyrus/libsasl-1.5.24/include
  IMAP_LIBS = -L/usr/local/src/cyrus/libsasl-1.5.24/lib -lsasl -ldl -lfl -ldb  -lssl -lcrypto  -lsocket -lnsl 
  SIEVE_LIBS = ../sieve/libsieve.a
  IMAP_COM_ERR_LIBS = ../et/libcom_err.a
! LIBS = $(IMAP_LIBS) -lzephyr $(IMAP_COM_ERR_LIBS)
  DEPLIBS = ../acap/libacap.a ../lib/libcyrus.a 
  
  CFLAGS = -g
! LDFLAGS = -L/usr/local/lib -R/usr/local/lib -L/usr/local/src/db/db-3.1.17/build_unix -L/usr/local/src/zephyr/zephyr-2.0.4/lib/zephyr -L/usr/local/src/OpenSSL/openssl-0.9.5a/lib -g  
  
  SHELL = /bin/sh
  MAKEDEPEND = makedepend
--- 61,76 ----
  CYRUS_USER=cyrus
  CYRUS_GROUP=mail
  
! DEFS = -DHAVE_CONFIG_H -DDRAC_AUTH
  CPPFLAGS = -I. -I.. -I../sieve -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../acap -I./../et -I$(srcdir)/../sieve -I/usr/local/include -I/usr/local/src/db/db-3.1.17/build_unix -I/usr/local/src/OpenSSL/openssl-0.9.5a/include -I/usr/local/src/zephyr/zephyr-2.0.4/h/zephyr/include -I/usr/local/src/cyrus/libsasl-1.5.24/include
  IMAP_LIBS = -L/usr/local/src/cyrus/libsasl-1.5.24/lib -lsasl -ldl -lfl -ldb  -lssl -lcrypto  -lsocket -lnsl 
  SIEVE_LIBS = ../sieve/libsieve.a
  IMAP_COM_ERR_LIBS = ../et/libcom_err.a
! LIBS = $(IMAP_LIBS) -lzephyr $(IMAP_COM_ERR_LIBS) -ldrac
  DEPLIBS = ../acap/libacap.a ../lib/libcyrus.a 
  
  CFLAGS = -g
! LDFLAGS = -L/usr/local/lib -R/usr/local/lib -L/usr/local/src/db/db-3.1.17/build_unix -L/usr/local/src/zephyr/zephyr-2.0.4/lib/zephyr -L/usr/local/src/OpenSSL/openssl-0.9.5a/lib -g  -L/usr/local/src/drac
  
  SHELL = /bin/sh
  MAKEDEPEND = makedepend
*** imapd.Oc	Mon Aug 21 15:51:28 2000
--- imapd.c	Thu Nov 23 14:08:01 2000
***************
*** 542,547 ****
--- 542,550 ----
      prot_flush(imapd_out);
      /* one less active connection */
      snmp_increment(ACTIVE_CONNECTIONS, -1);
+ #ifdef DRAC_AUTH
+     (void)dracdisc((char **)NULL);
+ #endif /* DRAC_AUTH */
      exit(code);
  }
  
***************
*** 591,596 ****
--- 594,607 ----
  	close(fd);
      }
  
+ #ifdef DRAC_AUTH
+     {
+ 	char *err;
+ 	if (dracconn("localhost", &err) != 0)
+ 	  syslog(LOG_NOTICE, "dracconn: %s", err);
+     }
+ #endif /* DRAC_AUTH */
+ 
      for (;;) {
  	if (! imapd_userisadmin &&
  	    (fd = open(shutdownfilename, O_RDONLY, 0)) != -1) {
***************
*** 1392,1397 ****
--- 1403,1416 ----
  
      if (!reply) reply = "User logged in";
  
+ #ifdef DRAC_AUTH
+     {
+ 	char *err;
+ 	if (dracsend(imapd_remoteaddr.sin_addr.s_addr, &err) != 0)
+ 	  syslog(LOG_NOTICE, "dracsend: %s", err);
+     }
+ #endif /* DRAC_AUTH */
+ 
      /* Create telemetry log */
      sprintf(buf, "%s%s%s/%lu", config_dir, FNAME_LOGDIR, imapd_userid,
  	    (unsigned long) getpid());
***************
*** 1539,1544 ****
--- 1558,1571 ----
      prot_setsasl(imapd_in,  imapd_saslconn);
      prot_setsasl(imapd_out, imapd_saslconn);
  
+ #ifdef DRAC_AUTH
+     {
+ 	char *err;
+ 	if (dracsend(imapd_remoteaddr.sin_addr.s_addr, &err) != 0)
+ 	  syslog(LOG_NOTICE, "dracsend: %s", err);
+     }
+ #endif /* DRAC_AUTH */
+ 
      /* Create telemetry log */
      sprintf(buf, "%s%s%s/%lu", config_dir, FNAME_LOGDIR, imapd_userid,
  	    (unsigned long) getpid());
***************
*** 1568,1573 ****
--- 1595,1608 ----
      }
      prot_printf(imapd_out, "%s OK %s\r\n", tag,
  		error_message(IMAP_OK_COMPLETED));
+ #ifdef DRAC_AUTH
+     {
+ 	char *err;
+ 	if (dracsend(imapd_remoteaddr.sin_addr.s_addr, &err) != 0)
+ 	  syslog(LOG_NOTICE, "dracsend: %s", err);
+     }
+ #endif /* DRAC_AUTH */
+ 
  }
  
  /*
***************
*** 2143,2148 ****
--- 2178,2191 ----
  
      proc_register("imapd", imapd_clienthost, imapd_userid, mailboxname);
      syslog(LOG_DEBUG, "open: user %s opened %s", imapd_userid, name);
+ 
+ #ifdef DRAC_AUTH
+     {
+ 	char *err;
+ 	if (dracsend(imapd_remoteaddr.sin_addr.s_addr, &err) != 0)
+ 	  syslog(LOG_NOTICE, "dracsend: %s", err);
+     }
+ #endif /* DRAC_AUTH */
  }
  	  
  /*
*** pop3d.Oc	Thu Jul  6 11:13:35 2000
--- pop3d.c	Thu Nov 23 14:13:16 2000
***************
*** 1105,1110 ****
--- 1105,1118 ----
      popd_mailbox = &mboxstruct;
      proc_register("pop3d", popd_clienthost, popd_userid, popd_mailbox->name);
  
+ #ifdef DRAC_AUTH
+     {
+ 	char *err;
+ 	if (dracauth("localhost", popd_remoteaddr.sin_addr.s_addr, &err) != 0)
+ 	  syslog(LOG_NOTICE, "dracauth: %s", err);
+     }
+ #endif /* DRAC_AUTH */
+ 
      /* Create telemetry log */
      sprintf(buf, "%s%s%s/%lu", config_dir, FNAME_LOGDIR, popd_userid,
  	    (long unsigned) getpid());