updated for 2.3.11

cyrus/contrib/drac_auth.patch

@@ -1,4 +1,4 @@
-$Id: drac_auth.patch,v 1.24 2007/10/18 19:01:22 murch Exp $
+$Id: drac_auth.patch,v 1.25 2007/12/10 15:13:02 murch Exp $
 
 Patch to add support for Dynamic Relay Authorization Control
 
@@ -70,7 +70,7 @@ RCS file: /afs/andrew/system/cvs/src/cyrus/configure.in,v
 retrieving revision 1.303
 diff -u -r1.303 configure.in
 --- configure.in	18 Oct 2007 18:14:47 -0000	1.303
-+++ configure.in	18 Oct 2007 18:57:11 -0000
++++ configure.in	10 Dec 2007 15:09:32 -0000
 @@ -1017,6 +1017,19 @@
  SNMP_SUBDIRS=""
  AC_SUBST(SNMP_SUBDIRS)
@@ -97,7 +97,7 @@ RCS file: /afs/andrew/system/cvs/src/cyrus/imap/Makefile.in,v
 retrieving revision 1.191
 diff -u -r1.191 Makefile.in
 --- imap/Makefile.in	18 Oct 2007 18:48:02 -0000	1.191
-+++ imap/Makefile.in	18 Oct 2007 18:57:11 -0000
++++ imap/Makefile.in	10 Dec 2007 15:09:32 -0000
 @@ -66,6 +66,7 @@
  SIEVE_LIBS = @SIEVE_LIBS@
  IMAP_COM_ERR_LIBS = @IMAP_COM_ERR_LIBS@
@@ -139,11 +139,11 @@ diff -u -r1.191 Makefile.in
 Index: imap/imapd.c
 ===================================================================
 RCS file: /afs/andrew/system/cvs/src/cyrus/imap/imapd.c,v
-retrieving revision 1.530
-diff -u -r1.530 imapd.c
---- imap/imapd.c	18 Oct 2007 17:23:06 -0000	1.530
-+++ imap/imapd.c	18 Oct 2007 18:57:12 -0000
-@@ -183,6 +183,18 @@
+retrieving revision 1.537
+diff -u -r1.537 imapd.c
+--- imap/imapd.c	27 Nov 2007 15:31:28 -0000	1.537
++++ imap/imapd.c	10 Dec 2007 15:09:32 -0000
+@@ -184,6 +184,18 @@
      1, 1, &imapd_authstate, &imapd_userisadmin, &imapd_userisproxyadmin
  };
 
@@ -162,7 +162,7 @@ diff -u -r1.530 imapd.c
  /* current sub-user state */
  static struct mailbox mboxstruct;
  static struct mailbox *imapd_mailbox;
-@@ -656,6 +668,23 @@
+@@ -655,6 +667,23 @@
      /* setup for sending IMAP IDLE notifications */
      idle_enabled();
 
@@ -186,7 +186,7 @@ diff -u -r1.530 imapd.c
      /* create connection to the SNMP listener, if available. */
      snmp_connect(); /* ignore return code */
      snmp_set_str(SERVER_NAME_VERSION,CYRUS_VERSION);
-@@ -757,6 +786,15 @@
+@@ -755,6 +784,15 @@
  		imapd_haveaddr = 1;
  	    }
  	}
@@ -202,7 +202,7 @@ diff -u -r1.530 imapd.c
      }
 
      /* create the SASL connection */
-@@ -798,6 +836,11 @@
+@@ -797,6 +835,11 @@
      prot_flush(imapd_out);
      snmp_increment(ACTIVE_CONNECTIONS, -1);
 
@@ -214,7 +214,7 @@ diff -u -r1.530 imapd.c
      /* cleanup */
      imapd_reset();
 
-@@ -891,6 +934,10 @@
+@@ -890,6 +933,10 @@
 
      cyrus_done();
 
@@ -225,7 +225,7 @@ diff -u -r1.530 imapd.c
      exit(code);
  }
 
-@@ -951,6 +998,36 @@
+@@ -950,6 +997,36 @@
      }
  }
 
@@ -262,7 +262,7 @@ diff -u -r1.530 imapd.c
  /*
   * Top-level command loop parsing
   */
-@@ -2056,6 +2133,11 @@
+@@ -2055,6 +2132,11 @@
      capa_response(CAPA_PREAUTH|CAPA_POSTAUTH);
      prot_printf(imapd_out, "] %s\r\n", reply);
 
@@ -274,7 +274,7 @@ diff -u -r1.530 imapd.c
      /* Create telemetry log */
      imapd_logfd = telemetry_log(imapd_userid, imapd_in, imapd_out, 0);
 
-@@ -2214,6 +2296,11 @@
+@@ -2213,6 +2295,11 @@
 
      prot_setsasl(imapd_in,  imapd_saslconn);
      prot_setsasl(imapd_out, imapd_saslconn);
@@ -289,10 +289,10 @@ diff -u -r1.530 imapd.c
 Index: imap/pop3d.c
 ===================================================================
 RCS file: /afs/andrew/system/cvs/src/cyrus/imap/pop3d.c,v
-retrieving revision 1.180
-diff -u -r1.180 pop3d.c
---- imap/pop3d.c	10 Oct 2007 18:34:45 -0000	1.180
-+++ imap/pop3d.c	18 Oct 2007 18:57:12 -0000
+retrieving revision 1.182
+diff -u -r1.182 pop3d.c
+--- imap/pop3d.c	26 Nov 2007 20:23:06 -0000	1.182
++++ imap/pop3d.c	10 Dec 2007 15:09:33 -0000
 @@ -105,6 +105,10 @@
  extern int opterr;
 
@@ -304,15 +304,15 @@ diff -u -r1.180 pop3d.c
 
  #ifdef HAVE_SSL
  static SSL *tls_conn;
-@@ -115,6 +119,7 @@
+@@ -116,6 +120,7 @@
  char *popd_userid = 0, *popd_subfolder = 0;
  struct mailbox *popd_mailbox = 0;
  struct auth_state *popd_authstate = 0;
 +static int popd_userisproxyadmin = 0;
  int config_popuseacl;
  struct sockaddr_storage popd_localaddr, popd_remoteaddr;
  int popd_haveaddr = 0;
-@@ -140,7 +145,7 @@
+@@ -141,7 +146,7 @@
 
  /* the sasl proxy policy context */
  static struct proxy_context popd_proxyctx = {
@@ -321,16 +321,16 @@ diff -u -r1.180 pop3d.c
  };
 
  /* signal to config.c */
-@@ -354,6 +359,7 @@
+@@ -355,6 +360,7 @@
  	auth_freestate(popd_authstate);
  	popd_authstate = NULL;
      }
 +    popd_userisproxyadmin = 0;
      if (popd_saslconn) {
  	sasl_dispose(&popd_saslconn);
  	popd_saslconn = NULL;
-@@ -522,6 +528,10 @@
-     prot_settimeout(popd_in, timeout*60);
+@@ -523,6 +529,10 @@
+     prot_settimeout(popd_in, popd_timeout);
      prot_setflushonread(popd_in, popd_out);
 
 +#ifdef DRAC_AUTH
@@ -340,7 +340,7 @@ diff -u -r1.180 pop3d.c
      if (kflag) kpop();
 
      /* we were connected on pop3s port so we should do 
-@@ -1677,6 +1687,21 @@
+@@ -1679,6 +1689,21 @@
  	proc_register("pop3d", popd_clienthost, popd_userid,
  		      popd_mailbox->name);
      }
@@ -368,7 +368,7 @@ RCS file: /afs/andrew/system/cvs/src/cyrus/imap/version.c,v
 retrieving revision 1.21
 diff -u -r1.21 version.c
 --- imap/version.c	7 Feb 2007 18:58:07 -0000	1.21
-+++ imap/version.c	18 Oct 2007 18:57:12 -0000
++++ imap/version.c	10 Dec 2007 15:09:33 -0000
 @@ -151,6 +151,10 @@
      snprintf(env_buf + strlen(env_buf), MAXIDVALUELEN - strlen(env_buf),
  	     "; %s", SIEVE_VERSION);
@@ -386,7 +386,7 @@ RCS file: /afs/andrew/system/cvs/src/cyrus/lib/imapoptions,v
 retrieving revision 1.46
 diff -u -r1.46 imapoptions
 --- lib/imapoptions	18 Oct 2007 18:14:48 -0000	1.46
-+++ lib/imapoptions	18 Oct 2007 18:57:12 -0000
++++ lib/imapoptions	10 Dec 2007 15:09:33 -0000
 @@ -215,6 +215,14 @@
     grant the user the ability to delete a mailbox.  If a user has this
     right, they will automatically be given the new 'x' right. */